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>2016-09-10 15:22:47 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2016-09-10 15:22:47 +0300
commit47b036009b12364b8d273190bbd2936a79296241 (patch)
tree00ca7e140487ca1c5e11c42e43d4667e3ccea4e4 /templates
parent23d70bc283e00043623bb4539c12e2f5a7ab0739 (diff)
rake update[v4.0.0-alpha.4] and bump version
Diffstat (limited to 'templates')
-rw-r--r--templates/project/_bootstrap-variables.scss25
1 files changed, 2 insertions, 23 deletions
diff --git a/templates/project/_bootstrap-variables.scss b/templates/project/_bootstrap-variables.scss
index 021bffd..66a1b47 100644
--- a/templates/project/_bootstrap-variables.scss
+++ b/templates/project/_bootstrap-variables.scss
@@ -1,8 +1,4 @@
-// Override Bootstrap variables here (defaults from bootstrap v4.0.0-alpha.3):
-
-//
-// Copy settings from this file into the provided `_custom.scss` to override
-// the Bootstrap defaults without modifying key, versioned files.
+// Override Bootstrap variables here (defaults from bootstrap v4.0.0-alpha.4):
// Table of Contents
@@ -18,21 +14,6 @@
// Fonts
// Components
-@mixin _assert-ascending($map, $map-name) {
-// $prev-key: null;
-// $prev-num: null;
-// @each $key, $num in $map {
-// @if $prev-num == null {
-// // Do nothing
-// } @else if not comparable($prev-num, $num) {
-// @warn "Potentially invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} whose unit makes it incomparable to #{$prev-num}, the value of the previous key '#{$prev-key}' !";
-// } @else if $prev-num >= $num {
-// @warn "Invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} which isn't greater than #{$prev-num}, the value of the previous key '#{$prev-key}' !";
-// }
-// $prev-key: $key;
-// $prev-num: $num;
-// }
-}
// General variable structure
//
@@ -131,7 +112,6 @@
// lg: 992px,
// xl: 1200px
// );
-@include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
// Grid containers
@@ -144,7 +124,6 @@
// lg: 940px,
// xl: 1140px
// );
-@include _assert-ascending($container-max-widths, "$container-max-widths");
// Grid columns
@@ -686,7 +665,7 @@
//
// Define alert colors, border radius, and padding.
-// $alert-padding: 15px;
+// $alert-padding: 1rem;
// $alert-border-radius: $border-radius;
// $alert-link-font-weight: bold;
// $alert-border-width: $border-width;