summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-07-11 12:07:38 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-07-11 12:07:38 -0500
commit0cf9af01ce5c6db84aba8d40defc0cb03cb6e75f (patch)
treea3d7aecca0b7fc6d6845471dffa92985e0307e97
parentc7c630f142a23505b4adce449c0a176dec142384 (diff)
downloadgitlab-ce-0cf9af01ce5c6db84aba8d40defc0cb03cb6e75f.tar.gz
Fix MR widget border
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss6
-rw-r--r--app/views/projects/merge_requests/_mr_box.html.haml2
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)