Commit e25656d09bea03892a1d7720cdd70894db7805aa
1 parent
dd20da1b
Exists in
master
and in
4 other branches
Improve wiki typography
Showing
3 changed files
with
27 additions
and
20 deletions
Show diff stats
app/assets/stylesheets/gitlab_bootstrap/files.scss
... | ... | @@ -37,24 +37,6 @@ |
37 | 37 | background: #fff; |
38 | 38 | font-size: 11px; |
39 | 39 | |
40 | - &.wiki { | |
41 | - font-size: 13px; | |
42 | - code { | |
43 | - padding: 0 4px; | |
44 | - } | |
45 | - padding: 20px; | |
46 | - | |
47 | - h1 { font-size: 26px; line-height: 46px; } | |
48 | - h2 { font-size: 22px; line-height: 42px; } | |
49 | - h3 { font-size: 20px; line-height: 40px; } | |
50 | - h4 { font-size: 18px; line-height: 32px; } | |
51 | - h5 { font-size: 16px; line-height: 26px; } | |
52 | - | |
53 | - .white .highlight pre { | |
54 | - background: #f5f5f5; | |
55 | - } | |
56 | - } | |
57 | - | |
58 | 40 | &.image_file { |
59 | 41 | background: #eee; |
60 | 42 | text-align: center; |
... | ... | @@ -64,6 +46,11 @@ |
64 | 46 | } |
65 | 47 | } |
66 | 48 | |
49 | + &.wiki { | |
50 | + padding: 20px; | |
51 | + font-size: 13px; | |
52 | + } | |
53 | + | |
67 | 54 | &.blob_file { |
68 | 55 | |
69 | 56 | } | ... | ... |
app/assets/stylesheets/gitlab_bootstrap/typography.scss
... | ... | @@ -81,3 +81,22 @@ a:focus { |
81 | 81 | .monospace { |
82 | 82 | font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; |
83 | 83 | } |
84 | + | |
85 | +/** | |
86 | + * Wiki typography | |
87 | + * | |
88 | + */ | |
89 | +.wiki { | |
90 | + font-size: 13px; | |
91 | + | |
92 | + code { padding: 0 4px; } | |
93 | + p { font-size: 13px; } | |
94 | + h1 { font-size: 32px; line-height: 40px; margin: 10px 0;} | |
95 | + h2 { font-size: 26px; line-height: 40px; margin: 10px 0;} | |
96 | + h3 { font-size: 22px; line-height: 40px; margin: 10px 0;} | |
97 | + h4 { font-size: 18px; line-height: 20px; margin: 10px 0;} | |
98 | + h5 { font-size: 14px; line-height: 20px; margin: 10px 0;} | |
99 | + h6 { font-size: 12px; line-height: 20px; margin: 10px 0;} | |
100 | + .white .highlight pre { background: #f5f5f5; } | |
101 | + ul { margin: 0 0 9px 25px !important; } | |
102 | +} | ... | ... |
app/views/issues/show.html.haml
... | ... | @@ -51,8 +51,9 @@ |
51 | 51 | |
52 | 52 | - if @issue.description.present? |
53 | 53 | .ui-box-bottom |
54 | - = preserve do | |
55 | - = markdown @issue.description | |
54 | + .wiki | |
55 | + = preserve do | |
56 | + = markdown @issue.description | |
56 | 57 | |
57 | 58 | |
58 | 59 | .issue_notes.voting_notes#notes= render "notes/notes_with_form", tid: @issue.id, tt: "issue" | ... | ... |