Download as
Browse Code »

Commit d39948a8d000edaf84a74ea2a9a58b6e230e0041

Authored by Dmitriy Zaporozhets
1 parent c61512d4
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Restore old padding for wiki blocks 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 6 changed files with 18 additions and 19 deletions   Show diff stats
app/assets/stylesheets/generic/files.scss
  Diff comments   View file @d39948a
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
52 &.wiki { 52 &.wiki {
53 font-size: 14px; 53 font-size: 14px;
54 line-height: 1.6; 54 line-height: 1.6;
  55 + padding: 25px;
55 56
56 .highlight { 57 .highlight {
57 margin-bottom: 9px; 58 margin-bottom: 9px;
app/assets/stylesheets/generic/issue_box.scss
  Diff comments   View file @d39948a
@@ -18,17 +18,16 @@ @@ -18,17 +18,16 @@
18 } 18 }
19 19
20 .title { 20 .title {
21 - font-size: 20px; 21 + font-size: 22px;
22 font-weight: 500; 22 font-weight: 500;
23 - line-height: 28px; 23 + line-height: 1.5;
24 margin: 0; 24 margin: 0;
25 - color: #444;  
26 - border-bottom: 1px solid #eee; 25 + color: #333;
27 } 26 }
28 27
29 .context { 28 .context {
30 border: none; 29 border: none;
31 - border-bottom: 1px solid #eee; 30 + border-top: 1px solid #eee;
32 } 31 }
33 32
34 .description { 33 .description {
@@ -36,7 +35,7 @@ @@ -36,7 +35,7 @@
36 } 35 }
37 36
38 .title, .context, .description { 37 .title, .context, .description {
39 - padding: 15px 15px 15px 30px; 38 + padding: 15px 25px;
40 39
41 .clearfix { 40 .clearfix {
42 margin: 0; 41 margin: 0;
app/assets/stylesheets/main/mixins.scss
  Diff comments   View file @d39948a
@@ -114,10 +114,6 @@ @@ -114,10 +114,6 @@
114 font-size: 1.2em; 114 font-size: 1.2em;
115 } 115 }
116 116
117 - // Larger 30px left margin is required for the header link icon.  
118 - // Use on all markdown including those without header links for uniformity.  
119 - margin: 20px 20px 20px 30px;  
120 -  
121 blockquote p { 117 blockquote p {
122 color: #888; 118 color: #888;
123 font-size: 14px; 119 font-size: 14px;
app/views/projects/issues/show.html.haml
  Diff comments   View file @d39948a
@@ -46,9 +46,10 @@ @@ -46,9 +46,10 @@
46 = render partial: 'issue_context', locals: { issue: @issue } 46 = render partial: 'issue_context', locals: { issue: @issue }
47 47
48 - if @issue.description.present? 48 - if @issue.description.present?
49 - .wiki  
50 - = preserve do  
51 - = markdown @issue.description 49 + .description
  50 + .wiki
  51 + = preserve do
  52 + = markdown @issue.description
52 53
53 - content_for :note_actions do 54 - content_for :note_actions do
54 - if can?(current_user, :modify_issue, @issue) 55 - if can?(current_user, :modify_issue, @issue)
app/views/projects/merge_requests/show/_mr_box.html.haml
  Diff comments   View file @d39948a
@@ -15,9 +15,10 @@ @@ -15,9 +15,10 @@
15 15
16 16
17 - if @merge_request.description.present? 17 - if @merge_request.description.present?
18 - .wiki  
19 - = preserve do  
20 - = markdown @merge_request.description 18 + .description
  19 + .wiki
  20 + = preserve do
  21 + = markdown @merge_request.description
21 22
22 - if @merge_request.closed? 23 - if @merge_request.closed?
23 .description.alert-danger 24 .description.alert-danger
app/views/projects/milestones/show.html.haml
  Diff comments   View file @d39948a
@@ -43,9 +43,10 @@ @@ -43,9 +43,10 @@
43 .progress-bar{style: "width: #{@milestone.percent_complete}%;"} 43 .progress-bar{style: "width: #{@milestone.percent_complete}%;"}
44 44
45 - if @milestone.description.present? 45 - if @milestone.description.present?
46 - .wiki  
47 - = preserve do  
48 - = markdown @milestone.description 46 + .description
  47 + .wiki
  48 + = preserve do
  49 + = markdown @milestone.description
49 50
50 %ul.nav.nav-tabs.append-bottom-10 51 %ul.nav.nav-tabs.append-bottom-10
51 %li.active 52 %li.active