Yuki Takei 9 лет назад
Родитель
Сommit
53f23b6392
4 измененных файлов с 19 добавлено и 22 удалено
  1. 1 1
      lib/views/layout/layout.html
  2. 1 1
      resource/css/_layout.scss
  3. 0 2
      resource/css/_page_list.scss
  4. 17 18
      resource/css/_wiki.scss

+ 1 - 1
lib/views/layout/layout.html

@@ -41,7 +41,7 @@
   <script src="{{ webpack_asset('app').js }}" defer></script>
 
   <!-- Google Fonts -->
-  <link href='//fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
+  <link href='//fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
   <!-- Font Awesome -->
   <link href='//cdn.jsdelivr.net/fontawesome/4.7.0/css/font-awesome.min.css' rel='stylesheet' type='text/css'>
 

+ 1 - 1
resource/css/_layout.scss

@@ -1,5 +1,5 @@
 .crowi { // {{{
-  font-family: 'Open Sans', 'Helvetica Neue', 'Hiragino Kaku Gothic Pro', 'Meiryo', sans-serif;
+  font-family: Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif;
   h1, h2, h3, h4, h5, h6 {
     font-weight: 500;
   }

+ 0 - 2
resource/css/_page_list.scss

@@ -29,8 +29,6 @@
 
     > li {
       list-style: none;
-      line-height: 1.4em;
-      font-size: 1.7rem;
       color: #666;
 
       .page-list-option {

+ 17 - 18
resource/css/_wiki.scss

@@ -52,8 +52,8 @@ div.body {
 }
 
 .wiki {
-  line-height: 1.6em;
-  font-size: 15px;
+  line-height: 1.8em;
+  font-size: 14px;
 
   h1, h2, h3, h4, h5, h6 {
     margin-top: 1.6em;
@@ -66,36 +66,38 @@ div.body {
 
   h1 {
     padding-bottom: 0.3em;
-    font-size: 2.3em;
-    font-weight: bold;
+    font-size: 1.8em;
     border-bottom: solid 1px #ccc;
   }
   h2 {
-    padding-bottom: 0.3em;
-    font-size: 1.8em;
+    padding-bottom: 0.5em;
+    font-size: 1.4em;
     line-height: 1.225;
     font-weight: bold;
     border-bottom: 1px solid #eee;
   }
   h3 {
-    font-size: 1.5em;
+    font-size: 1.2em;
     font-weight: bold;
   }
   h4 {
-    font-size: 1.3em;
+    font-size: 1.1em;
     font-weight: normal;
   }
   h5 {
-    font-size: 1.1em;
+    font-size: 1.05em;
     font-weight: normal;
   }
 
   p {
     font-weight: normal;
-    margin-bottom: 9px;
+    margin: 20px 0;
   }
   blockquote {
     font-size: .9em;
+    margin: 0 0 30px 0;
+    padding: 0 20px;
+    color: darken(gray, 10%);
   }
 
   a {
@@ -141,18 +143,15 @@ div.body {
 
   ul, ol {
     padding-left: 30px;
+    margin: 20px 0;
 
     li {
+      margin: 10px 0;
       line-height: 1.8em;
+    }
 
-      p {
-        margin-top: 10px;
-        margin-bottom: 0;
-
-        &:first-child {
-          margin-top: 0;
-        }
-      }
+    ul, ol {
+      margin: 0;
     }
   }