diff options
author | Sean McGivern <sean@gitlab.com> | 2017-02-01 14:28:04 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2017-02-03 09:46:03 +0000 |
commit | 7550f60ddeecebac3f84e8690ab3f42428600ff7 (patch) | |
tree | f2121574ae7e46a2cc970f92a1287ad1289c4e5b /app/assets/stylesheets/pages/merge_requests.scss | |
parent | fd46fb1cd9cc1fdf826d31261aa594baa38d4898 (diff) | |
download | gitlab-ce-7550f60ddeecebac3f84e8690ab3f42428600ff7.tar.gz |
Backport changes from EE squash
Backport changes from the EE-only squash implementation, which would
otherwise conflict when merge CE into EE.
<https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1024>
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index ab68b360f93..0c013915a63 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -56,15 +56,24 @@ &.right { float: right; padding-right: 0; + } - a { - color: $gl-text-color; - } + .modify-merge-commit-link { + color: $gl-text-color; } - .remove_source_checkbox { + .merge-param-checkbox { margin: 0; } + + a .fa-question-circle { + color: $gl-text-color-secondary; + + &:hover, + &:focus { + color: $link-hover-color; + } + } } } |