vendor/assets/stylesheets/settings/variables/_default.sass in oulu-rails-0.6.33 vs vendor/assets/stylesheets/settings/variables/_default.sass in oulu-rails-0.7.1
- old
+ new
@@ -27,27 +27,79 @@
// text-color
////////////////
$bright-text-color: white !default
$dark-text-color: black !default
+$ruma-threshold: 100 / pi() !default
/////////////////
// grids
////////////////
// screens
+//== Media queries breakpoints
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+//** Deprecated `$screen-xs` as of v3.0.1
$screen-xs: 480px !default
+//** Deprecated `$screen-xs-min` as of v3.2.0
+$screen-xs-min: $screen-xs !default
+//** Deprecated `$screen-phone` as of v3.0.1
+$screen-phone: $screen-xs-min !default
+
+// Small screen / tablet
+//** Deprecated `$screen-sm` as of v3.0.1
$screen-sm: 768px !default
+$screen-sm-min: $screen-sm !default
+//** Deprecated `$screen-tablet` as of v3.0.1
+$screen-tablet: $screen-sm-min !default
+
+// Medium screen / desktop
+//** Deprecated `$screen-md` as of v3.0.1
$screen-md: 992px !default
+$screen-md-min: $screen-md !default
+//** Deprecated `$screen-desktop` as of v3.0.1
+$screen-desktop: $screen-md-min !default
+
+// Large screen / wide desktop
+//** Deprecated `$screen-lg` as of v3.0.1
$screen-lg: 1200px !default
+$screen-lg-min: $screen-lg !default
+//** Deprecated `$screen-lg-desktop` as of v3.0.1
+$screen-lg-desktop: $screen-lg-min !default
-// 横一列の最大カラム数
-$columns-count: 12 !default
+// So media queries don't overlap when required, provide a maximum
+$screen-xs-max: ($screen-sm-min - 1) !default
+$screen-sm-max: ($screen-md-min - 1) !default
+$screen-md-max: ($screen-lg-min - 1) !default
+$screen-lg-max: ($screen-lg-min - 1) !default
+// 横一列の最大カラム数
+$grid-columns: 12 !default
// カラムとカラムの間のスペース
-$gutter-width: 50px !default
+$grid-gutter-width: 32px
+
+//== Container sizes
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+$container-tablet: (720px + $grid-gutter-width) !default
+//** For `$screen-sm-min` and up.
+$container-sm: $container-tablet !default
+
+// Medium screen / desktop
+$container-desktop: (940px + $grid-gutter-width) !default
+//** For `$screen-md-min` and up.
+$container-md: $container-desktop !default
+
+// Large screen / wide desktop
+$container-large-desktop: (1140px + $grid-gutter-width) !default
+//** For `$screen-lg-min` and up.
+$container-lg: $container-large-desktop !default
+
/////////////////
// font
////////////////
$fw: 400 !default
@@ -81,5 +133,12 @@
$twitter: #55acee
$facebook: #3b5998
$hatena: #008FDE
$pocket: #f23c53
+
+$default-text: black !default
+$reversal-text: white !default
+
+// luma contrast color
+$luma-contrast-bright-color: $default-text !global
+$luma-contrast-dark-color: $reversal-text !global