Commit d39948a8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Restore old padding for wiki blocks

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent c61512d4
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
&.wiki { &.wiki {
font-size: 14px; font-size: 14px;
line-height: 1.6; line-height: 1.6;
padding: 25px;
.highlight { .highlight {
margin-bottom: 9px; margin-bottom: 9px;
......
...@@ -18,17 +18,16 @@ ...@@ -18,17 +18,16 @@
} }
.title { .title {
font-size: 20px; font-size: 22px;
font-weight: 500; font-weight: 500;
line-height: 28px; line-height: 1.5;
margin: 0; margin: 0;
color: #444; color: #333;
border-bottom: 1px solid #eee;
} }
.context { .context {
border: none; border: none;
border-bottom: 1px solid #eee; border-top: 1px solid #eee;
} }
.description { .description {
...@@ -36,7 +35,7 @@ ...@@ -36,7 +35,7 @@
} }
.title, .context, .description { .title, .context, .description {
padding: 15px 15px 15px 30px; padding: 15px 25px;
.clearfix { .clearfix {
margin: 0; margin: 0;
......
...@@ -114,10 +114,6 @@ ...@@ -114,10 +114,6 @@
font-size: 1.2em; 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 { blockquote p {
color: #888; color: #888;
font-size: 14px; font-size: 14px;
......
...@@ -46,9 +46,10 @@ ...@@ -46,9 +46,10 @@
= render partial: 'issue_context', locals: { issue: @issue } = render partial: 'issue_context', locals: { issue: @issue }
- if @issue.description.present? - if @issue.description.present?
.wiki .description
= preserve do .wiki
= markdown @issue.description = preserve do
= markdown @issue.description
- content_for :note_actions do - content_for :note_actions do
- if can?(current_user, :modify_issue, @issue) - if can?(current_user, :modify_issue, @issue)
......
...@@ -15,9 +15,10 @@ ...@@ -15,9 +15,10 @@
- if @merge_request.description.present? - if @merge_request.description.present?
.wiki .description
= preserve do .wiki
= markdown @merge_request.description = preserve do
= markdown @merge_request.description
- if @merge_request.closed? - if @merge_request.closed?
.description.alert-danger .description.alert-danger
......
...@@ -43,9 +43,10 @@ ...@@ -43,9 +43,10 @@
.progress-bar{style: "width: #{@milestone.percent_complete}%;"} .progress-bar{style: "width: #{@milestone.percent_complete}%;"}
- if @milestone.description.present? - if @milestone.description.present?
.wiki .description
= preserve do .wiki
= markdown @milestone.description = preserve do
= markdown @milestone.description
%ul.nav.nav-tabs.append-bottom-10 %ul.nav.nav-tabs.append-bottom-10
%li.active %li.active
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment