Skip to content

B
bootstrap
Commit b50498ac authored by Mark Otto's avatar Mark Otto
Browse files
Options

Clean up variable alignment and comments; change grays to new custom values

parent d7b38d8c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 160 deletions
dist/css/bootstrap.css
View file @ b50498ac
This diff is collapsed.
dist/css/bootstrap.css.map
View file @ b50498ac
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ b50498ac
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/dist/css/bootstrap.css
View file @ b50498ac
This diff is collapsed.
docs/dist/css/bootstrap.css.map
View file @ b50498ac
This diff was suppressed by a .gitattributes entry.
docs/dist/css/bootstrap.min.css
View file @ b50498ac
This source diff could not be displayed because it is too large. You can view the blob instead.
less/variables.less
View file @ b50498ac
...@@ -7,18 +7,18 @@ ...@@ -7,18 +7,18 @@
// //
//## Gray and brand colors for use across Bootstrap. //## Gray and brand colors for use across Bootstrap.
@gray-base: #000; @gray-base: #000;
@gray-darker: lighten(@gray-base, 13.5%); // #222 @gray-dark: #373a3c;
@gray-dark: lighten(@gray-base, 20%); // #333 @gray-darker: @gray-dark; // TODO: remove
@gray: lighten(@gray-base, 33.5%); // #555 @gray: #55595c;
@gray-light: lighten(@gray-base, 46.7%); // #777 @gray-light: #818a91;
@gray-lighter: lighten(@gray-base, 93.5%); // #eee @gray-lighter: #eceeef;
@brand-primary: #027de7; @brand-primary: #027de7;
@brand-success: #5cb85c; @brand-success: #5cb85c;
@brand-info: #5bc0de; @brand-info: #5bc0de;
@brand-warning: #f0ad4e; @brand-warning: #f0ad4e;
@brand-danger: #d9534f; @brand-danger: #d9534f;
//== Scaffolding //== Scaffolding
...@@ -26,61 +26,51 @@ ...@@ -26,61 +26,51 @@
//## Settings for some of the most global styles. //## Settings for some of the most global styles.
//** Background color for `<body>`. //** Background color for `<body>`.
@body-bg: #fff; @body-bg: #fff;
//** Global text color on `<body>`. //** Global text color on `<body>`.
@text-color: @gray-dark; @text-color: @gray-dark;
//** Global textual link color. //** Global textual link color.
@link-color: @brand-primary; @link-color: @brand-primary;
//** Link hover color set via `darken()` function. //** Link hover color set via `darken()` function.
@link-hover-color: darken(@link-color, 15%); @link-hover-color: darken(@link-color, 15%);
//== Typography //== Typography
// //
//## Font, line-height, and color for body text, headings, and more. //## Font, line-height, and color for body text, headings, and more.
@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif; @font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif; @font-family-serif: Georgia, "Times New Roman", Times, serif;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`. //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; @font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif; @font-family-base: @font-family-sans-serif;
@font-size-root: 16px; //** Pixel value used to responsively scale all typography. Applied to the `<html>` element.
@font-size-base: 1rem; @font-size-root: 16px;
@font-size-large: 1.25rem; //** Sets the `<body>` and more to the root pixel value.
@font-size-small: .85rem; @font-size-base: 1rem;
@font-size-xs: .75rem; @font-size-large: 1.25rem;
@font-size-small: .85rem;
@font-size-h1: 3rem; @font-size-xs: .75rem;
@font-size-h2: 2.5rem;
@font-size-h3: 2rem; @font-size-h1: 3rem;
@font-size-h4: 1.5rem; @font-size-h2: 2.5rem;
@font-size-h5: 1.25rem; @font-size-h3: 2rem;
@font-size-h6: 1rem; @font-size-h4: 1.5rem;
@font-size-h5: 1.25rem;
@font-size-h6: 1rem;
//** Unit-less `line-height` for use in components like buttons. //** 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. //** 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 `<body>`. //** By default, this inherits from the `<body>`.
@headings-font-family: inherit; @headings-font-family: inherit;
@headings-font-weight: 500; @headings-font-weight: 500;
@headings-line-height: 1.1; @headings-line-height: 1.1;
@headings-color: inherit; @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";
//== Components //== Components
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment