diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-07-11 17:39:02 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-07-11 17:39:02 +0000 |
| commit | a781d0f9b2b89f5a3fa33dc72fcefb485f2078ce (patch) | |
| tree | 0bb503b30ed9230efb6408e5851d72f329e28d53 | |
| parent | 9591fdbed7c14712986a8308036787481bbb3bc0 (diff) | |
| parent | 0cf9af01ce5c6db84aba8d40defc0cb03cb6e75f (diff) | |
| download | gitlab-ce-a781d0f9b2b89f5a3fa33dc72fcefb485f2078ce.tar.gz | |
Merge branch 'fix-mr-widget-border' into 'master'
Fix MR widget border
See merge request gitlab-org/gitlab-ce!20562
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_mr_box.html.haml | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index c32049e1b33..2af79c511ba 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -116,10 +116,8 @@ .modify-merge-commit-link { padding: 0; - background-color: transparent; border: 0; - color: $gl-text-color; &:hover, @@ -501,10 +499,6 @@ } } -.merge-request-details .content-block { - border-bottom: 0; -} - .mr-source-target { display: flex; flex-wrap: wrap; diff --git a/app/views/projects/merge_requests/_mr_box.html.haml b/app/views/projects/merge_requests/_mr_box.html.haml index 8a390cf8700..1a9ab288683 100644 --- a/app/views/projects/merge_requests/_mr_box.html.haml +++ b/app/views/projects/merge_requests/_mr_box.html.haml @@ -1,4 +1,4 @@ -.detail-page-description.content-block +.detail-page-description %h2.title = markdown_field(@merge_request, :title) |