Sotaro KARASAWA 11 лет назад
Родитель
Сommit
c9667b2b97
3 измененных файлов с 35 добавлено и 13 удалено
  1. 3 6
      resource/css/_layout.scss
  2. 31 6
      resource/css/_wiki.scss
  3. 1 1
      views/layout/2column.html

+ 3 - 6
resource/css/_layout.scss

@@ -70,7 +70,7 @@
       border-right: none;
       background: $crowiAsideBackground;
       border-radius: 5px 0 0 5px;
-      z-index: 1055;
+      z-index: 1051;
       font-size: .8em;
 
       color: darken($link-color, 15%);
@@ -186,7 +186,7 @@
             list-style: none;
 
             a {
-              color: darken($link-color, 50%);
+              color: #666;
               padding: 3px 5px 3px 40px;
               display: block;
 
@@ -246,12 +246,9 @@
           left: 0;
           padding: 5px 20px;
           z-index: 1041;
-          background: #fff;
+          background: rgba(255, 255, 255, .9);
           box-shadow: 0 0px 2px #999;
 
-          transition: .5s ease;
-          -webkit-transition: .5s ease;
-
           h1 {
             font-size: 1.8em;
           }

+ 31 - 6
resource/css/_wiki.scss

@@ -32,6 +32,7 @@ div.body {
     }
   }
   .revision-toc-content {
+    background: #fcfcfc;
     padding: 10px;
 
     > ul {
@@ -56,6 +57,7 @@ div.body {
 
 .wiki {
   line-height: 1.6em;
+  font-size: 15px;
 
   h1, h2, h3, h4, h5, h6 {
     margin-top: 1.6em;
@@ -67,23 +69,28 @@ div.body {
   }
 
   h1 {
-    font-size: 2.2em;
+    padding-bottom: 0.3em;
+    font-size: 2.3em;
     font-weight: bold;
+    border-bottom: solid 1px #ccc;
   }
   h2 {
+    padding-bottom: 0.3em;
     font-size: 1.8em;
+    line-height: 1.225;
     font-weight: bold;
+    border-bottom: 1px solid #eee;
   }
   h3 {
-    font-size: 1.6em;
+    font-size: 1.5em;
     font-weight: bold;
   }
   h4 {
-    font-size: 1.4em;
+    font-size: 1.3em;
     font-weight: normal;
   }
   h5 {
-    font-size: 1.2em;
+    font-size: 1.1em;
     font-weight: normal;
   }
 
@@ -92,7 +99,12 @@ div.body {
     margin-bottom: 9px;
   }
   blockquote {
-    font-size: 12px;
+    font-size: .9em;
+  }
+
+  pre {
+    line-height: 1.4em;
+    font-size: .9em;
   }
 
   img {
@@ -102,7 +114,20 @@ div.body {
   }
 
   ul, ol {
-    padding-left: 18px;
+    padding-left: 30px;
+
+    li {
+      line-height: 1.8em;
+
+      p {
+        margin-top: 10px;
+        margin-bottom: 0;
+
+        &:first-child {
+          margin-top: 0;
+        }
+      }
+    }
   }
 
   // {{{ table (copied from bootstrap .table

+ 1 - 1
views/layout/2column.html

@@ -89,7 +89,7 @@
 
 {% block layout_sidebar %}
 
-<a href="" class="layout-control" id="toggle-sidebar"><i class="fa fa-chevron-right"></i> <span class="hide-on-affix-top"></span></a>
+<a href="" class=" hidden-xs hidden-sm layout-control" id="toggle-sidebar"><i class="fa fa-chevron-right"></i> <span class="hide-on-affix-top"></span></a>
 <script>
   $(function() {
     $('#toggle-sidebar').click(function(e) {