diff options
| author | Mark Otto <[email protected]> | 2014-03-09 22:01:38 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-09 22:01:38 -0700 |
| commit | ccb17f110de8e90773a6ebfda9e35306d625dc78 (patch) | |
| tree | ad1bc7e6bc41eb9805b6a2531c5c37df7a92cb87 /less | |
| parent | bdd7651e323a93a4e3d207463451dd374b0a70fa (diff) | |
| parent | b1f71e5292017aca978fabb74d256989e1eeea07 (diff) | |
| download | bootstrap-ccb17f110de8e90773a6ebfda9e35306d625dc78.tar.xz bootstrap-ccb17f110de8e90773a6ebfda9e35306d625dc78.zip | |
Merge branch 'master' into fix-8869
Diffstat (limited to 'less')
| -rw-r--r-- | less/.csscomb.json | 4 | ||||
| -rw-r--r-- | less/badges.less | 36 | ||||
| -rw-r--r-- | less/bootstrap.less | 5 | ||||
| -rw-r--r-- | less/button-groups.less | 12 | ||||
| -rw-r--r-- | less/code.less | 1 | ||||
| -rw-r--r-- | less/component-animations.less | 10 | ||||
| -rw-r--r-- | less/forms.less | 70 | ||||
| -rw-r--r-- | less/jumbotron.less | 4 | ||||
| -rw-r--r-- | less/labels.less | 2 | ||||
| -rw-r--r-- | less/list-group.less | 19 | ||||
| -rw-r--r-- | less/mixins.less | 408 | ||||
| -rw-r--r-- | less/modals.less | 2 | ||||
| -rw-r--r-- | less/navbar.less | 40 | ||||
| -rw-r--r-- | less/panels.less | 5 | ||||
| -rw-r--r-- | less/popovers.less | 2 | ||||
| -rw-r--r-- | less/progress-bars.less | 23 | ||||
| -rw-r--r-- | less/responsive-embed.less | 34 | ||||
| -rw-r--r-- | less/scaffolding.less | 16 | ||||
| -rw-r--r-- | less/tables.less | 2 | ||||
| -rw-r--r-- | less/type.less | 22 | ||||
| -rw-r--r-- | less/variables.less | 27 |
21 files changed, 543 insertions, 201 deletions
diff --git a/less/.csscomb.json b/less/.csscomb.json index c3d0c088b..8456e41df 100644 --- a/less/.csscomb.json +++ b/less/.csscomb.json @@ -1,7 +1,7 @@ { "always-semicolon": true, "block-indent": 2, - "colon-space": true, + "colon-space": [0, 1], "color-case": "lower", "color-shorthand": true, "combinator-space": true, @@ -10,7 +10,7 @@ "leading-zero": false, "remove-empty-rulesets": true, "rule-indent": 2, - "stick-brace": true, + "stick-brace": " ", "strip-spaces": true, "unitless-zero": true, "vendor-prefix-align": true, diff --git a/less/badges.less b/less/badges.less index 56828cab7..20624f30d 100644 --- a/less/badges.less +++ b/less/badges.less @@ -3,7 +3,7 @@ // -------------------------------------------------- -// Base classes +// Base class .badge { display: inline-block; min-width: 10px; @@ -32,24 +32,24 @@ top: 0; padding: 1px 5px; } -} -// Hover state, but only for links -a.badge { - &:hover, - &:focus { - color: @badge-link-hover-color; - text-decoration: none; - cursor: pointer; + // Hover state, but only for links + a& { + &:hover, + &:focus { + color: @badge-link-hover-color; + text-decoration: none; + cursor: pointer; + } } -} -// Account for counters in navs -a.list-group-item.active > .badge, -.nav-pills > .active > a > .badge { - color: @badge-active-color; - background-color: @badge-active-bg; -} -.nav-pills > li > a > .badge { - margin-left: 3px; + // Account for badges in navs + a.list-group-item.active > &, + .nav-pills > .active > a > & { + color: @badge-active-color; + background-color: @badge-active-bg; + } + .nav-pills > li > a > & { + margin-left: 3px; + } } diff --git a/less/bootstrap.less b/less/bootstrap.less index b368b8710..61b77474f 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -2,9 +2,10 @@ @import "variables.less"; @import "mixins.less"; -// Reset +// Reset and dependencies @import "normalize.less"; @import "print.less"; +@import "glyphicons.less"; // Core CSS @import "scaffolding.less"; @@ -17,7 +18,6 @@ // Components @import "component-animations.less"; -@import "glyphicons.less"; @import "dropdowns.less"; @import "button-groups.less"; @import "input-groups.less"; @@ -35,6 +35,7 @@ @import "media.less"; @import "list-group.less"; @import "panels.less"; +@import "responsive-embed.less"; @import "wells.less"; @import "close.less"; diff --git a/less/button-groups.less b/less/button-groups.less index 27eb796b8..ff95b0474 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -220,7 +220,17 @@ // Checkbox and radio options +// +// In order to support the browser's form validation feedback, powered by the +// `required` attribute, we have to "hide" the inputs via `opacity`. We cannot +// use `display: none;` or `visibility: hidden;` as that also hides the popover. +// This way, we ensure a DOM element is visible to position the popover from. +// +// See https://github.com/twbs/bootstrap/pull/12794 for more. + [data-toggle="buttons"] > .btn > input[type="radio"], [data-toggle="buttons"] > .btn > input[type="checkbox"] { - display: none; + position: absolute; + z-index: -1; + opacity: 0; } diff --git a/less/code.less b/less/code.less index 3eed26c05..4d0eadc6d 100644 --- a/less/code.less +++ b/less/code.less @@ -17,7 +17,6 @@ code { font-size: 90%; color: @code-color; background-color: @code-bg; - white-space: nowrap; border-radius: @border-radius-base; } diff --git a/less/component-animations.less b/less/component-animations.less index 1efe45e2c..9400a0d32 100644 --- a/less/component-animations.less +++ b/less/component-animations.less @@ -5,7 +5,7 @@ // Heads up! // // We don't use the `.opacity()` mixin here since it causes a bug with text -// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552. +// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552. .fade { opacity: 0; @@ -17,10 +17,12 @@ .collapse { display: none; - &.in { - display: block; - } + + &.in { display: block; } + tr&.in { display: table-row; } + tbody&.in { display: table-row-group; } } + .collapsing { position: relative; height: 0; diff --git a/less/forms.less b/less/forms.less index f607b8509..de17d1c82 100644 --- a/less/forms.less +++ b/less/forms.less @@ -51,7 +51,7 @@ input[type="search"] { input[type="radio"], input[type="checkbox"] { margin: 4px 0 0; - margin-top: 1px \9; /* IE8-9 */ + margin-top: 1px \9; // IE8-9 line-height: normal; } @@ -167,10 +167,20 @@ input[type="search"] { // Special styles for iOS date input // // In Mobile Safari, date inputs require a pixel line-height that matches the -// given height of the input. +// given height of the input. Since this fucks up everything else, we have to +// appropriately reset it for Internet Explorer and the size variations. input[type="date"] { line-height: @input-height-base; + // IE8+ misaligns the text within date inputs, so we reset + line-height: @line-height-base ~"\0"; + + &.input-sm { + line-height: @input-height-small; + } + &.input-lg { + line-height: @input-height-large; + } } @@ -271,18 +281,27 @@ input[type="checkbox"], .form-control { padding-right: (@input-height-base * 1.25); } - - // Feedback icon (requires .glyphicon classes) - .form-control-feedback { - position: absolute; - top: (@line-height-computed + 5); // Height of the `label` and its margin - right: 0; - display: block; - width: @input-height-base; - height: @input-height-base; - line-height: @input-height-base; - text-align: center; - } +} +// Feedback icon (requires .glyphicon classes) +.form-control-feedback { + position: absolute; + top: (@line-height-computed + 5); // Height of the `label` and its margin + right: 0; + display: block; + width: @input-height-base; + height: @input-height-base; + line-height: @input-height-base; + text-align: center; +} +.input-lg + .form-control-feedback { + width: @input-height-large; + height: @input-height-large; + line-height: @input-height-large; +} +.input-sm + .form-control-feedback { + width: @input-height-small; + height: @input-height-small; + line-height: @input-height-small; } // Feedback states @@ -349,6 +368,18 @@ input[type="checkbox"], width: auto; // Prevent labels from stacking above inputs in `.form-group` vertical-align: middle; } + + .input-group { + display: inline-table; + vertical-align: middle; + + .input-group-addon, + .input-group-btn, + .form-control { + width: auto; + } + } + // Input groups need that 100% width though .input-group > .form-control { width: 100%; @@ -394,8 +425,9 @@ input[type="checkbox"], .form-horizontal { - // Consistent vertical alignment of labels, radios, and checkboxes - .control-label, + // Consistent vertical alignment of radios and checkboxes + // + // Labels also get some reset styles, but that is scoped to a media query below. .radio, .checkbox, .radio-inline, @@ -418,12 +450,16 @@ input[type="checkbox"], .form-control-static { padding-top: (@padding-base-vertical + 1); + padding-bottom: (@padding-base-vertical + 1); } - // Only right align form labels here when the columns stop stacking + // Reset spacing and right align labels, but scope to media queries so that + // labels on narrow viewports stack the same as a default form example. @media (min-width: @screen-sm-min) { .control-label { text-align: right; + margin-bottom: 0; + padding-top: (@padding-base-vertical + 1); // Default padding plus a border } } diff --git a/less/jumbotron.less b/less/jumbotron.less index a15e16971..27cd8b81d 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -19,6 +19,10 @@ font-weight: 200; } + > hr { + border-top-color: darken(@jumbotron-bg, 10%); + } + .container & { border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container } diff --git a/less/labels.less b/less/labels.less index 5db1ed12c..9a5a27006 100644 --- a/less/labels.less +++ b/less/labels.less @@ -15,7 +15,7 @@ border-radius: .25em; // Add hover effects, but only for links - &[href] { + a& { &:hover, &:focus { color: @label-link-hover-color; diff --git a/less/list-group.less b/less/list-group.less index 3343f8e5e..2514389b1 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -62,8 +62,27 @@ a.list-group-item { &:hover, &:focus { text-decoration: none; + color: @list-group-link-hover-color; background-color: @list-group-hover-bg; } +} + +.list-group-item { + // Disabled state + &.disabled, + &.disabled:hover, + &.disabled:focus { + background-color: @list-group-disabled-bg; + color: @list-group-disabled-color; + + // Force color to inherit for custom content + .list-group-item-heading { + color: inherit; + } + .list-group-item-text { + color: @list-group-disabled-text-color; + } + } // Active class on item itself, not parent &.active, diff --git a/less/mixins.less b/less/mixins.less index 397da934a..2682b67f8 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -3,8 +3,78 @@ // -------------------------------------------------- +// Table of Contents +// +// Utilities +// - Clearfix +// - WebKit-style focus +// - Center-align a block level element +// - Sizing shortcuts +// - Placeholder text +// - Text overflow +// - Requires inline-block or block for proper styling +// - CSS image replacement +// +// CSS3 properties +// - Single side border-radius +// - Drop shadows +// - Transitions +// - Transformations +// - Animations +// - Backface visibility +// - Prevent browsers from flickering when using CSS 3D transforms. +// - Box sizing +// - User select +// - For selecting text on the page +// - Resize anything +// - CSS3 Content Columns +// - Optional hyphenation +// - Opacity +// +// Gradients +// - Reset filters for IE +// - Retina images +// - Responsive image +// +// Component mixins +// - Horizontal dividers +// - Dividers (basically an hr) within dropdowns and nav lists +// - Panels +// - Alerts +// - Tables +// - List Groups +// - Button variants +// - Button sizes +// - Pagination +// - Labels +// - Contextual backgrounds +// - Typography +// - Navbar vertical align +// - Vertically center elements in the navbar +// - Progress bars +// +// Responsive utilities +// +// Forms +// - Form control focus state +// - Form control sizing +// +// Grid system +// - Centered container element +// - Generate the extra small columns +// - Generate the small columns +// - Generate the medium columns +// - Generate the large columns +// +// Framework grid generation +// - Loop to generate grid all grid classes +// - Form validation states +// - Form control focus state + + + // Utilities -// ------------------------- +// -------------------------------------------------- // Clearfix // Source: http://nicolasgallagher.com/micro-clearfix-hack/ @@ -72,8 +142,7 @@ // // Heads up! v3 launched with with only `.hide-text()`, but per our pattern for // mixins being reused as classes with the same name, this doesn't hold up. As -// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`. Note -// that we cannot chain the mixins together in Less, so they are repeated. +// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`. // // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757 @@ -92,7 +161,7 @@ -// CSS3 PROPERTIES +// CSS3 properties // -------------------------------------------------- // Single side border-radius @@ -124,22 +193,39 @@ } // Transitions +// +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .transition(@transition) { -webkit-transition: @transition; + -o-transition: @transition; transition: @transition; } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .transition-property(@transition-property) { -webkit-transition-property: @transition-property; transition-property: @transition-property; } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .transition-delay(@transition-delay) { -webkit-transition-delay: @transition-delay; transition-delay: @transition-delay; } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .transition-duration(@transition-duration) { -webkit-transition-duration: @transition-duration; transition-duration: @transition-duration; } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) +.transition-timing-function(@timing-function) { + -webkit-transition-timing-function: @timing-function; + transition-timing-function: @timing-function; +} + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .transition-transform(@transition) { -webkit-transition: -webkit-transform @transition; -moz-transition: -moz-transform @transition; @@ -148,65 +234,100 @@ } // Transformations +// +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .scale(@ratio) { -webkit-transform: scale(@ratio); -ms-transform: scale(@ratio); // IE9 only + -o-transform: scale(@ratio); transform: scale(@ratio); } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .scale(@ratioX; @ratioY) { -webkit-transform: scale(@ratioX, @ratioY); -ms-transform: scale(@ratioX, @ratioY); // IE9 only + -o-transform: scale(@ratioX, @ratioY); transform: scale(@ratioX, @ratioY); } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .scaleX(@ratio) { -webkit-transform: scaleX(@ratio); -ms-transform: scaleX(@ratio); // IE9 only + -o-transform: scaleX(@ratio); transform: scaleX(@ratio); } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .scaleY(@ratio) { -webkit-transform: scaleY(@ratio); -ms-transform: scaleY(@ratio); // IE9 only + -o-transform: scaleY(@ratio); transform: scaleY(@ratio); } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .skew(@x; @y) { -webkit-transform: skew(@x, @y); -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+ + -o-transform: skew(@x, @y); transform: skew(@x, @y); } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .translate(@x; @y) { -webkit-transform: translate(@x, @y); -ms-transform: translate(@x, @y); // IE9 only + -o-transform: translate(@x, @y); transform: translate(@x, @y); } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .translate3d(@x; @y; @z) { -webkit-transform: translate3d(@x, @y, @z); transform: translate3d(@x, @y, @z); } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .rotate(@degrees) { -webkit-transform: rotate(@degrees); -ms-transform: rotate(@degrees); // IE9 only + -o-transform: rotate(@degrees); transform: rotate(@degrees); } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .rotateX(@degrees) { -webkit-transform: rotateX(@degrees); -ms-transform: rotateX(@degrees); // IE9 only + -o-transform: rotateX(@degrees); transform: rotateX(@degrees); } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .rotateY(@degrees) { -webkit-transform: rotateY(@degrees); -ms-transform: rotateY(@degrees); // IE9 only + -o-transform: rotateY(@degrees); transform: rotateY(@degrees); } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .perspective(@perspective) { -webkit-perspective: @perspective; -moz-perspective: @perspective; perspective: @perspective; } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .perspective-origin(@perspective) { -webkit-perspective-origin: @perspective; -moz-perspective-origin: @perspective; perspective-origin: @perspective; } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .transform-origin(@origin) { -webkit-transform-origin: @origin; -moz-transform-origin: @origin; @@ -215,38 +336,58 @@ } // Animations +// +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .animation(@animation) { -webkit-animation: @animation; + -o-animation: @animation; animation: @animation; } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .animation-name(@name) { -webkit-animation-name: @name; animation-name: @name; } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .animation-duration(@duration) { -webkit-animation-duration: @duration; animation-duration: @duration; } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .animation-timing-function(@timing-function) { -webkit-animation-timing-function: @timing-function; animation-timing-function: @timing-function; } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .animation-delay(@delay) { -webkit-animation-delay: @delay; animation-delay: @delay; } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .animation-iteration-count(@iteration-count) { -webkit-animation-iteration-count: @iteration-count; animation-iteration-count: @iteration-count; } + +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .animation-direction(@direction) { -webkit-animation-direction: @direction; animation-direction: @direction; } +.animation-fill-mode(@fill-mode) { + -webkit-animation-fill-mode: @fill-mode; + animation-fill-mode: @fill-mode; +} // Backface visibility // Prevent browsers from flickering when using CSS 3D transforms. // Default value is `visible`, but can be changed to `hidden` +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .backface-visibility(@visibility){ -webkit-backface-visibility: @visibility; -moz-backface-visibility: @visibility; @@ -254,6 +395,7 @@ } // Box sizing +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .box-sizing(@boxmodel) { -webkit-box-sizing: @boxmodel; -moz-box-sizing: @boxmodel; @@ -262,6 +404,7 @@ // User select // For selecting text on the page +// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4) .user-select(@select) { -webkit-user-select: @select; -moz-user-select: @select; @@ -305,7 +448,7 @@ -// GRADIENTS +// Gradients // -------------------------------------------------- #gradient { @@ -316,7 +459,8 @@ // Color stops are not available in IE9 and below. .horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) { background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1-6, Chrome 10+ - background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + background-image: -o-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // Opera 12 + background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ background-repeat: repeat-x; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down } @@ -327,6 +471,7 @@ // Color stops are not available in IE9 and below. .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) { background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1-6, Chrome 10+ + background-image: -o-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Opera 12 background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ background-repeat: repeat-x; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down @@ -335,16 +480,19 @@ .directional(@start-color: #555; @end-color: #333; @deg: 45deg) { background-repeat: repeat-x; background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1-6, Chrome 10+ + background-image: -o-linear-gradient(@deg, @start-color, @end-color); // Opera 12 background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ } .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) { background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color); + background-image: -o-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color); background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color); background-repeat: no-repeat; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback } .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) { background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color); + background-image: -o-linear-gradient(@start-color, @mid-color @color-stop, @end-color); background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color); background-repeat: no-repeat; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback @@ -356,6 +504,7 @@ } .striped(@color: rgba(255,255,255,.15); @angle: 45deg) { background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent); background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent); } } @@ -371,9 +520,10 @@ // Retina images -// -// Short retina mixin for setting background-image and -size +// -------------------------------------------------- +// Short retina mixin for setting background-image and -size. Note that the +// spelling of `min--moz-device-pixel-ratio` is intentional. .img-retina(@file-1x; @file-2x; @width-1x; @height-1x) { background-image: url("@{file-1x}"); @@ -390,10 +540,11 @@ } + // Responsive image -// -// Keep images from scaling beyond the width of their parents. +// -------------------------------------------------- +// Keep images from scaling beyond the width of their parents. .img-responsive(@display: block) { display: @display; max-width: 100%; // Part 1: Set a maximum relative to the parent @@ -401,11 +552,12 @@ } -// COMPONENT MIXINS + +// Component mixins // -------------------------------------------------- // Horizontal dividers -// ------------------------- +// // Dividers (basically an hr) within dropdowns and nav lists .nav-divider(@color: #e5e5e5) { height: 1px; @@ -415,7 +567,6 @@ } // Panels -// ------------------------- .panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) { border-color: @border; @@ -424,19 +575,18 @@ background-color: @heading-bg-color; border-color: @heading-border; - + .panel-collapse .panel-body { + + .panel-collapse > .panel-body { border-top-color: @border; } } & > .panel-footer { - + .panel-collapse .panel-body { + + .panel-collapse > .panel-body { border-bottom-color: @border; } } } // Alerts -// ------------------------- .alert-variant(@background; @border; @text-color) { background-color: @background; border-color: @border; @@ -451,7 +601,6 @@ } // Tables -// ------------------------- .table-row-variant(@state; @background) { // Exact selectors below required to override `.table-striped` and prevent // inheritance to nested tables. @@ -479,7 +628,6 @@ } // List Groups -// ------------------------- .list-group-item-variant(@state; @background; @color) { .list-group-item-@{state} { color: @color; @@ -507,7 +655,7 @@ } // Button variants -// ------------------------- +// // Easily pump out default styles, as well as :hover, :focus, :active, // and disabled options for all buttons .button-variant(@color; @background; @border) { @@ -521,7 +669,7 @@ &.active, .open .dropdown-toggle& { color: @color; - background-color: darken(@background, 8%); + background-color: darken(@background, 10%); border-color: darken(@border, 12%); } &:active, @@ -549,7 +697,6 @@ } // Button sizes -// ------------------------- .button-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) { padding: @padding-vertical @padding-horizontal; font-size: @font-size; @@ -558,7 +705,6 @@ } // Pagination -// ------------------------- .pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) { > li { > a, @@ -582,7 +728,6 @@ } // Labels -// ------------------------- .label-variant(@color) { background-color: @color; &[href] { @@ -594,7 +739,6 @@ } // Contextual backgrounds -// ------------------------- .bg-variant(@color) { background-color: @color; a&:hover { @@ -603,7 +747,6 @@ } // Typography -// ------------------------- .text-emphasis-variant(@color) { color: @color; a&:hover { @@ -612,7 +755,7 @@ } // Navbar vertical align -// ------------------------- +// // Vertically center elements in the navbar. // Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin. .navbar-vertical-align(@element-height) { @@ -621,7 +764,6 @@ } // Progress bars -// ------------------------- .progress-bar-variant(@color) { background-color: @color; .progress-striped & { @@ -630,7 +772,7 @@ } // Responsive utilities -// ------------------------- +// // More easily include all the states for responsive-utilities.less. // Note: Deprecated .responsive-visibility() as of v3.2.0 .responsive-visibility() { @@ -647,8 +789,97 @@ } -// Grid System -// ----------- + +// Form validation states +// +// Used in forms.less to generate the form validation CSS for warnings, errors, +// and successes. + +.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) { + // Color the label and help text + .help-block, + .control-label, + .radio, + .checkbox, + .radio-inline, + .checkbox-inline { + color: @text-color; + } + // Set the border and box shadow on specific inputs to match + .form-control { + border-color: @border-color; + .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work + &:focus { + border-color: darken(@border-color, 10%); + @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%); + .box-shadow(@shadow); + } + } + // Set validation states also for addons + .input-group-addon { + color: @text-color; + border-color: @border-color; + background-color: @background-color; + } + // Optional feedback icon + .form-control-feedback { + color: @text-color; + } +} + + + +// Forms +// -------------------------------------------------- + +// Form control focus state +// +// Generate a customized focus state and for any input with the specified color, +// which defaults to the `@input-focus-border` variable. +// +// We highly encourage you to not customize the default value, but instead use +// this to tweak colors on an as-needed basis. This aesthetic change is based on +// WebKit's default styles, but applicable to a wider range of browsers. Its +// usability and accessibility should be taken into account with any change. +// +// Example usage: change the default blue border and shadow to white for better +// contrast against a dark gray background. +.form-control-focus(@color: @input-border-focus) { + @color-rgba: rgba(red(@color), green(@color), blue(@color), .6); + &:focus { + border-color: @color; + outline: 0; + .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @{color-rgba}"); + } +} + +// Form control sizing +// +// Relative text size, padding, and border-radii changes for form controls. For +// horizontal sizing, wrap controls in the predefined grid classes. `<select>` +// element gets special love because it's special, and that's a fact! +.input-size(@input-height; @padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) { + height: @input-height; + padding: @padding-vertical @padding-horizontal; + font-size: @font-size; + line-height: @line-height; + border-radius: @border-radius; + + select& { + height: @input-height; + line-height: @input-height; + } + + textarea&, + select[multiple]& { + height: auto; + } +} + + + +// Grid system +// -------------------------------------------------- // Centered container element .container-fixed() { @@ -676,22 +907,15 @@ padding-right: (@gutter / 2); } .make-xs-column-offset(@columns) { - @media (min-width: @screen-xs-min) { - margin-left: percentage((@columns / @grid-columns)); - } + margin-left: percentage((@columns / @grid-columns)); } .make-xs-column-push(@columns) { - @media (min-width: @screen-xs-min) { - left: percentage((@columns / @grid-columns)); - } + left: percentage((@columns / @grid-columns)); } .make-xs-column-pull(@columns) { - @media (min-width: @screen-xs-min) { - right: percentage((@columns / @grid-columns)); - } + right: percentage((@columns / @grid-columns)); } - // Generate the small columns .make-sm-column(@columns; @gutter: @grid-gutter-width) { position: relative; @@ -720,7 +944,6 @@ } } - // Generate the medium columns .make-md-column(@columns; @gutter: @grid-gutter-width) { position: relative; @@ -749,7 +972,6 @@ } } - // Generate the large columns .make-lg-column(@columns; @gutter: @grid-gutter-width) { position: relative; @@ -779,11 +1001,12 @@ } + // Framework grid generation -// +// -------------------------------------------------- + // Used only by Bootstrap to generate the correct number of grid classes given // any value of `@grid-columns`. - .make-grid-columns() { // Common styles for all sizes of grid columns, widths 1-12 .col(@index) when (@index = 1) { // initial @@ -829,16 +1052,26 @@ width: percentage((@index / @grid-columns)); } } -.calc-grid-column(@index, @class, @type) when (@type = push) { +.calc-grid-column(@index, @class, @type) when (@type = push) and (@index > 0) { .col-@{class}-push-@{index} { left: percentage((@index / @grid-columns)); } } -.calc-grid-column(@index, @class, @type) when (@type = pull) { +.calc-grid-column(@index, @class, @type) when (@type = push) and (@index = 0) { + .col-@{class}-push-0 { + left: auto; + } +} +.calc-grid-column(@index, @class, @type) when (@type = pull) and (@index > 0) { .col-@{class}-pull-@{index} { right: percentage((@index / @grid-columns)); } } +.calc-grid-column(@index, @class, @type) when (@type = pull) and (@index = 0) { + .col-@{class}-pull-0 { + right: auto; + } +} .calc-grid-column(@index, @class, @type) when (@type = offset) { .col-@{class}-offset-@{index} { margin-left: percentage((@index / @grid-columns)); @@ -860,86 +1093,3 @@ .loop-grid-columns(@grid-columns, @class, push); .loop-grid-columns(@grid-columns, @class, offset); } - -// Form validation states -// -// Used in forms.less to generate the form validation CSS for warnings, errors, -// and successes. - -.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) { - // Color the label and help text - .help-block, - .control-label, - .radio, - .checkbox, - .radio-inline, - .checkbox-inline { - color: @text-color; - } - // Set the border and box shadow on specific inputs to match - .form-control { - border-color: @border-color; - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work - &:focus { - border-color: darken(@border-color, 10%); - @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%); - .box-shadow(@shadow); - } - } - // Set validation states also for addons - .input-group-addon { - color: @text-color; - border-color: @border-color; - background-color: @background-color; - } - // Optional feedback icon - .form-control-feedback { - color: @text-color; - } -} - -// Form control focus state -// -// Generate a customized focus state and for any input with the specified color, -// which defaults to the `@input-focus-border` variable. -// -// We highly encourage you to not customize the default value, but instead use -// this to tweak colors on an as-needed basis. This aesthetic change is based on -// WebKit's default styles, but applicable to a wider range of browsers. Its -// usability and accessibility should be taken into account with any change. -// -// Example usage: change the default blue border and shadow to white for better -// contrast against a dark gray background. - -.form-control-focus(@color: @input-border-focus) { - @color-rgba: rgba(red(@color), green(@color), blue(@color), .6); - &:focus { - border-color: @color; - outline: 0; - .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @{color-rgba}"); - } -} - -// Form control sizing -// -// Relative text size, padding, and border-radii changes for form controls. For -// horizontal sizing, wrap controls in the predefined grid classes. `<select>` -// element gets special love because it's special, and that's a fact! - -.input-size(@input-height; @padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) { - height: @input-height; - padding: @padding-vertical @padding-horizontal; - font-size: @font-size; - line-height: @line-height; - border-radius: @border-radius; - - select& { - height: @input-height; - line-height: @input-height; - } - - textarea&, - select[multiple]& { - height: auto; - } -} diff --git a/less/modals.less b/less/modals.less index f4e95346b..0ba977e6d 100644 --- a/less/modals.less +++ b/less/modals.less @@ -98,7 +98,7 @@ // Footer (for actions) .modal-footer { - padding: (@modal-inner-padding - 1) @modal-inner-padding @modal-inner-padding; + padding: @modal-inner-padding; text-align: right; // right align buttons border-top: 1px solid @modal-footer-border-color; &:extend(.clearfix all); // clear it in case folks use .pull-* classes on buttons diff --git a/less/navbar.less b/less/navbar.less index 8c4c210b2..6ddf26356 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -48,7 +48,6 @@ // content for the user's viewport. .navbar-collapse { - max-height: @navbar-collapse-max-height; overflow-x: visible; padding-right: @navbar-padding-horizontal; padding-left: @navbar-padding-horizontal; @@ -88,6 +87,17 @@ } } +.navbar-fixed-top, +.navbar-fixed-bottom { + .navbar-collapse { + max-height: @navbar-collapse-max-height; + + @media (max-width: @screen-phone) and (orientation: landscape) { + max-height: 200px; + } + } +} + // Both navbar header and collapse // @@ -492,6 +502,20 @@ } } + .btn-link { + color: @navbar-default-link-color; + &:hover, + &:focus { + color: @navbar-default-link-hover-color; + } + &[disabled], + fieldset[disabled] & { + &:hover, + &:focus { + color: @navbar-default-link-disabled-color; + } + } + } } // Inverse navbar @@ -613,4 +637,18 @@ } } + .btn-link { + color: @navbar-inverse-link-color; + &:hover, + &:focus { + color: @navbar-inverse-link-hover-color; + } + &[disabled], + fieldset[disabled] & { + &:hover, + &:focus { + color: @navbar-inverse-link-disabled-color; + } + } + } } diff --git a/less/panels.less b/less/panels.less index 20dd14938..9afa4cbfd 100644 --- a/less/panels.less +++ b/less/panels.less @@ -20,7 +20,7 @@ // Optional heading .panel-heading { - padding: 10px 15px; + padding: @panel-heading-padding; border-bottom: 1px solid transparent; .border-top-radius((@panel-border-radius - 1)); @@ -43,7 +43,7 @@ // Optional footer (stays gray in every modifier class) .panel-footer { - padding: 10px 15px; + padding: @panel-footer-padding; background-color: @panel-footer-bg; border-top: 1px solid @panel-inner-border; .border-bottom-radius((@panel-border-radius - 1)); @@ -199,7 +199,6 @@ .panel { margin-bottom: 0; border-radius: @panel-border-radius; - overflow: hidden; // crop contents when collapsed + .panel { margin-top: 5px; } diff --git a/less/popovers.less b/less/popovers.less index 696d74c7d..bf6af40a0 100644 --- a/less/popovers.less +++ b/less/popovers.less @@ -37,7 +37,7 @@ line-height: 18px; background-color: @popover-title-bg; border-bottom: 1px solid darken(@popover-title-bg, 5%); - border-radius: 5px 5px 0 0; + border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0; } .popover-content { diff --git a/less/progress-bars.less b/less/progress-bars.less index 76c87be17..74b702843 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -6,13 +6,6 @@ // Bar animations // ------------------------- -// WebKit -@-webkit-keyframes progress-bar-stripes { - from { background-position: 40px 0; } - to { background-position: 0 0; } -} - -// Spec and IE10+ @keyframes progress-bar-stripes { from { background-position: 40px 0; } to { background-position: 0 0; } @@ -58,6 +51,22 @@ .animation(progress-bar-stripes 2s linear infinite); } +// Account for lower percentages +.progress-bar { + &[aria-valuenow="1"], + &[aria-valuenow="2"] { + min-width: 30px; + } + + &[aria-valuenow="0"] { + color: @gray-light; + min-width: 30px; + background-color: transparent; + background-image: none; + box-shadow: none; + } +} + // Variations diff --git a/less/responsive-embed.less b/less/responsive-embed.less new file mode 100644 index 000000000..a884d49fe --- /dev/null +++ b/less/responsive-embed.less @@ -0,0 +1,34 @@ +// Embeds responsive +// +// Credit: Nicolas Gallagher and SUIT CSS. + +.embed-responsive { + position: relative; + display: block; + height: 0; + padding: 0; + overflow: hidden; + + .embed-responsive-item, + iframe, + embed, + object { + position: absolute; + top: 0; + left: 0; + bottom: 0; + height: 100%; + width: 100%; + border: 0; + } + + // Modifier class for 16:9 aspect ratio + &.embed-responsive-16by9 { + padding-bottom: 56.25%; + } + + // Modifier class for 4:3 aspect ratio + &.embed-responsive-4by3 { + padding-bottom: 75%; + } +} diff --git a/less/scaffolding.less b/less/scaffolding.less index fe29f2d62..c658d7bf5 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -132,3 +132,19 @@ hr { clip: rect(0,0,0,0); border: 0; } + +// Use in conjunction with .sr-only to only display content when it's focused. +// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1 +// Credit: HTML5 Boilerplate + +.sr-only-focusable { + &:active, + &:focus { + position: static; + width: auto; + height: auto; + margin: 0; + overflow: visible; + clip: auto; + } +} diff --git a/less/tables.less b/less/tables.less index d5c0afd01..555d7924c 100644 --- a/less/tables.less +++ b/less/tables.less @@ -169,7 +169,7 @@ table { // will display normally. .table-responsive { - @media (max-width: @screen-xs-max) { + @media screen and (max-width: @screen-xs-max) { width: 100%; margin-bottom: (@line-height-computed * 0.75); overflow-y: hidden; diff --git a/less/type.less b/less/type.less index 5e2a21905..91298f1c0 100644 --- a/less/type.less +++ b/less/type.less @@ -81,6 +81,12 @@ small, // Undo browser default styling cite { font-style: normal; } +mark, +.mark { + background-color: @state-warning-bg; + padding: .2em; +} + // Alignment .text-left { text-align: left; } .text-right { text-align: right; } @@ -141,7 +147,7 @@ cite { font-style: normal; } // Lists -// -------------------------------------------------- +// ------------------------- // Unordered and Ordered lists ul, @@ -195,8 +201,12 @@ dd { // Defaults to being stacked without any of the below styles applied, until the // grid breakpoint is reached (default of ~768px). -@media (min-width: @grid-float-breakpoint) { - .dl-horizontal { +.dl-horizontal { + dd { + &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present + } + + @media (min-width: @grid-float-breakpoint) { dt { float: left; width: (@component-offset-horizontal - 20); @@ -206,13 +216,13 @@ dd { } dd { margin-left: @component-offset-horizontal; - &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present } } } -// MISC -// ---- + +// Misc +// ------------------------- // Abbreviations and acronyms abbr[title], diff --git a/less/variables.less b/less/variables.less index 3846adc59..82616ac56 100644 --- a/less/variables.less +++ b/less/variables.less @@ -68,14 +68,18 @@ @headings-color: inherit; -//-- Iconography +//== Iconography // -//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower. +//## 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 // //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). @@ -558,7 +562,7 @@ //## //** Padding applied to the modal body -@modal-inner-padding: 20px; +@modal-inner-padding: 15px; //** Padding applied to the modal title @modal-title-padding: 15px; @@ -643,17 +647,26 @@ //** List group border radius @list-group-border-radius: @border-radius-base; -//** Background color of single list elements on hover +//** Background color of single list items on hover @list-group-hover-bg: #f5f5f5; -//** Text color of active list elements +//** Text color of active list items @list-group-active-color: @component-active-color; -//** Background color of active list elements +//** Background color of active list items @list-group-active-bg: @component-active-bg; //** Border color of active list elements @list-group-active-border: @list-group-active-bg; +//** Text color for content within active list items @list-group-active-text-color: lighten(@list-group-active-bg, 40%); +//** Text color of disabled list items +@list-group-disabled-color: @gray-light; +//** Background color of disabled list items +@list-group-disabled-bg: @gray-lighter; +//** Text color for content within disabled list items +@list-group-disabled-text-color: @list-group-disabled-color; + @list-group-link-color: #555; +@list-group-link-hover-color: @list-group-link-color; @list-group-link-heading-color: #333; @@ -663,6 +676,8 @@ @panel-bg: #fff; @panel-body-padding: 15px; +@panel-heading-padding: 10px 15px; +@panel-footer-padding: @panel-heading-padding; @panel-border-radius: @border-radius-base; //** Border color for elements within panels |
