diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-01 11:16:34 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-01 11:16:34 +0000 |
| commit | 996fdda2e736926d4b0e5b0a7a3051a1165b75d1 (patch) | |
| tree | fd05498ece851a405ca31f2ccc7a4aad5feabbc0 | |
| parent | 10854ad8256c605343e8f56b5bf46f7e27b90524 (diff) | |
| parent | 76441216af5c86846d79a2313b4b44c126ac6374 (diff) | |
| download | gitlab-ce-996fdda2e736926d4b0e5b0a7a3051a1165b75d1.tar.gz | |
Merge branch 'winh-member-permission-dropdown' into 'master'
Make member permission dropdowns consistent
See merge request !13600
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/members.scss | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 5871383a57b..35c137f76ba 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -729,6 +729,7 @@ #{$selector}.dropdown-menu, #{$selector}.dropdown-menu-nav { li { + display: block; padding: 0 1px; &:hover { diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss index 3fb02e9964f..b3bab082a35 100644 --- a/app/assets/stylesheets/pages/members.scss +++ b/app/assets/stylesheets/pages/members.scss @@ -55,6 +55,10 @@ display: -webkit-flex; display: flex; } + + .dropdown-menu.dropdown-menu-align-right { + margin-top: -2px; + } } .form-horizontal { @@ -306,3 +310,7 @@ } } } + +.member-form-control { + @include new-style-dropdown; +} |