Commit d33767004594d8fcfe8d7bdb7f373132524b3d6e
1 parent
e12ee379
Exists in
master
and in
4 other branches
Improving typography
Showing
5 changed files
with
28 additions
and
14 deletions
Show diff stats
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
| @@ -86,12 +86,15 @@ | @@ -86,12 +86,15 @@ | ||
| 86 | color: #456; | 86 | color: #456; |
| 87 | font-size: 16px; | 87 | font-size: 16px; |
| 88 | text-shadow: 0 1px 1px #fff; | 88 | text-shadow: 0 1px 1px #fff; |
| 89 | - padding: 0px 10px; | ||
| 90 | - line-height: 36px; | 89 | + padding: 10px; |
| 91 | font-size: 14px; | 90 | font-size: 14px; |
| 92 | font-weight: normal; | 91 | font-weight: normal; |
| 93 | margin: 0; | 92 | margin: 0; |
| 94 | 93 | ||
| 94 | + h5 { | ||
| 95 | + margin: 0; | ||
| 96 | + } | ||
| 97 | + | ||
| 95 | > a { | 98 | > a { |
| 96 | text-shadow: 0 1px 1px #fff; | 99 | text-shadow: 0 1px 1px #fff; |
| 97 | } | 100 | } |
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
| @@ -84,3 +84,12 @@ | @@ -84,3 +84,12 @@ | ||
| 84 | h3 { margin-top: 20px;} | 84 | h3 { margin-top: 20px;} |
| 85 | h4 { margin-top: 15px;} | 85 | h4 { margin-top: 15px;} |
| 86 | } | 86 | } |
| 87 | + | ||
| 88 | +@mixin page-title { | ||
| 89 | + color: #456; | ||
| 90 | + font-size: 20px; | ||
| 91 | + font-weight: normal; | ||
| 92 | + line-height: 1.5; | ||
| 93 | + margin-top: 0px; | ||
| 94 | + margin-bottom: 15px; | ||
| 95 | +} |
app/assets/stylesheets/gitlab_bootstrap/typography.scss
| @@ -3,13 +3,18 @@ | @@ -3,13 +3,18 @@ | ||
| 3 | * | 3 | * |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | +h1.page-title { | ||
| 7 | + @include page-title; | ||
| 8 | + font-size: 28px; | ||
| 9 | +} | ||
| 10 | + | ||
| 11 | +h2.page-title { | ||
| 12 | + @include page-title; | ||
| 13 | + font-size: 24px; | ||
| 14 | +} | ||
| 15 | + | ||
| 6 | h3.page-title { | 16 | h3.page-title { |
| 7 | - color: #456; | ||
| 8 | - font-size: 20px; | ||
| 9 | - font-weight: normal; | ||
| 10 | - line-height: 28px; | ||
| 11 | - margin-top: 0px; | ||
| 12 | - margin-bottom: 15px; | 17 | + @include page-title; |
| 13 | } | 18 | } |
| 14 | 19 | ||
| 15 | h6 { | 20 | h6 { |
app/views/help/index.html.haml
| 1 | -%h3.page-title | ||
| 2 | - GITLAB | 1 | +%h2.page-title |
| 2 | + GitLab | ||
| 3 | .pull-right | 3 | .pull-right |
| 4 | %span= Gitlab::VERSION | 4 | %span= Gitlab::VERSION |
| 5 | %small= Gitlab::REVISION | 5 | %small= Gitlab::REVISION |
| 6 | -%hr | ||
| 7 | -%p.lead | 6 | +%p.slead |
| 8 | Self Hosted Git Management | 7 | Self Hosted Git Management |
| 9 | %br | 8 | %br |
| 10 | Fast, secure and stable solution based on Ruby on Rails. | 9 | Fast, secure and stable solution based on Ruby on Rails. |