Merge branch 'master' of github.com:zhaoqingqing/cnblogs

# Conflicts:
#	cnblogs-notice.html

Author: zhaoqingqing

cnblogs-customfunc.js

@@ -48,8 +48,9 @@ function focusFollow() {
 //TODO 设置子级div的宽度，最佳解决方案：让它撑满父DIV
 var calcPencent = '110%';
 function getContentWidth(compareWidth){
+    //在1920的分辨率中，foxmail订阅默认大小<1440
     var screePix = new Array(800,1024,1280,1440,1600,1920,2560);
-    var screePencent = new Array(1.3,1.28,1.26,1.24,1.22,1.2,1.1);
+    var screePencent = new Array(1.28,1.26,1.24,1.22,1.2,1.18,1.1);
     var isGetVal = false;
     $.each(screePix, function(idx, obj) {
         //console.log(idx,parseInt(obj),parseInt(compareWidth));

cnblogs-notice.html

@@ -6,7 +6,7 @@
 <!-- GoStats Simple HTML Based Code -->
 <p>第<a target="_blank" title="流量统计" href="http://gostats.cn"><img alt="流量统计" src="http://monster.gostats.cn/bin/count/a_474834/t_7/i_3/z_0/show_hits/counter.png" style="border-width:0" /></a>位访客，欢迎您！</p>
 <!-- End GoStats Simple HTML Based Code -->
-<p>Tips：正文页面自动全屏(未适配All浏览器)，右下角三杠图标(显示/隐藏目录)。</p>
+<p>Tips：正文页面自动满屏(未适配All浏览器)，右下角三杠图标(显示/隐藏目录)。</p>
 
 
 <!-- 博客园栏目管理 一栏 -->
@@ -36,7 +36,7 @@
     </tr>
     <tr>
       <td valign="top" ><a id="liuyan" class="menu" href="http://i.cnblogs.com/" rel="nofollow" target="_blank">博客管理</a></td>
-	  <td valign="top" ><a id="liuyan" class="menu" href="http://www.cnblogs.com/" rel="nofollow" target="_blank">博客园首页</a></td>
+	  	  <td valign="top" ><a id="liuyan" class="menu" href="http://www.cnblogs.com/cate/gamedev/" rel="nofollow" target="_blank">博客园分类</a></td>
     </tr>
   </tbody></table>
 

simplememory-qingqing.css

@@ -898,18 +898,20 @@ a {
 .entrylistPosttitle {
     padding-left: 15px;
     margin-bottom: 10px;
-    border-left: 3px solid #21759b;
+    /*border-left: 3px solid #21759b;*/
+    border-left: 10px solid rgb(205, 73, 0);
     font-size: 20px;
     width: 100%;
 }
 
     .entrylistPosttitle a:link, .entrylistPosttitle a:visited, .entrylistPosttitle a:active {
-        color: #21759b;
+        /*color: #21759b;*/
+        color: white;
         transition: all 0.4s linear 0s;
     }
 
     .entrylistPosttitle a:hover {
-        margin-left: 30px;
+        margin-left: 30px;/*animation*/
         color: #0f3647;
         text-decoration: none;
     }