diff options
Diffstat (limited to 'bower_components/bootstrap/less/mixins')
5 files changed, 14 insertions, 6 deletions
diff --git a/bower_components/bootstrap/less/mixins/buttons.less b/bower_components/bootstrap/less/mixins/buttons.less index 409f8f20..92d8a056 100644 --- a/bower_components/bootstrap/less/mixins/buttons.less +++ b/bower_components/bootstrap/less/mixins/buttons.less @@ -10,6 +10,7 @@ &:hover, &:focus, + &.focus, &:active, &.active, .open > .dropdown-toggle& { @@ -28,6 +29,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 e36c4a8c..6f55ed96 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/image.less b/bower_components/bootstrap/less/mixins/image.less index 5d2cccb2..f233cb3e 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 6f9e490b..9f7a67ee 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/vendor-prefixes.less b/bower_components/bootstrap/less/mixins/vendor-prefixes.less index e2008c8b..31f8e2f7 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; // See https://github.com/twbs/bootstrap/pull/11526 + } + &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ &::-webkit-input-placeholder { color: @color; } // Safari and Chrome } |