Explorar o código

organize scss variables

Yuki Takei %!s(int64=8) %!d(string=hai) anos
pai
achega
9c9f9d75d6

+ 10 - 0
resource/styles/scss/_override-bootstrap-variables.scss

@@ -20,3 +20,13 @@ $brand-success:         $success;
 $brand-info:            $info;
 $brand-warning:         $warning;
 $brand-danger:          $danger;
+
+
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+$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:   Osaka-Mono, "MS Gothic", Monaco, Menlo, Consolas, "Courier New", monospace;
+$font-family-base:        $font-family-sans-serif;

+ 0 - 4
resource/styles/scss/_variables.scss

@@ -1,6 +1,2 @@
 // override bootstrap
-$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:   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;

+ 1 - 1
resource/styles/scss/style-presentation.scss

@@ -4,7 +4,7 @@
 .reveal {
   font-size: 32px;
   section * {
-    font-family: $font-family-sans-serif !important;
+    font-family: Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif !important;
   }
 
   .slides > section {