diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-05 07:54:33 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-05 07:54:33 +0000 |
| commit | 816f249a787d43ba9d0a638b69adb0b31413a32b (patch) | |
| tree | 863ba3ebc822c16b5e04e9c20ae90d793671965e | |
| parent | 4a98420f18c5f035c6b8ed2be5dd0a9b0fd7427d (diff) | |
| parent | b282e174dc802dcfe269a825fa3a873137f7fc1e (diff) | |
| download | gitlab-ce-816f249a787d43ba9d0a638b69adb0b31413a32b.tar.gz | |
Merge branch 'winh-merge-request-target-branch-dropdown' into 'master'
Make target branch dropdown on merge request edit page consistent
See merge request !13592
| -rw-r--r-- | app/assets/stylesheets/framework/selects.scss | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index a39927eb0df..3bdf2bd11be 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -268,13 +268,21 @@ // TODO: change global style .ajax-project-dropdown, body[data-page="projects:new"] #select2-drop, +body[data-page="projects:merge_requests:edit"] #select2-drop, body[data-page="projects:blob:new"] #select2-drop, body[data-page="profiles:show"] #select2-drop, body[data-page="projects:blob:edit"] #select2-drop { &.select2-drop { + border: 1px solid $dropdown-border-color; + border-radius: $border-radius-base; color: $gl-text-color; } + &.select2-drop-above { + border-top: none; + margin-top: -4px; + } + .select2-results { .select2-no-results, .select2-searching, |