diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-05 10:40:34 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-05 10:40:34 +0300 |
| commit | 2ca7f90afed5289ea4e6cd0016ed7d0af994f353 (patch) | |
| tree | ff2f1444b84f227e97b7e5d4ec79b2006f78a03d /app/assets/stylesheets/framework/dropdowns.scss | |
| parent | 2db0e4c6480e9c1145003d6353275879fa3da0f6 (diff) | |
| parent | b354754f234055ac8bbb4b02cc9524d6da3843c3 (diff) | |
Merge branch 'winh-text-danger-selector' into 'master'
Avoid @extend for .text-danger in dropdowns
Closes #37396
See merge request !14030
Diffstat (limited to 'app/assets/stylesheets/framework/dropdowns.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index fad991f2c49..b1638fe8b61 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -768,7 +768,7 @@ // make sure the text color is not overriden &.text-danger { - @extend .text-danger; + color: $brand-danger; } &.is-focused, @@ -777,6 +777,11 @@ &:focus { background-color: $dropdown-item-hover-bg; color: $gl-text-color; + + // make sure the text color is not overriden + &.text-danger { + color: $brand-danger; + } } &.is-active { |