reorder variables, rename -color to -color

author: Mark Otto <[email protected]> 2015-08-10 23:38:41 -0700
committer: Mark Otto <[email protected]> 2015-08-10 23:38:41 -0700
commit: a90f6c709306d2bc1411639b1061aed01950239a (patch)
tree: 9f2d308295116073b0fc129fa1e8bcfc529e16f5
parent: 67765587d9c5c6262612a269f7639c3806754dd0 (diff)
download: bootstrap-a90f6c709306d2bc1411639b1061aed01950239a.tar.xz
bootstrap-a90f6c709306d2bc1411639b1061aed01950239a.zip
4 files changed, 91 insertions, 73 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 79ca97c3f..5266419fd 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -394,7 +394,7 @@ $form-icon-error: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGl
   display: block; // account for any element using help-block
   margin-top: .25rem;
   margin-bottom: .75rem;
-  color: lighten($text-color, 25%); // lighten the text some for contrast
+  color: lighten($body-color, 25%); // lighten the text some for contrast
 }
 
 
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index fe76f8ddf..fe466da04 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -70,7 +70,7 @@ body {
   font-size: $font-size-base;
   line-height: $line-height;
   // Go easy on the eyes and use something other than `#000` for text
-  color: $text-color;
+  color: $body-color;
   // By default, `<body>` has no `background-color` so we set one as a best practice.
   background-color: $body-bg;
 }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index cddc598ac..3a0bd1959 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1,57 +1,114 @@
-//
 // Variables
 //
+// Copy settings from this file into the provided `_custom.scss` to override
+// the Bootstrap defaults without modifying key, versioned files.
+
+
+// Table of ontents
+//
+// Colors
+// Options
+// Spacing
+// Body
+// Links
+// Grid breakpoints
+// Grid containers
+// Grid columns
 
 
 // Colors
 //
-// Gray and brand colors for use across Bootstrap.
+// Grayscale and brand colors for use across Bootstrap.
 
-$gray-dark:                  #373a3c !default;
-$gray:                       #55595c !default;
-$gray-light:                 #818a91 !default;
-$gray-lighter:               #eceeef !default;
-$gray-lightest:              #f7f7f9 !default;
+$gray-dark:                 #373a3c !default;
+$gray:                      #55595c !default;
+$gray-light:                #818a91 !default;
+$gray-lighter:              #eceeef !default;
+$gray-lightest:             #f7f7f9 !default;
 
-$brand-primary:              #0275d8 !default;
-$brand-success:              #5cb85c !default;
-$brand-info:                 #5bc0de !default;
-$brand-warning:              #f0ad4e !default;
-$brand-danger:               #d9534f !default;
+$brand-primary:             #0275d8 !default;
+$brand-success:             #5cb85c !default;
+$brand-info:                #5bc0de !default;
+$brand-warning:             #f0ad4e !default;
+$brand-danger:              #d9534f !default;
 
 
-// Scaffolding
+// Options
 //
-// Settings for some of the most global styles.
+// Quickly modify global styling by enabling or disabling optional features.
+
+$enable-flex:               false !default;
+$enable-rounded:            true !default;
+$enable-shadows:            false !default;
+$enable-gradients:          false !default;
+$enable-transitions:        false !default;
+$enable-hover-media-query:  false !default;
+
+
+// Spacing
+//
+// Control the default styling of most Bootstrap elements by modifying these
+// variables. Mostly focused on spacing.
+
+$spacer:                     1rem !default;
+$spacer-x:                   $spacer !default;
+$spacer-y:                   $spacer !default;
+
+
+// Body
+//
+// Settings for the `<body>` element.
 
 $body-bg:                    #fff !default;
-$text-color:                 $gray-dark !default;
+$body-color:                 $gray-dark !default;
+
+
+// Links
+//
+// Style anchor elements.
 
 $link-color:                 $brand-primary !default;
 $link-hover-color:           darken($link-color, 15%) !default;
 $link-hover-decoration:      underline !default;
 
 
