Commit d54845a16a8c6c646ecf1d29ca385644f7b2660d
1 parent
dc7507cf
Exists in
master
and in
4 other branches
use md-typography for note content
Showing
3 changed files
with
14 additions
and
8 deletions
Show diff stats
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
| @@ -75,3 +75,14 @@ | @@ -75,3 +75,14 @@ | ||
| 75 | line-height: 36px; | 75 | line-height: 36px; |
| 76 | font-weight: normal; | 76 | font-weight: normal; |
| 77 | } | 77 | } |
| 78 | + | ||
| 79 | +@mixin md-typography { | ||
| 80 | + code { padding: 0 4px; } | ||
| 81 | + p { font-size: 13px; } | ||
| 82 | + h1 { font-size: 26px; line-height: 40px; margin: 10px 0;} | ||
| 83 | + h2 { font-size: 22px; line-height: 40px; margin: 10px 0;} | ||
| 84 | + h3 { font-size: 18px; line-height: 40px; margin: 10px 0;} | ||
| 85 | + h4 { font-size: 16px; line-height: 20px; margin: 10px 0;} | ||
| 86 | + h5 { font-size: 14px; line-height: 20px; margin: 10px 0;} | ||
| 87 | + h6 { font-size: 12px; line-height: 20px; margin: 10px 0;} | ||
| 88 | +} |
app/assets/stylesheets/gitlab_bootstrap/typography.scss
| @@ -87,17 +87,11 @@ a:focus { | @@ -87,17 +87,11 @@ a:focus { | ||
| 87 | * | 87 | * |
| 88 | */ | 88 | */ |
| 89 | .wiki { | 89 | .wiki { |
| 90 | + @include md-typography; | ||
| 91 | + | ||
| 90 | font-size: 13px; | 92 | font-size: 13px; |
| 91 | line-height: 20px; | 93 | line-height: 20px; |
| 92 | 94 | ||
| 93 | - code { padding: 0 4px; } | ||
| 94 | - p { font-size: 13px; } | ||
| 95 | - h1 { font-size: 26px; line-height: 40px; margin: 10px 0;} | ||
| 96 | - h2 { font-size: 22px; line-height: 40px; margin: 10px 0;} | ||
| 97 | - h3 { font-size: 18px; line-height: 40px; margin: 10px 0;} | ||
| 98 | - h4 { font-size: 16px; line-height: 20px; margin: 10px 0;} | ||
| 99 | - h5 { font-size: 14px; line-height: 20px; margin: 10px 0;} | ||
| 100 | - h6 { font-size: 12px; line-height: 20px; margin: 10px 0;} | ||
| 101 | .white .highlight pre { background: #f5f5f5; } | 95 | .white .highlight pre { background: #f5f5f5; } |
| 102 | ul { margin: 0 0 9px 25px !important; } | 96 | ul { margin: 0 0 9px 25px !important; } |
| 103 | } | 97 | } |
app/assets/stylesheets/sections/notes.scss