diff options
Diffstat (limited to 'bower_components/bootstrap/less/mixins')
14 files changed, 65 insertions, 19 deletions
diff --git a/bower_components/bootstrap/less/mixins/background-variant.less b/bower_components/bootstrap/less/mixins/background-variant.less index 556e490..a85c22b 100644 --- a/bower_components/bootstrap/less/mixins/background-variant.less +++ b/bower_components/bootstrap/less/mixins/background-variant.less @@ -2,7 +2,8 @@ .bg-variant(@color) { background-color: @color; - a&:hover { + a&:hover, + a&:focus { background-color: darken(@color, 10%); } } diff --git a/bower_components/bootstrap/less/mixins/buttons.less b/bower_components/bootstrap/less/mixins/buttons.less index 409f8f2..6875a97 100644 --- a/bower_components/bootstrap/less/mixins/buttons.less +++ b/bower_components/bootstrap/less/mixins/buttons.less @@ -8,14 +8,31 @@ background-color: @background; border-color: @border; - &:hover, &:focus, + &.focus { + color: @color; + background-color: darken(@background, 10%); + border-color: darken(@border, 25%); + } + &:hover { + color: @color; + background-color: darken(@background, 10%); + border-color: darken(@border, 12%); + } &:active, &.active, .open > .dropdown-toggle& { color: @color; background-color: darken(@background, 10%); border-color: darken(@border, 12%); + + &:hover, + &:focus, + &.focus { + color: @color; + background-color: darken(@background, 17%); + border-color: darken(@border, 25%); + } } &:active, &.active, @@ -28,6 +45,7 @@ &, &:hover, &:focus, + &.focus, &:active, &.active { background-color: @background; diff --git a/bower_components/bootstrap/less/mixins/forms.less b/bower_components/bootstrap/less/mixins/forms.less index e36c4a8..6f55ed9 100644 --- a/bower_components/bootstrap/less/mixins/forms.less +++ b/bower_components/bootstrap/less/mixins/forms.less @@ -10,7 +10,11 @@ .radio, .checkbox, .radio-inline, - .checkbox-inline { + .checkbox-inline, + &.radio label, + &.checkbox label, + &.radio-inline label, + &.checkbox-inline label { color: @text-color; } // Set the border and box shadow on specific inputs to match diff --git a/bower_components/bootstrap/less/mixins/grid-framework.less b/bower_components/bootstrap/less/mixins/grid-framework.less index 6317854..8c23eed 100644 --- a/bower_components/bootstrap/less/mixins/grid-framework.less +++ b/bower_components/bootstrap/less/mixins/grid-framework.less @@ -5,7 +5,7 @@ .make-grid-columns() { // Common styles for all sizes of grid columns, widths 1-12 - .col(@index) when (@index = 1) { // initial + .col(@index) { // initial @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}"; .col((@index + 1), @item); } @@ -19,15 +19,15 @@ // Prevent columns from collapsing when empty min-height: 1px; // Inner gutter via padding - padding-left: (@grid-gutter-width / 2); - padding-right: (@grid-gutter-width / 2); + padding-left: ceil((@grid-gutter-width / 2)); + padding-right: floor((@grid-gutter-width / 2)); } } .col(1); // kickstart it } .float-grid-columns(@class) { - .col(@index) when (@index = 1) { // initial + .col(@index) { // initial @item: ~".col-@{class}-@{index}"; .col((@index + 1), @item); } diff --git a/bower_components/bootstrap/less/mixins/grid.less b/bower_components/bootstrap/less/mixins/grid.less index cae5eaf..f144c15 100644 --- a/bower_components/bootstrap/less/mixins/grid.less +++ b/bower_components/bootstrap/less/mixins/grid.less @@ -13,8 +13,8 @@ // Creates a wrapper for a series of columns .make-row(@gutter: @grid-gutter-width) { - margin-left: (@gutter / -2); - margin-right: (@gutter / -2); + margin-left: ceil((@gutter / -2)); + margin-right: floor((@gutter / -2)); &:extend(.clearfix all); } diff --git a/bower_components/bootstrap/less/mixins/hide-text.less b/bower_components/bootstrap/less/mixins/hide-text.less index c2315e5..bc70118 100644 --- a/bower_components/bootstrap/less/mixins/hide-text.less +++ b/bower_components/bootstrap/less/mixins/hide-text.less @@ -1,6 +1,6 @@ // CSS image replacement // -// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for +// Heads up! v3 launched 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()`. // diff --git a/bower_components/bootstrap/less/mixins/image.less b/bower_components/bootstrap/less/mixins/image.less index 5d2cccb..f233cb3 100644 --- a/bower_components/bootstrap/less/mixins/image.less +++ b/bower_components/bootstrap/less/mixins/image.less @@ -8,7 +8,6 @@ // Keep images from scaling beyond the width of their parents. .img-responsive(@display: block) { display: @display; - width: 100% \9; // Force IE10 and below to size SVG images correctly max-width: 100%; // Part 1: Set a maximum relative to the parent height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching } diff --git a/bower_components/bootstrap/less/mixins/labels.less b/bower_components/bootstrap/less/mixins/labels.less index 6f9e490..9f7a67e 100644 --- a/bower_components/bootstrap/less/mixins/labels.less +++ b/bower_components/bootstrap/less/mixins/labels.less @@ -2,7 +2,7 @@ .label-variant(@color) { background-color: @color; - + &[href] { &:hover, &:focus { diff --git a/bower_components/bootstrap/less/mixins/list-group.less b/bower_components/bootstrap/less/mixins/list-group.less index 8b5b065..03aa190 100644 --- a/bower_components/bootstrap/less/mixins/list-group.less +++ b/bower_components/bootstrap/less/mixins/list-group.less @@ -5,7 +5,8 @@ color: @color; background-color: @background; - a& { + a&, + button& { color: @color; .list-group-item-heading { diff --git a/bower_components/bootstrap/less/mixins/pagination.less b/bower_components/bootstrap/less/mixins/pagination.less index 7deb505..618804f 100644 --- a/bower_components/bootstrap/less/mixins/pagination.less +++ b/bower_components/bootstrap/less/mixins/pagination.less @@ -1,11 +1,12 @@ // Pagination -.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) { +.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) { > li { > a, > span { padding: @padding-vertical @padding-horizontal; font-size: @font-size; + line-height: @line-height; } &:first-child { > a, diff --git a/bower_components/bootstrap/less/mixins/reset-text.less b/bower_components/bootstrap/less/mixins/reset-text.less new file mode 100644 index 0000000..58dd4d1 --- /dev/null +++ b/bower_components/bootstrap/less/mixins/reset-text.less @@ -0,0 +1,18 @@ +.reset-text() { + font-family: @font-family-base; + // We deliberately do NOT reset font-size. + font-style: normal; + font-weight: normal; + letter-spacing: normal; + line-break: auto; + line-height: @line-height-base; + text-align: left; // Fallback for where `start` is not supported + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + white-space: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; +} diff --git a/bower_components/bootstrap/less/mixins/responsive-visibility.less b/bower_components/bootstrap/less/mixins/responsive-visibility.less index f7951c3..ecf1e97 100644 --- a/bower_components/bootstrap/less/mixins/responsive-visibility.less +++ b/bower_components/bootstrap/less/mixins/responsive-visibility.less @@ -4,7 +4,7 @@ // More easily include all the states for responsive-utilities.less. .responsive-visibility() { display: block !important; - table& { display: table; } + table& { display: table !important; } tr& { display: table-row !important; } th&, td& { display: table-cell !important; } diff --git a/bower_components/bootstrap/less/mixins/text-emphasis.less b/bower_components/bootstrap/less/mixins/text-emphasis.less index 0868ef9..9e8a77a 100644 --- a/bower_components/bootstrap/less/mixins/text-emphasis.less +++ b/bower_components/bootstrap/less/mixins/text-emphasis.less @@ -2,7 +2,8 @@ .text-emphasis-variant(@color) { color: @color; - a&:hover { + a&:hover, + a&:focus { color: darken(@color, 10%); } } diff --git a/bower_components/bootstrap/less/mixins/vendor-prefixes.less b/bower_components/bootstrap/less/mixins/vendor-prefixes.less index e2008c8..afd3331 100644 --- a/bower_components/bootstrap/less/mixins/vendor-prefixes.less +++ b/bower_components/bootstrap/less/mixins/vendor-prefixes.less @@ -99,9 +99,12 @@ // Placeholder text .placeholder(@color: @input-color-placeholder) { - &::-moz-placeholder { color: @color; // Firefox - opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526 - &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ + // Firefox + &::-moz-placeholder { + color: @color; + opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526 + } + &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ &::-webkit-input-placeholder { color: @color; } // Safari and Chrome } |