vendor/assets/stylesheets/settings/variables/_default.sass in oulu-rails-0.5.34 vs vendor/assets/stylesheets/settings/variables/_default.sass in oulu-rails-0.5.37
- old
+ new
@@ -1,12 +1,12 @@
/////////////////
// positions
////////////////
-$all: top right bottom left
-$horizontal: left right
-$vertical: top bottom
+$all: top right bottom left !default
+$horizontal: left right !default
+$vertical: top bottom !default
/////////////////
// compass
////////////////
@@ -64,9 +64,9 @@
$basic-sans-serif: "Lucida Grande", "Lucida Sans Unicode", Roboto, "Droid Sans", "ヒラギノ角ゴ ProN", "Hiragino Kaku Gothic ProN", "游ゴシック", YuGothic, "メイリオ", Meiryo, "MS Pゴシック", Helvetica, Arial, Verdana, sans-serif !default
$basic-legacy-ie-sans-serif: "MS Pゴシック", "Lucida Sans Unicode", sans-serif !default
$basic-bold-sans-serif: "ヒラギノ角ゴ StdN", "Hiragino Kaku Gothic StdN", "メイリオ", Meiryo, Roboto, "Droid Sans", "游ゴシック", YuGothic, "ヒラギノ角ゴ ProN", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, "MS Pゴシック", Helvetica, Arial, Verdana, sans-serif, "MS Pゴシック", Helvetica, Arial, Verdana, sans-serif !default
$basic-serif: "Times New Roman", "ヒラギノ明朝 ProN", "Hiragino Mincho ProN", "HGS明朝E", "游明朝", YuMincho, Meiryo, serif !default
-$basic-mono: Osaka-mono, "MS Gothic", monospace
-
+$basic-mono: Osaka-mono, "MS Gothic", monospace !default
+$basic-maru: "Varela Round", "Lucida Grande", "Lucida Sans Unicode", Roboto, "Droid Sans", "HG丸ゴシックM-PRO", "Hiragino Maru Gothic Pro", "游ゴシック", YuGothic, "メイリオ", Meiryo, "MS Pゴシック", Helvetica, Arial, Verdana, sans-serif !default
$basic-fonts: $basic-sans-serif !default
$basic-legacy-ie-fonts: $basic-legacy-ie-sans-serif !default