update some css

kokdemo · Apr 10, 2015 · 7a5c65a · 7a5c65a
1 parent c041c94
commit 7a5c65a
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 110 deletions.
diff --git a/js/v2ex.k.js b/js/v2ex.k.js
@@ -49,15 +49,16 @@ $(function () {
 
     $('body').prepend(newNavbar);
 
-    $('.bars').css('height', window.screen.height);
+    var window_height = $(window).height();
+    $('.bars').css('height', window_height);
     $('#Wrapper').css('width', document.body.clientWidth - 140).addClass('k_color_background');
 
     $('#k_navbar').append(k_navbar).append($('#Top .content a')[9]);
     $($('#k_navbar a')[10]).html('<i class="fa fa-sign-out fa-2x" title="退出"></i>');
     $('#k_infos').append(k_infos);
     $('#k_tabbar').append($('#Tabs a'));
 
-    $('#Rightbar').prepend($('#Search'));
+    $('#Rightbar').prepend($('#TopicsHot')).prepend($('#Search'));
 
     $('#k_navbar a,#k_tabbar a').addClass('k_color_hover');
     $('a.count_livid').addClass('k_color_count');
@@ -75,7 +76,7 @@ $(function () {
         opened: false,
         changeCSS: function () {
             if (!fast.opened) {
-                $('#Main').css('width', document.body.clientWidth - 690 - 140);
+                $('#Main').css('width', document.body.clientWidth - 690 - 140).addClass('k_itemlist');
                 $('#Rightbar').css('width', 690).css('position', 'fixed').css('right', 0);
                 fast.scroll();
                 fast.opened = true;

diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "v2ex.k",
-    "version": "0.2.2",
+    "version": "0.2.3",
     "manifest_version": 2,
     "description": "V2EX Extension",
     "homepage_url": "https://github.com/kokdemo/v2ex.k",

diff --git a/sass/screen.scss b/sass/screen.scss
@@ -76,7 +76,6 @@ body {
   cursor: pointer;
   p {
     margin: 0;
-    text-indent: 32px;
     font-size: 16px;
     line-height: 30px;
   }
@@ -155,8 +154,11 @@ body {
 span a.node.k_color_node, td a.count_livid.k_color_count, span.no {
   background-color: $color_node;
   color: $color_dark;
-}
 
+}
+td a.count_livid.k_color_count{
+  float: right;
+}
 #Wrapper.k_color_background {
   background-color: $color_background;
 }
@@ -230,47 +232,39 @@ body #Wrapper {
     border-bottom: 0px;
   }
   .box:nth-child(2) .cell:nth-child(2) {
-    padding: 10px 28px !important;
+    padding: 10px 16px !important;
+    overflow-x: hidden;
   }
   .box:nth-child(2) .cell:nth-child(n+1), .box:first-child .cell {
-    padding: 15px 24px 15px 24px;
+    padding: 15px 16px;
   }
   .box .topic_buttons {
     border-top: 1px solid #e6e6e6;
     background: #f3f3f3;
     margin-top: 20px;
   }
+  transition: width 2s ease-out;
+}
+
+#Main.k_itemlist{
+  span.small.fade{
+    display: none;
+  }
 }
 
 //#Main div[id*="r_"].cell table tr td:nth-child(3) {
 //  padding-top: 0px;
 //}
 
 #Rightbar {
-  div:nth-child(3) {
-    display: none;
-  }
-  div:nth-child(3) .cell:first-child table:nth-child(1) tr td:nth-child(1) {
-    text-align: center;
-  }
-
-  div:nth-child(3) .cell:first-child table:nth-child(1) tr td:nth-child(2),
-  div:nth-child(3) .cell:first-child table:nth-child(1) tr td:nth-child(3),
-  .sep20, img[src*="flat_compose.png"] {
-    display: none;
-  }
-
-//  div:nth-child(3) .cell:first-child table:nth-child(3) {
-//    padding-bottom: 15px;
-//    padding-top: 15px;
-//  }
+    > div{
+      display: none;
+    }
+    > div:nth-child(1),> div:nth-child(2){
+      display: block;
+    }
+  transition: width 0.5s ease-out;
 
-  .box div:nth-child(1) {
-    border-bottom: 0px;
-  }
-  #MyNodes,.gray.f12{
-    display: none;
-  }
 }
 
 .box {