diff options
| author | winh <winnie@gitlab.com> | 2017-08-10 15:20:13 +0200 |
|---|---|---|
| committer | winh <winnie@gitlab.com> | 2017-08-30 13:36:30 +0200 |
| commit | 5a9d5a0204427b6cd37bda22ae76795ccdc41cf1 (patch) | |
| tree | 641f2803f9b175c3eed38d04c357e526ec2099dd /app | |
| parent | 499b640679c0dca5b5d93da945da0ca26db8e58e (diff) | |
| download | gitlab-ce-5a9d5a0204427b6cd37bda22ae76795ccdc41cf1.tar.gz | |
Make create merge request / branch dropdown on issue page style consistentwinh-issue-create-new-dropdown
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 11 |
2 files changed, 4 insertions, 10 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index a45d5a6dca0..180804c96d6 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -748,7 +748,8 @@ } a, - button { + button, + .menu-item { border-radius: 0; padding: 8px 16px; diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index e2177f96aee..3d804a9534f 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -186,6 +186,8 @@ ul.related-merge-requests > li { } .create-mr-dropdown-wrap { + @include new-style-dropdown; + .btn-group:not(.hide) { display: flex; } @@ -212,15 +214,6 @@ ul.related-merge-requests > li { } li:not(.divider) { - padding: 6px; - cursor: pointer; - - &:hover, - &:focus { - background-color: $dropdown-hover-color; - color: $white-light; - } - &.droplab-item-selected { .icon-container { i { |