diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2018-02-01 15:19:27 +0100 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2018-02-12 12:05:19 +0100 |
commit | 9aed32b1a2173e3d0cb1e3c651ab40d365151ab6 (patch) | |
tree | feacd8ed6dee4ea37b6e192fc204fcd859693e3e /app/assets/stylesheets/pages/issues.scss | |
parent | a6b9eb5dfcde547a908994211d162ae6bfab921e (diff) | |
download | gitlab-ce-9aed32b1a2173e3d0cb1e3c651ab40d365151ab6.tar.gz |
Cleanup new branch/merge request form in issueswinh-new-branch-dropdown-style
Diffstat (limited to 'app/assets/stylesheets/pages/issues.scss')
-rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 76 |
1 files changed, 11 insertions, 65 deletions
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index c48e58af691..6763af4e98b 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -181,11 +181,6 @@ ul.related-merge-requests > li { } .create-mr-dropdown-wrap { - .branch-message, - .ref-message { - display: none; - } - .ref::selection { color: $placeholder-text-color; } @@ -216,6 +211,17 @@ ul.related-merge-requests > li { transform: translateY(0); display: none; margin-top: 4px; + + // override dropdown item styles + .btn.btn-success { + @include btn-default; + @include btn-green; + + border-style: solid; + border-width: 1px; + line-height: $line-height-base; + width: auto; + } } .create-merge-request-dropdown-toggle { @@ -225,66 +231,6 @@ ul.related-merge-requests > li { margin-left: 0; } } - - .droplab-item-ignore { - pointer-events: auto; - } - - .create-item { - cursor: pointer; - margin: 0 1px; - - &:hover, - &:focus { - background-color: $dropdown-item-hover-bg; - color: $gl-text-color; - } - } - - li.divider { - margin: 8px 10px; - } - - li:not(.divider) { - padding: 8px 9px; - - &:last-child { - padding-bottom: 8px; - } - - &.droplab-item-selected { - .icon-container { - i { - visibility: visible; - } - } - - .description { - display: block; - } - } - - &.droplab-item-ignore { - padding-top: 8px; - } - - .icon-container { - float: left; - - i { - visibility: hidden; - } - } - - .description { - padding-left: 22px; - } - - input, - span { - margin: 4px 0 0; - } - } } .discussion-reply-holder .note-edit-form { |