Download as
Browse Code »

Commit d33767004594d8fcfe8d7bdb7f373132524b3d6e

Authored by Dmitriy Zaporozhets
1 parent e12ee379
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Improving typography

Showing 5 changed files with 28 additions and 14 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  Diff comments   View file @d337670
... ... @@ -86,12 +86,15 @@
86 86 color: #456;
87 87 font-size: 16px;
88 88 text-shadow: 0 1px 1px #fff;
89   - padding: 0px 10px;
90   - line-height: 36px;
  89 + padding: 10px;
91 90 font-size: 14px;
92 91 font-weight: normal;
93 92 margin: 0;
94 93  
  94 + h5 {
  95 + margin: 0;
  96 + }
  97 +
95 98 > a {
96 99 text-shadow: 0 1px 1px #fff;
97 100 }
... ...
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
  Diff comments   View file @d337670
... ... @@ -84,3 +84,12 @@
84 84 h3 { margin-top: 20px;}
85 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
  Diff comments   View file @d337670
... ... @@ -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 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 20 h6 {
... ...
app/views/help/index.html.haml
  Diff comments   View file @d337670
1   -%h3.page-title
2   - GITLAB
  1 +%h2.page-title
  2 + GitLab
3 3 .pull-right
4 4 %span= Gitlab::VERSION
5 5 %small= Gitlab::REVISION
6   -%hr
7   -%p.lead
  6 +%p.slead
8 7 Self Hosted Git Management
9 8 %br
10 9 Fast, secure and stable solution based on Ruby on Rails.
... ...
app/views/projects/merge_requests/index.html.haml
  Diff comments   View file @d337670
... ... @@ -5,8 +5,6 @@
5 5 %h3.page-title
6 6 Merge Requests
7 7  
8   -%br
9   -
10 8  
11 9 .row
12 10 .span3
... ...