Restore old padding for wiki blocks

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

6 files changed, 18 insertions, 19 deletions

diff --git a/app/assets/stylesheets/generic/files.scss b/app/assets/stylesheets/generic/files.scss
index 85111a45913..12559f76051 100644
--- a/app/assets/stylesheets/generic/files.scss
+++ b/app/assets/stylesheets/generic/files.scss
@@ -52,6 +52,7 @@
     &.wiki {
       font-size: 14px;
       line-height: 1.6;
+      padding: 25px;
 
       .highlight {
         margin-bottom: 9px;
diff --git a/app/assets/stylesheets/generic/issue_box.scss b/app/assets/stylesheets/generic/issue_box.scss
index c3a39f02513..033b4b20f5b 100644
--- a/app/assets/stylesheets/generic/issue_box.scss
+++ b/app/assets/stylesheets/generic/issue_box.scss
@@ -18,17 +18,16 @@
   }
 
   .title {
-    font-size: 20px;
+    font-size: 22px;
     font-weight: 500;
-    line-height: 28px;
+    line-height: 1.5;
     margin: 0;
-    color: #444;
-    border-bottom: 1px solid #eee;
+    color: #333;
   }
 
   .context {
     border: none;
-    border-bottom: 1px solid #eee;
+    border-top: 1px solid #eee;
   }
 
   .description {
@@ -36,7 +35,7 @@
   }
 
   .title, .context, .description {
-    padding: 15px 15px 15px 30px;
+    padding: 15px 25px;
 
     .clearfix {
       margin: 0;
diff --git a/app/assets/stylesheets/main/mixins.scss b/app/assets/stylesheets/main/mixins.scss
index a7a5ed73abd..4afe61d756c 100644
--- a/app/assets/stylesheets/main/mixins.scss
+++ b/app/assets/stylesheets/main/mixins.scss
@@ -114,10 +114,6 @@
     font-size: 1.2em;
   }
 
-  // Larger 30px left margin is required for the header link icon.
-  // Use on all markdown including those without header links for uniformity.
-  margin: 20px 20px 20px 30px;
-
   blockquote p {
     color: #888;
     font-size: 14px;
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 5033dfefe2e..cd4a158e427 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -46,9 +46,10 @@
       = render partial: 'issue_context', locals: { issue: @issue }
 
   - if @issue.description.present?
-    .wiki
-      = preserve do
-        = markdown @issue.description
+    .description
+      .wiki
+        = preserve do
+          = markdown @issue.description
 
 - content_for :note_actions do
   - if can?(current_user, :modify_issue, @issue)
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml
index 9b95c092187..b4f648ab197 100644
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -15,9 +15,10 @@
 
 
   - if @merge_request.description.present?
-    .wiki
-      = preserve do
-        = markdown @merge_request.description
+    .description
+      .wiki
+        = preserve do
+          = markdown @merge_request.description
 
   - if @merge_request.closed?
     .description.alert-danger
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 283b4dfeacd..4d504380c93 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -43,9 +43,10 @@
       .progress-bar{style: "width: #{@milestone.percent_complete}%;"}
 
   - if @milestone.description.present?
-    .wiki
-      = preserve do
-        = markdown @milestone.description
+    .description
+      .wiki
+        = preserve do
+          = markdown @milestone.description
 
 %ul.nav.nav-tabs.append-bottom-10
   %li.active