diff options
author | Phil Hughes <me@iamphill.com> | 2018-02-02 09:00:55 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-02-02 09:00:55 +0000 |
commit | 6f40aaaca722e90dfe5b3f137bcc794a9acf8790 (patch) | |
tree | 5e6f1984378606888c496427e0c0dcdbe958f5d9 | |
parent | f016c780f658cebedfb4ffd31ecf37b07139cdef (diff) | |
parent | ec918997eef4bdc4e2df1fe961083350eddf2492 (diff) | |
download | gitlab-ce-6f40aaaca722e90dfe5b3f137bcc794a9acf8790.tar.gz |
Merge branch 'fix/improve-issue-note-dropdown' into 'master'
Improve issue note dropdown and mr button
See merge request gitlab-org/gitlab-ce!16758
-rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 1 | ||||
-rw-r--r-- | app/views/projects/issues/_new_branch.html.haml | 4 | ||||
-rw-r--r-- | changelogs/unreleased/fix-improve-issue-note-dropdown.yml | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index bf8eb4c1f06..4a528bc2bb1 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -410,7 +410,6 @@ width: 298px; } - @media (max-width: $screen-xs-max) { display: flex; width: 100%; diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml index 331d62cf247..37b00a14fc6 100644 --- a/app/views/projects/issues/_new_branch.html.haml +++ b/app/views/projects/issues/_new_branch.html.haml @@ -15,10 +15,10 @@ %span.text Checking branch availability… .btn-group.available.hide - %button.btn.js-create-merge-request.btn-default{ type: 'button', data: { action: data_action } } + %button.btn.js-create-merge-request.btn-success.btn-inverted{ type: 'button', data: { action: data_action } } = value - %button.btn.create-merge-request-dropdown-toggle.dropdown-toggle.btn-default.js-dropdown-toggle{ type: 'button', data: { dropdown: { trigger: '#create-merge-request-dropdown' } } } + %button.btn.create-merge-request-dropdown-toggle.dropdown-toggle.btn-success.btn-inverted.js-dropdown-toggle{ type: 'button', data: { dropdown: { trigger: '#create-merge-request-dropdown' } } } = icon('caret-down') %ul#create-merge-request-dropdown.create-merge-request-dropdown-menu.dropdown-menu.dropdown-menu-align-right.gl-show-field-errors{ data: { dropdown: true } } diff --git a/changelogs/unreleased/fix-improve-issue-note-dropdown.yml b/changelogs/unreleased/fix-improve-issue-note-dropdown.yml new file mode 100644 index 00000000000..aaf4811c64a --- /dev/null +++ b/changelogs/unreleased/fix-improve-issue-note-dropdown.yml @@ -0,0 +1,5 @@ +--- +title: Improve issue note dropdown and mr button +merge_request: 16758 +author: George Tsiolis +type: changed |