diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-07-12 18:44:16 +0400 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-07-12 20:23:39 +0400 |
commit | 43a76e57c9e3d8c53603ef0956b80e9dfcb24931 (patch) | |
tree | 574c4c47cdc67ff2b3d623cec533b9ac12ed2aee /assets/stylesheets/bootstrap/mixins | |
parent | d5625c907168b6311be122b99d89614e02448475 (diff) |
rake convert
Diffstat (limited to 'assets/stylesheets/bootstrap/mixins')
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_buttons.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_forms.scss | 6 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_image.scss | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/assets/stylesheets/bootstrap/mixins/_buttons.scss b/assets/stylesheets/bootstrap/mixins/_buttons.scss index 58ad13e..74a4ffc 100644 --- a/assets/stylesheets/bootstrap/mixins/_buttons.scss +++ b/assets/stylesheets/bootstrap/mixins/_buttons.scss @@ -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/assets/stylesheets/bootstrap/mixins/_forms.scss b/assets/stylesheets/bootstrap/mixins/_forms.scss index ff72f0e..277aa5f 100644 --- a/assets/stylesheets/bootstrap/mixins/_forms.scss +++ b/assets/stylesheets/bootstrap/mixins/_forms.scss @@ -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/assets/stylesheets/bootstrap/mixins/_image.scss b/assets/stylesheets/bootstrap/mixins/_image.scss index 57d60a3..c8dcf5e 100644 --- a/assets/stylesheets/bootstrap/mixins/_image.scss +++ b/assets/stylesheets/bootstrap/mixins/_image.scss @@ -8,7 +8,6 @@ // Keep images from scaling beyond the width of their parents. @mixin 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 } |