diff options
| author | winh <winnie@gitlab.com> | 2017-08-15 09:53:31 +0200 |
|---|---|---|
| committer | winh <winnie@gitlab.com> | 2017-08-29 11:23:35 +0200 |
| commit | c4509a543840e91cd5e2443a6aea36c0129314d8 (patch) | |
| tree | 872d073fe556603e292de17cb32d91d4073a5c4c | |
| parent | 6f0f65becbbe968bd26a5a3872044d7b8633bf2e (diff) | |
| download | gitlab-ce-winh-group-notifications-dropdown.tar.gz | |
Make group notifications dropdown consistentwinh-group-notifications-dropdown
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index a45d5a6dca0..d4be1e4bc5d 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -754,7 +754,7 @@ // make sure the text color is not overriden &.text-danger { - @extend .text-danger; + color: $brand-danger; } &.is-focused, @@ -763,6 +763,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 { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 39c4264e496..8cca4b9865d 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -155,6 +155,8 @@ .project-repo-buttons, .group-buttons { + @include new-style-dropdown; + .btn { @include btn-gray; padding: 3px 10px; |