diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-18 00:40:04 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-18 00:40:04 +0300 |
| commit | f3203cbbc25586df622552153cc460d2f79f414e (patch) | |
| tree | 9c7e383dcf02ebad105892981b7ac72a121acb2d /app/assets | |
| parent | 105759982e6226d244a08b77703354251480ea9b (diff) | |
| parent | 0780fba337749d8cb1239e997d8d1c2a84349234 (diff) | |
Merge branch 'winh-admin-user-actions-dropdown' into 'master'
Make admin user actions dropdown consistent
See merge request !13630
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 1bb04b59a2a..958159b507a 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -743,6 +743,11 @@ border-radius: 0; padding: 8px 16px; + // make sure the text color is not overriden + &.text-danger { + @extend .text-danger; + } + &.is-focused, &:hover, &:active, diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index ab754f4a492..df2bf561194 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -132,6 +132,8 @@ ul.content-list { } .controls { + @include new-style-dropdown; + float: right; > .control-text { |