From b50498acd4ac46eb5c0985bfc330b624bc8a6856 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 8 Jul 2014 02:26:50 -0700 Subject: Clean up variable alignment and comments; change grays to new custom values --- less/variables.less | 90 ++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 50 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 35d53910e..8e4cf667a 100644 --- a/less/variables.less +++ b/less/variables.less @@ -7,18 +7,18 @@ // //## Gray and brand colors for use across Bootstrap. -@gray-base: #000; -@gray-darker: lighten(@gray-base, 13.5%); // #222 -@gray-dark: lighten(@gray-base, 20%); // #333 -@gray: lighten(@gray-base, 33.5%); // #555 -@gray-light: lighten(@gray-base, 46.7%); // #777 -@gray-lighter: lighten(@gray-base, 93.5%); // #eee +@gray-base: #000; +@gray-dark: #373a3c; +@gray-darker: @gray-dark; // TODO: remove +@gray: #55595c; +@gray-light: #818a91; +@gray-lighter: #eceeef; -@brand-primary: #027de7; -@brand-success: #5cb85c; -@brand-info: #5bc0de; -@brand-warning: #f0ad4e; -@brand-danger: #d9534f; +@brand-primary: #027de7; +@brand-success: #5cb85c; +@brand-info: #5bc0de; +@brand-warning: #f0ad4e; +@brand-danger: #d9534f; //== Scaffolding @@ -26,61 +26,51 @@ //## Settings for some of the most global styles. //** Background color for ``. -@body-bg: #fff; +@body-bg: #fff; //** Global text color on ``. -@text-color: @gray-dark; +@text-color: @gray-dark; //** Global textual link color. -@link-color: @brand-primary; +@link-color: @brand-primary; //** Link hover color set via `darken()` function. -@link-hover-color: darken(@link-color, 15%); +@link-hover-color: darken(@link-color, 15%); //== Typography // //## Font, line-height, and color for body text, headings, and more. -@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif; -@font-family-serif: Georgia, "Times New Roman", Times, serif; +@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif; +@font-family-serif: Georgia, "Times New Roman", Times, serif; //** Default monospace fonts for `

`, ``, and ``.
-@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
-@font-family-base:        @font-family-sans-serif;
-
-@font-size-root:          16px;
-@font-size-base:          1rem;
-@font-size-large:         1.25rem;
-@font-size-small:         .85rem;
-@font-size-xs:            .75rem;
-
-@font-size-h1:            3rem;
-@font-size-h2:            2.5rem;
-@font-size-h3:            2rem;
-@font-size-h4:            1.5rem;
-@font-size-h5:            1.25rem;
-@font-size-h6:            1rem;
+@font-family-monospace:      Menlo, Monaco, Consolas, "Courier New", monospace;
+@font-family-base:           @font-family-sans-serif;
+
+//** Pixel value used to responsively scale all typography. Applied to the `` element.
+@font-size-root:             16px;
+//** Sets the `` and more to the root pixel value.
+@font-size-base:             1rem;
+@font-size-large:            1.25rem;
+@font-size-small:            .85rem;
+@font-size-xs:               .75rem;
+
+@font-size-h1:               3rem;
+@font-size-h2:               2.5rem;
+@font-size-h3:               2rem;
+@font-size-h4:               1.5rem;
+@font-size-h5:               1.25rem;
+@font-size-h6:               1rem;
 
 //** Unit-less `line-height` for use in components like buttons.
-@line-height-base:        1.5;
+@line-height-base:           1.5;
 //** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
-@line-height-computed:    (@font-size-root * @line-height-base);
+@line-height-computed:       (@font-size-root * @line-height-base);
 
 //** By default, this inherits from the ``.
-@headings-font-family:    inherit;
-@headings-font-weight:    500;
-@headings-line-height:    1.1;
-@headings-color:          inherit;
-
-
-//== Iconography
-//
-//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
-
-//** Load fonts from this directory.
-@icon-font-path:          "../fonts/";
-//** File name for all font files.
-@icon-font-name:          "glyphicons-halflings-regular";
-//** Element ID within SVG icon file.
-@icon-font-svg-id:        "glyphicons_halflingsregular";
+@headings-font-family:       inherit;
+@headings-font-weight:       500;
+@headings-line-height:       1.1;
+@headings-color:             inherit;
 
 
 //== Components
-- 
cgit v1.2.3