-// Global settings
+// Grid breakpoints
 //
-// Quickly modify global styling by enabling or disabling features.
+// Define the minimum and maximum dimensions at which your layout will change,
+// adapting to different screen sizes, for use in media queries.
 
-$enable-flex:                false !default;
-$enable-rounded:             true !default;
-$enable-shadows:             false !default;
-$enable-gradients:           false !default;
-$enable-transitions:         false !default;
-$enable-hover-media-query:   false !default;
+$grid-breakpoints: (
+  // Extra small screen / phone
+  xs: 0,
+  // Small screen / phone
+  sm: 34em,
+  // Medium screen / tablet
+  md: 48em,
+  // Large screen / desktop
+  lg: 62em,
+  // Extra large screen / wide desktop
+  xl: 75em
+) !default;
 
 
-// Component defaults
+// Grid containers
 //
-// Control the default styling of most Bootstrap elements by modifying these
-// variables. Mostly focused on spacing.
+// Define the maximum width of `.container` for different screen sizes.
 
-$spacer:                     1rem !default;
-$spacer-x:                   $spacer !default;
-$spacer-y:                   $spacer !default;
+$container-max-widths: (
+  sm: 34rem,    // 480
+  md: 45rem,    // 720
+  lg: 60rem,    // 960
+  xl: 72.25rem  // 1140
+) !default;
+
+
+// Grid columns
+//
+// Set the number of columns and specify the width of the gutters.
+
+$grid-columns:               12 !default;
+$grid-gutter-width:          1.5rem !default;
 
 
 // Typography
@@ -248,45 +305,6 @@ $zindex-modal-bg:          1040 !default;
 $zindex-modal:             1050 !default;
 
 
-// Media queries breakpoints
-//
-// Define the minimum and maximum dimensions at which your layout will change, adapting to different screen sizes.
-
-// Grid system
-//
-// Define your custom responsive grid.
-$grid-breakpoints: (
-  // Extra small screen / phone
-  xs: 0,
-  // Small screen / phone
-  sm: 34em,
-  // Medium screen / tablet
-  md: 48em,
-  // Large screen / desktop
-  lg: 62em,
-  // Extra large screen / wide desktop
-  xl: 75em
-) !default;
-
-// Number of columns in the grid.
-$grid-columns:               12 !default;
-
-// Padding between columns. Gets divided in half for the left and right.
-$grid-gutter-width:          1.5rem !default;
-
-
-// Container sizes
-//
-// Define the maximum width of `.container` for different screen sizes.
-
-$container-max-widths: (
-  sm: 34rem,    // 480
-  md: 45rem,    // 720
-  lg: 60rem,    // 960
-  xl: 72.25rem  // 1140
-) !default;
-
-
 // Navbar
 //
 //
diff --git a/scss/mixins/_alert.scss b/scss/mixins/_alert.scss
index 3faf0b5a5..6ed3a81ab 100644
--- a/scss/mixins/_alert.scss
+++ b/scss/mixins/_alert.scss
@@ -1,14 +1,14 @@
 // Alerts
 
-@mixin alert-variant($background, $border, $text-color) {
+@mixin alert-variant($background, $border, $body-color) {
   background-color: $background;
   border-color: $border;
-  color: $text-color;
+  color: $body-color;
 
   hr {
     border-top-color: darken($border, 5%);
   }
   .alert-link {
-    color: darken($text-color, 10%);
+    color: darken($body-color, 10%);
   }
 }
author	Mark Otto <[email protected]>	2015-08-10 23:38:41 -0700
committer	Mark Otto <[email protected]>	2015-08-10 23:38:41 -0700
commit	a90f6c709306d2bc1411639b1061aed01950239a (patch)
tree	9f2d308295116073b0fc129fa1e8bcfc529e16f5
parent	67765587d9c5c6262612a269f7639c3806754dd0 (diff)
download	bootstrap-a90f6c709306d2bc1411639b1061aed01950239a.tar.xz bootstrap-a90f6c709306d2bc1411639b1061aed01950239a.zip