diff options
| author | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
| commit | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (patch) | |
| tree | edb73c6ae943629dbdc51d3350a50a079f7a2f7e /less | |
| parent | 04161a8c753c5f9ef83dd1f0848a17e8c4ab155c (diff) | |
| parent | 7f153974e10980dccbdd485e63941b591e925148 (diff) | |
| download | bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.tar.xz bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/assets/css/docs.css
Diffstat (limited to 'less')
| -rw-r--r-- | less/.csslintrc | 1 | ||||
| -rw-r--r-- | less/buttons.less | 8 | ||||
| -rw-r--r-- | less/forms.less | 12 | ||||
| -rw-r--r-- | less/glyphicons.less | 2 | ||||
| -rw-r--r-- | less/list-group.less | 2 | ||||
| -rw-r--r-- | less/mixins.less | 2 | ||||
| -rw-r--r-- | less/panels.less | 8 | ||||
| -rw-r--r-- | less/tables.less | 2 | ||||
| -rw-r--r-- | less/theme.less | 2 | ||||
| -rw-r--r-- | less/type.less | 48 | ||||
| -rw-r--r-- | less/variables.less | 415 |
11 files changed, 331 insertions, 171 deletions
diff --git a/less/.csslintrc b/less/.csslintrc index 8cf2f846d..005b86236 100644 --- a/less/.csslintrc +++ b/less/.csslintrc @@ -11,6 +11,7 @@ "outline-none": false, "qualified-headings": false, "regex-selectors": false, + "shorthand": false, "text-indent": false, "unique-headings": false, "universal-selector": false, diff --git a/less/buttons.less b/less/buttons.less index b728f332c..4858a8aea 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -60,6 +60,10 @@ .btn-success { .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border); } +// Info appears as blue-green +.btn-info { + .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border); +} // Warning appears as orange .btn-warning { .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border); @@ -68,10 +72,6 @@ .btn-danger { .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border); } -// Info appears as blue-green -.btn-info { - .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border); -} // Link buttons diff --git a/less/forms.less b/less/forms.less index 34f970e2e..0f592252a 100644 --- a/less/forms.less +++ b/less/forms.less @@ -52,6 +52,12 @@ input[type="file"] { display: block; } +// Make range inputs behave like textual form controls +input[type="range"] { + display: block; + width: 100%; +} + // Make multiple select elements height not fixed select[multiple], select[size] { @@ -276,15 +282,15 @@ input[type="checkbox"], } // Feedback states +.has-success { + .form-control-validation(@state-success-text; @state-success-text; @state-success-bg); +} .has-warning { .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg); } .has-error { .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg); } -.has-success { - .form-control-validation(@state-success-text; @state-success-text; @state-success-bg); -} // Static form control text diff --git a/less/glyphicons.less b/less/glyphicons.less index 29ce1c071..789c5e7f4 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -14,7 +14,7 @@ src: ~"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')", ~"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')", ~"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')", - ~"url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg')"; + ~"url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg')"; } // Catchall baseclass diff --git a/less/list-group.less b/less/list-group.less index ed3bfa5a5..3343f8e5e 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -91,9 +91,9 @@ a.list-group-item { // Organizationally, this must come after the `:hover` states. .list-group-item-variant(success; @state-success-bg; @state-success-text); +.list-group-item-variant(info; @state-info-bg; @state-info-text); .list-group-item-variant(warning; @state-warning-bg; @state-warning-text); .list-group-item-variant(danger; @state-danger-bg; @state-danger-text); -.list-group-item-variant(info; @state-info-bg; @state-info-text); // Custom content options diff --git a/less/mixins.less b/less/mixins.less index 31992feca..3af3c8208 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -851,7 +851,7 @@ border-color: @border-color; background-color: @background-color; } - // Optional feedack icon + // Optional feedback icon .form-control-feedback { color: @text-color; } diff --git a/less/panels.less b/less/panels.less index 8de915c7e..bf2cb768a 100644 --- a/less/panels.less +++ b/less/panels.less @@ -59,7 +59,7 @@ > .table, > .table-responsive > .table { margin-bottom: 0; - + > tbody:last-child, > tfoot:last-child { > tr:last-child { @@ -185,12 +185,12 @@ .panel-success { .panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border); } +.panel-info { + .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border); +} .panel-warning { .panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border); } .panel-danger { .panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border); } -.panel-info { - .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border); -} diff --git a/less/tables.less b/less/tables.less index c54b0129c..c41989c04 100644 --- a/less/tables.less +++ b/less/tables.less @@ -157,9 +157,9 @@ table { // Generate the contextual variants .table-row-variant(active; @table-bg-active); .table-row-variant(success; @state-success-bg); +.table-row-variant(info; @state-info-bg); .table-row-variant(warning; @state-warning-bg); .table-row-variant(danger; @state-danger-bg); -.table-row-variant(info; @state-info-bg); // Responsive tables diff --git a/less/theme.less b/less/theme.less index 0addce3f2..6f957fb39 100644 --- a/less/theme.less +++ b/less/theme.less @@ -63,9 +63,9 @@ .btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; } .btn-primary { .btn-styles(@btn-primary-bg); } .btn-success { .btn-styles(@btn-success-bg); } +.btn-info { .btn-styles(@btn-info-bg); } .btn-warning { .btn-styles(@btn-warning-bg); } .btn-danger { .btn-styles(@btn-danger-bg); } -.btn-info { .btn-styles(@btn-info-bg); } diff --git a/less/type.less b/less/type.less index 585584470..91496dc8c 100644 --- a/less/type.less +++ b/less/type.less @@ -97,18 +97,6 @@ cite { font-style: normal; } color: darken(@brand-primary, 10%); } } -.text-warning { - color: @state-warning-text; - &:hover { - color: darken(@state-warning-text, 10%); - } -} -.text-danger { - color: @state-danger-text; - &:hover { - color: darken(@state-danger-text, 10%); - } -} .text-success { color: @state-success-text; &:hover { @@ -121,6 +109,18 @@ cite { font-style: normal; } color: darken(@state-info-text, 10%); } } +.text-warning { + color: @state-warning-text; + &:hover { + color: darken(@state-warning-text, 10%); + } +} +.text-danger { + color: @state-danger-text; + &:hover { + color: darken(@state-danger-text, 10%); + } +} // Contextual backgrounds // For now we'll leave these alongside the text classes until v4 when we can @@ -134,18 +134,6 @@ cite { font-style: normal; } background-color: darken(@brand-primary, 10%); } } -.bg-warning { - background-color: @state-warning-bg; - a&:hover { - background-color: darken(@state-warning-bg, 10%); - } -} -.bg-danger { - background-color: @state-danger-bg; - a&:hover { - background-color: darken(@state-danger-bg, 10%); - } -} .bg-success { background-color: @state-success-bg; a&:hover { @@ -158,6 +146,18 @@ cite { font-style: normal; } background-color: darken(@state-info-bg, 10%); } } +.bg-warning { + background-color: @state-warning-bg; + a&:hover { + background-color: darken(@state-warning-bg, 10%); + } +} +.bg-danger { + background-color: @state-danger-bg; + a&:hover { + background-color: darken(@state-danger-bg, 10%); + } +} // Page header diff --git a/less/variables.less b/less/variables.less index 8e1a702ea..106a73457 100644 --- a/less/variables.less +++ b/less/variables.less @@ -3,11 +3,9 @@ // -------------------------------------------------- -// Global values -// -------------------------------------------------- - -// Grays -// ------------------------- +//== Colors +// +//## Gray and brand colors for use across Bootstrap. @gray-darker: lighten(#000, 13.5%); // #222 @gray-dark: lighten(#000, 20%); // #333 @@ -15,32 +13,35 @@ @gray-light: lighten(#000, 60%); // #999 @gray-lighter: lighten(#000, 93.5%); // #eee -// Brand colors -// ------------------------- - @brand-primary: #428bca; @brand-success: #5cb85c; +@brand-info: #5bc0de; @brand-warning: #f0ad4e; @brand-danger: #d9534f; -@brand-info: #5bc0de; -// Scaffolding -// ------------------------- +//== Scaffolding +// +// ## Settings for some of the most global styles. + +//** Background color for `<body>`. @body-bg: #fff; +//** Global text color on `<body>`. @text-color: @gray-dark; -// Links -// ------------------------- - +//** Global textual link color. @link-color: @brand-primary; +//** Link hover color set via `darken()` function. @link-hover-color: darken(@link-color, 15%); -// Typography -// ------------------------- + +//== 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; +//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`. @font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; @font-family-base: @font-family-sans-serif; @@ -55,67 +56,84 @@ @font-size-h5: @font-size-base; @font-size-h6: ceil((@font-size-base * 0.85)); // ~12px +//** Unit-less `line-height` for use in components like buttons. @line-height-base: 1.428571429; // 20/14 +//** Computed "line-height" (`font-size` × `line-height`) for use with `margin`, `padding`, etc. @line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px +//** By default, this inherits from the `<body>`. @headings-font-family: inherit; @headings-font-weight: 500; @headings-line-height: 1.1; @headings-color: inherit; -// Iconography -// ------------------------- +//-- Iconography +// +//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower. @icon-font-path: "../fonts/"; @icon-font-name: "glyphicons-halflings-regular"; +@icon-font-svg-id: "glyphicons_halflingsregular"; +//== Components +// +//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). -// Components -// ------------------------- -// Based on 14px font-size and 1.428 line-height (~20px to start) +@padding-base-vertical: 6px; +@padding-base-horizontal: 12px; -@padding-base-vertical: 6px; -@padding-base-horizontal: 12px; +@padding-large-vertical: 10px; +@padding-large-horizontal: 16px; -@padding-large-vertical: 10px; -@padding-large-horizontal: 16px; +@padding-small-vertical: 5px; +@padding-small-horizontal: 10px; -@padding-small-vertical: 5px; -@padding-small-horizontal: 10px; +@padding-xs-vertical: 1px; +@padding-xs-horizontal: 5px; -@padding-xs-vertical: 1px; -@padding-xs-horizontal: 5px; +@line-height-large: 1.33; +@line-height-small: 1.5; -@line-height-large: 1.33; -@line-height-small: 1.5; +@border-radius-base: 4px; +@border-radius-large: 6px; +@border-radius-small: 3px; -@border-radius-base: 4px; -@border-radius-large: 6px; -@border-radius-small: 3px; +//** Global color for active items (e.g., navs or dropdowns). +@component-active-color: #fff; +//** Global background color for active items (e.g., navs or dropdowns). +@component-active-bg: @brand-primary; -@component-active-color: #fff; -@component-active-bg: @brand-primary; +//** Width of the `border` for generating carets that indicator dropdowns. +@caret-width-base: 4px; +//** Carets increase slightly in size for larger components. +@caret-width-large: 5px; -@caret-width-base: 4px; -@caret-width-large: 5px; -// Tables -// ------------------------- +//== Tables +// +//## Customizes the `.table` component with basic values, each used across all table variations. -@table-cell-padding: 8px; -@table-condensed-cell-padding: 5px; +//** Padding for `<th>`s and `<td>`s. +@table-cell-padding: 8px; +//** Padding for cells in `.table-condensed`. +@table-condensed-cell-padding: 5px; -@table-bg: transparent; // overall background-color -@table-bg-accent: #f9f9f9; // for striping -@table-bg-hover: #f5f5f5; -@table-bg-active: @table-bg-hover; +//** Default background color used for all tables. +@table-bg: transparent; +//** Background color used for `.table-striped`. +@table-bg-accent: #f9f9f9; +//** Background color used for `.table-hover`. +@table-bg-hover: #f5f5f5; +@table-bg-active: @table-bg-hover; -@table-border-color: #ddd; // table and cell border +//** Border color for table and cell borders. +@table-border-color: #ddd; -// Buttons -// ------------------------- +//== Buttons +// +//## For each of Bootstrap's buttons, define text, background and border color. @btn-font-weight: normal; @@ -131,6 +149,10 @@ @btn-success-bg: @brand-success; @btn-success-border: darken(@btn-success-bg, 5%); +@btn-info-color: #fff; +@btn-info-bg: @brand-info; +@btn-info-border: darken(@btn-info-bg, 5%); + @btn-warning-color: #fff; @btn-warning-bg: @brand-warning; @btn-warning-border: darken(@btn-warning-bg, 5%); @@ -139,68 +161,87 @@ @btn-danger-bg: @brand-danger; @btn-danger-border: darken(@btn-danger-bg, 5%); -@btn-info-color: #fff; -@btn-info-bg: @brand-info; -@btn-info-border: darken(@btn-info-bg, 5%); - @btn-link-disabled-color: @gray-light; -// Forms -// ------------------------- +//== Forms +// +//## +//** `<input>` background color @input-bg: #fff; +//** `<input disabled>` background color @input-bg-disabled: @gray-lighter; +//** Text color for `<input>`s @input-color: @gray; +//** `<input>` border color @input-border: #ccc; +//** `<input>` border radius @input-border-radius: @border-radius-base; +//** Border color for inputs on focus @input-border-focus: #66afe9; +//** Placeholder text color @input-color-placeholder: @gray-light; +//** Default `.form-control` height @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); +//** Large `.form-control` height @input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2); +//** Small `.form-control` height @input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2); @legend-color: @gray-dark; @legend-border-color: #e5e5e5; +//** Background color for textual input addons @input-group-addon-bg: @gray-lighter; +//** Border color for textual input addons @input-group-addon-border-color: @input-border; -// Dropdowns -// ------------------------- +//== Dropdowns +// +//## Dropdown menu container and contents. +//** Background for the dropdown menu. @dropdown-bg: #fff; +//** Dropdown menu `border-color`. @dropdown-border: rgba(0,0,0,.15); +//** Dropdown menu `border-color` **for IE8**. @dropdown-fallback-border: #ccc; +//** Divider color for between dropdown items. @dropdown-divider-bg: #e5e5e5; +//** Dropdown link text color. @dropdown-link-color: @gray-dark; +//** Hover color for dropdown links. @dropdown-link-hover-color: darken(@gray-dark, 5%); +//** Hover background for dropdown links. @dropdown-link-hover-bg: #f5f5f5; +//** Active dropdown menu item text color. @dropdown-link-active-color: @component-active-color; +//** Active dropdown menu item background color. @dropdown-link-active-bg: @component-active-bg; +//** Disabled dropdown menu item background color. @dropdown-link-disabled-color: @gray-light; +//** Text color for headers within dropdown menus. @dropdown-header-color: @gray-light; // Note: Deprecated @dropdown-caret-color as of v3.1 @dropdown-caret-color: #000; -// COMPONENT VARIABLES -// -------------------------------------------------- - - -// Z-index master list -// ------------------------- -// Used for a bird's eye view of components dependent on the z-axis -// Try to avoid customizing these :) +//-- Z-index master list +// +// Warning: Avoid customizing these values. They're used for a bird's eye view +// of components dependent on the z-axis and are designed to all work together. +// +// Note: These variables are not generated into the Customizer. @zindex-navbar: 1000; @zindex-dropdown: 1000; @@ -210,8 +251,10 @@ @zindex-modal-background: 1040; @zindex-modal: 1050; -// Media queries breakpoints -// -------------------------------------------------- + +//== Media queries breakpoints +// +//## Define the breakpoints at which your layout will change, adapting to different screen sizes. // Extra small screen / phone // Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @@ -243,24 +286,24 @@ @screen-md-max: (@screen-lg-min - 1); -// Grid system -// -------------------------------------------------- +//== Grid system +// +//## Define your custom responsive grid. -// Number of columns in the grid system +//** Number of columns in the grid. @grid-columns: 12; -// Padding, to be divided by two and applied to the left and right of all columns +//** Padding between columns. Gets divided in half for the left and right. @grid-gutter-width: 30px; - // Navbar collapse - -// Point at which the navbar becomes uncollapsed +//** Point at which the navbar becomes uncollapsed. @grid-float-breakpoint: @screen-sm-min; -// Point at which the navbar begins collapsing +//** Point at which the navbar begins collapsing. @grid-float-breakpoint-max: (@grid-float-breakpoint - 1); -// Navbar -// ------------------------- +//== Navbar +// +//## // Basics of a navbar @navbar-height: 50px; @@ -294,7 +337,6 @@ // Inverted navbar -// // Reset inverted navbar basics @navbar-inverse-color: @gray-light; @navbar-inverse-bg: #222; @@ -320,9 +362,11 @@ @navbar-inverse-toggle-border-color: #333; -// Navs -// ------------------------- +//== Navs +// +//## +//=== Shared nav styles @nav-link-padding: 10px 15px; @nav-link-hover-bg: @gray-lighter; @@ -331,7 +375,7 @@ @nav-open-link-hover-color: #fff; -// Tabs +//== Tabs @nav-tabs-border-color: #ddd; @nav-tabs-link-hover-border-color: @gray-lighter; @@ -343,14 +387,15 @@ @nav-tabs-justified-link-border-color: #ddd; @nav-tabs-justified-active-link-border-color: @body-bg; -// Pills +//== Pills @nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; @nav-pills-active-link-hover-color: @component-active-color; -// Pagination -// ------------------------- +//== Pagination +// +//## @pagination-color: @link-color; @pagination-bg: #fff; @@ -369,8 +414,9 @@ @pagination-disabled-border: #ddd; -// Pager -// ------------------------- +//== Pager +// +//## @pager-bg: @pagination-bg; @pager-border: @pagination-border; @@ -384,8 +430,9 @@ @pager-disabled-color: @pagination-disabled-color; -// Jumbotron -// ------------------------- +//== Jumbotron +// +//## @jumbotron-padding: 30px; @jumbotron-color: inherit; @@ -394,8 +441,9 @@ @jumbotron-font-size: ceil((@font-size-base * 1.5)); -// Form states and alerts -// ------------------------- +//== Form states and alerts +// +//## Define colors for form feedback states and, by default, alerts. @state-success-text: #3c763d; @state-success-bg: #dff0d8; @@ -414,70 +462,112 @@ @state-danger-border: darken(spin(@state-danger-bg, -10), 5%); -// Tooltips -// ------------------------- +//== Tooltips +// +//## + +//** Tooltip max width @tooltip-max-width: 200px; +//** Tooltip text color @tooltip-color: #fff; +//** Tooltip background color @tooltip-bg: #000; @tooltip-opacity: .9; +//** Tooltip arrow width @tooltip-arrow-width: 5px; +//** Tooltip arrow color @tooltip-arrow-color: @tooltip-bg; -// Popovers -// ------------------------- +//== Popovers +// +//## + +//** Popover body background color @popover-bg: #fff; +//** Popover maximum width @popover-max-width: 276px; +//** Popover border color @popover-border-color: rgba(0,0,0,.2); +//** Popover fallback border color @popover-fallback-border-color: #ccc; +//** Popover title background color @popover-title-bg: darken(@popover-bg, 3%); +//** Popover arrow width @popover-arrow-width: 10px; +//** Popover arrow color @popover-arrow-color: #fff; +//** Popover outer arrow width @popover-arrow-outer-width: (@popover-arrow-width + 1); +//** Popover outer arrow color @popover-arrow-outer-color: rgba(0,0,0,.25); +//** Popover outer arrow fallback color @popover-arrow-outer-fallback-color: #999; -// Labels -// ------------------------- +//== Labels +// +//## +//** Default label background color @label-default-bg: @gray-light; +//** Primary label background color @label-primary-bg: @brand-primary; +//** Success label background color @label-success-bg: @brand-success; +//** Info label background color @label-info-bg: @brand-info; +//** Warning label background color @label-warning-bg: @brand-warning; +//** Danger label background color @label-danger-bg: @brand-danger; +//** Default label text color @label-color: #fff; +//** Default text color of a linked label @label-link-hover-color: #fff; -// Modals -// ------------------------- +//== Modals +// +//## + +//** Padding applied to the modal body @modal-inner-padding: 20px; +//** Padding applied to the modal title @modal-title-padding: 15px; +//** Modal title line-height @modal-title-line-height: @line-height-base; +//** Background color of modal content area @modal-content-bg: #fff; +//** Modal content border color @modal-content-border-color: rgba(0,0,0,.2); +//** Modal content border color <strong>for IE8</strong> @modal-content-fallback-border-color: #999; +//** Modal backdrop background color @modal-backdrop-bg: #000; +//** Modal backdrop opacity @modal-backdrop-opacity: .5; +//** Modal header border color @modal-header-border-color: #e5e5e5; +//** Modal footer border color @modal-footer-border-color: @modal-header-border-color; @modal-lg: 900px; @modal-sm: 300px; -// Alerts -// ------------------------- +//== Alerts +// +//## Define alert colors, border radius, and padding. + @alert-padding: 15px; @alert-border-radius: @border-radius-base; @alert-link-font-weight: bold; @@ -499,39 +589,61 @@ @alert-danger-border: @state-danger-border; -// Progress bars -// ------------------------- +//== Progress bars +// +//## + +//** Background color of the whole progress component @progress-bg: #f5f5f5; +//** Progress bar text color @progress-bar-color: #fff; +//** Default progress bar color @progress-bar-bg: @brand-primary; +//** Success progress bar color @progress-bar-success-bg: @brand-success; +//** Warning progress bar color @progress-bar-warning-bg: @brand-warning; +//** Danger progress bar color @progress-bar-danger-bg: @brand-danger; +//** Info progress bar color @progress-bar-info-bg: @brand-info; -// List group -// ------------------------- +//== List group +// +//## + +//** Background color on `.list-group-item` @list-group-bg: #fff; +//** `.list-group-item` border color @list-group-border: #ddd; +//** List group border radius @list-group-border-radius: @border-radius-base; +//** Background color of single list elements on hover @list-group-hover-bg: #f5f5f5; +//** Text color of active list elements @list-group-active-color: @component-active-color; +//** Background color of active list elements @list-group-active-bg: @component-active-bg; +//** Border color of active list elements @list-group-active-border: @list-group-active-bg; @list-group-active-text-color: lighten(@list-group-active-bg, 40%); @list-group-link-color: #555; @list-group-link-heading-color: #333; -// Panels -// ------------------------- + +//== Panels +// +//## + @panel-bg: #fff; @panel-body-padding: 15px; @panel-border-radius: @border-radius-base; +//** Border color for elements within panels @panel-inner-border: #ddd; @panel-footer-bg: #f5f5f5; @@ -547,6 +659,10 @@ @panel-success-border: @state-success-border; @panel-success-heading-bg: @state-success-bg; +@panel-info-text: @state-info-text; +@panel-info-border: @state-info-border; +@panel-info-heading-bg: @state-info-bg; + @panel-warning-text: @state-warning-text; @panel-warning-border: @state-warning-border; @panel-warning-heading-bg: @state-warning-bg; @@ -555,35 +671,46 @@ @panel-danger-border: @state-danger-border; @panel-danger-heading-bg: @state-danger-bg; -@panel-info-text: @state-info-text; -@panel-info-border: @state-info-border; -@panel-info-heading-bg: @state-info-bg; +//== Thumbnails +// +//## -// Thumbnails -// ------------------------- +//** Padding around the thumbnail image @thumbnail-padding: 4px; +//** Thumbnail background color @thumbnail-bg: @body-bg; +//** Thumbnail border color @thumbnail-border: #ddd; +//** Thumbnail border radius @thumbnail-border-radius: @border-radius-base; +//** Custom text color for thumbnail captions @thumbnail-caption-color: @text-color; +//** Padding around the thumbnail caption @thumbnail-caption-padding: 9px; -// Wells -// ------------------------- +//== Wells +// +//## + @well-bg: #f5f5f5; @well-border: darken(@well-bg, 7%); -// Badges -// ------------------------- +//== Badges +// +//## + @badge-color: #fff; +//** Linked badge text color on hover @badge-link-hover-color: #fff; @badge-bg: @gray-light; +//** Badge text color in active nav link @badge-active-color: @link-color; +//** Badge background color in active nav link @badge-active-bg: #fff; @badge-font-weight: bold; @@ -591,18 +718,25 @@ @badge-border-radius: 10px; -// Breadcrumbs -// ------------------------- +//== Breadcrumbs +// +//## + @breadcrumb-padding-vertical: 8px; @breadcrumb-padding-horizontal: 15px; +//** Breadcrumb background color @breadcrumb-bg: #f5f5f5; +//** Breadcrumb text color @breadcrumb-color: #ccc; +//** Text color of current page in the breadcrumb @breadcrumb-active-color: @gray-light; +//** Textual separator for between breadcrumb elements @breadcrumb-separator: "/"; -// Carousel -// ------------------------ +//== Carousel +// +//## @carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6); @@ -617,15 +751,19 @@ @carousel-caption-color: #fff; -// Close -// ------------------------ +//== Close +// +//## + @close-font-weight: bold; @close-color: #000; @close-text-shadow: 0 1px 0 #fff; -// Code -// ------------------------ +//== Code +// +//## + @code-color: #c7254e; @code-bg: #f9f2f4; @@ -637,36 +775,51 @@ @pre-border-color: #ccc; @pre-scrollable-max-height: 340px; -// Type -// ------------------------ + +//== Type +// +//## + +//** Text muted color @text-muted: @gray-light; +//** Abbreviations and acronyms border color @abbr-border-color: @gray-light; +//** Headings small color @headings-small-color: @gray-light; +//** Blockquote small color @blockquote-small-color: @gray-light; +//** Blockquote border color @blockquote-border-color: @gray-lighter; +//** Page header border color @page-header-border-color: @gray-lighter; -// Miscellaneous -// ------------------------- -// Hr border color +//== Miscellaneous +// +//## + +//** Horizontal line color. @hr-border: @gray-lighter; -// Horizontal forms & lists +//** Horizontal offset for forms and lists. @component-offset-horizontal: 180px; -// Container sizes -// -------------------------------------------------- +//== Container sizes +// +//## Define the maximum width of `.container` for different screen sizes. // Small screen / tablet @container-tablet: ((720px + @grid-gutter-width)); +//** For `@screen-sm-min` and up. @container-sm: @container-tablet; // Medium screen / desktop @container-desktop: ((940px + @grid-gutter-width)); +//** For `@screen-md-min` and up. @container-md: @container-desktop; // Large screen / wide desktop @container-large-desktop: ((1140px + @grid-gutter-width)); +//** For `@screen-lg-min` and up. @container-lg: @container-large-desktop; |
