Restore old padding for wiki blocks

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

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