Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2015-09-29 12:09:48 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2015-09-29 12:09:48 +0300
commit6e58d5c2a6be817a663f023c66d9b05b1d901f09 (patch)
tree435b0d0ac6f8db2706b0e92380356154a87ec4d7 /assets/stylesheets/bootstrap/mixins/_breakpoints.scss
parente82238cbb4112652ed637e000710956e1aaf0a02 (diff)
rake update[v4-dev]
Diffstat (limited to 'assets/stylesheets/bootstrap/mixins/_breakpoints.scss')
-rw-r--r--assets/stylesheets/bootstrap/mixins/_breakpoints.scss14
1 files changed, 7 insertions, 7 deletions
diff --git a/assets/stylesheets/bootstrap/mixins/_breakpoints.scss b/assets/stylesheets/bootstrap/mixins/_breakpoints.scss
index 790bb73..1685e59 100644
--- a/assets/stylesheets/bootstrap/mixins/_breakpoints.scss
+++ b/assets/stylesheets/bootstrap/mixins/_breakpoints.scss
@@ -2,7 +2,7 @@
//
// Breakpoints are defined as a map of (name: minimum width), order from small to large:
//
-// (xs: 0, sm: 34rem, md: 45rem)
+// (xs: 0, sm: 544px, md: 768px)
//
// The map defined in the `$grid-breakpoints` global variable is used as the `$breakpoints` argument by default.
@@ -10,7 +10,7 @@
//
// >> breakpoint-next(sm)
// md
-// >> breakpoint-next(sm, $breakpoints: (xs: 0, sm: 34rem, md: 45rem))
+// >> breakpoint-next(sm, (xs: 0, sm: 544px, md: 768px))
// md
// >> breakpoint-next(sm, $breakpoint-names: (xs sm md))
// md
@@ -21,8 +21,8 @@
// Minimum breakpoint width. Null for the smallest (first) breakpoint.
//
-// >> breakpoint-min(sm, (xs: 0, sm: 34rem, md: 45rem))
-// 34rem
+// >> breakpoint-min(sm, (xs: 0, sm: 544px, md: 768px))
+// 544px
@function breakpoint-min($name, $breakpoints: $grid-breakpoints) {
$min: map-get($breakpoints, $name);
@return if($min != 0, $min, null);
@@ -31,11 +31,11 @@
// Maximum breakpoint width. Null for the largest (last) breakpoint.
// The maximum value is calculated as the minimum of the next one less 0.1.
//
-// >> breakpoint-max(sm, (xs: 0, sm: 34rem, md: 45rem))
-// 44.9rem
+// >> breakpoint-max(sm, (xs: 0, sm: 544px, md: 768px))
+// 767px
@function breakpoint-max($name, $breakpoints: $grid-breakpoints) {
$next: breakpoint-next($name, $breakpoints);
- @return if($next, breakpoint-min($next, $breakpoints) - 0.1, null);
+ @return if($next, breakpoint-min($next, $breakpoints) - 1px, null);
}
// Media of at least the minimum breakpoint width. No query for the smallest breakpoint.