Yuki Takei 8 лет назад
Родитель
Сommit
e4de19f423
3 измененных файлов с 13 добавлено и 2 удалено
  1. 4 1
      resource/css/_form.scss
  2. 2 1
      resource/css/_utilities.scss
  3. 7 0
      resource/css/_wiki.scss

+ 4 - 1
resource/css/_form.scss

@@ -1,3 +1,6 @@
+// import crowi variable
+@import 'utilities';
+
 .crowi.main-container .main .content-main.on-edit { // {{{ Edit Form of Page
   padding: 0;
 
@@ -137,7 +140,7 @@
 } // }}}
 
 textarea {
-  font-family: menlo, monaco, consolas, monospace;
+  font-family: $font-family-monospace-not-strictly;
   line-height: 1.1em;
 }
 

+ 2 - 1
resource/css/_utilities.scss

@@ -58,7 +58,8 @@ $link-hover-color:      darken($link-color, 15%);
 //
 $font-family-sans-serif:  Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif;
 // $font-family-serif:       Georgia, "Times New Roman", Times, serif;
-$font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", MeiryoKe_Console, monospace;
+$font-family-monospace:   Osaka-Mono, "MS Gothic", Monaco, Menlo, Consolas, "Courier New", monospace;
+$font-family-monospace-not-strictly:   Monaco, Menlo, Consolas, "Courier New", MeiryoKe_Console, "M+ 1m", monospace;
 // $font-family-base:        $font-family-sans-serif;
 //
 // $font-size-base:          14px;

+ 7 - 0
resource/css/_wiki.scss

@@ -1,3 +1,6 @@
+// import crowi variable
+@import 'utilities';
+
 div.body {
   padding: 10px;
 }
@@ -181,6 +184,10 @@ div.body {
   };
 */
 
+  p code {  // only inline code blocks
+    font-family: $font-family-monospace-not-strictly;
+  }
+
   .page-template-builder {
     position: relative;