diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-05 17:24:55 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-05 17:24:55 -0600 |
| commit | 6cc133e8baff9ca6a5fecdcbb94ccae9e8190a5a (patch) | |
| tree | ea2b5b6d725afd381f852d5dba706dc3c017635d | |
| parent | bb0baae790d53aedaa5e4fdc02001e7c37104f24 (diff) | |
| download | gitlab-ce-6cc133e8baff9ca6a5fecdcbb94ccae9e8190a5a.tar.gz | |
remove right-alignment of "Modify commit message" togglebackport-ee-squash-css-changes
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_accept.html.haml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 5f3458cfcc9..36d6ff1e29f 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -56,10 +56,10 @@ &.right { float: right; padding-right: 0; + } - a { - color: $gl-gray; - } + .modify-merge-commit-link { + color: $gl-gray; } .merge-param-checkbox { diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml index 15c318cf6b2..39cb0ca9cdc 100644 --- a/app/views/projects/merge_requests/widget/open/_accept.html.haml +++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml @@ -38,7 +38,7 @@ = label_tag :should_remove_source_branch, class: "merge-param-checkbox" do = check_box_tag :should_remove_source_branch Remove source branch - .accept-control.right + .accept-control = link_to "#", class: "modify-merge-commit-link js-toggle-button" do = icon('edit') Modify commit message |