From d33767004594d8fcfe8d7bdb7f373132524b3d6e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 13 Jul 2013 10:13:36 +0300
Subject: [PATCH] Improving typography

---
 .../stylesheets/gitlab_bootstrap/blocks.scss    |  7 +++++--
 .../stylesheets/gitlab_bootstrap/mixins.scss    |  9 +++++++++
 .../gitlab_bootstrap/typography.scss            | 17 +++++++++++------
 app/views/help/index.html.haml                  |  7 +++----
 .../projects/merge_requests/index.html.haml     |  2 --
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
index 3a9f42ea0ba..5e1d7f758fe 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -86,12 +86,15 @@
     color: #456;
     font-size: 16px;
     text-shadow: 0 1px 1px #fff;
-    padding: 0px 10px;
-    line-height: 36px;
+    padding: 10px;
     font-size: 14px;
     font-weight: normal;
     margin: 0;
 
+    h5 {
+      margin: 0;
+    }
+
     > a {
       text-shadow: 0 1px 1px #fff;
     }
diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
index c35c321f817..5ef0fe16a96 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
@@ -84,3 +84,12 @@
   h3 { margin-top: 20px;}
   h4 { margin-top: 15px;}
 }
+
+@mixin page-title {
+  color: #456;
+  font-size: 20px;
+  font-weight: normal;
+  line-height: 1.5;
+  margin-top: 0px;
+  margin-bottom: 15px;
+}
diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
index 7ea7c56b4b2..07df7f546d6 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
@@ -3,13 +3,18 @@
  *
  */
 
+h1.page-title {
+  @include page-title;
+  font-size: 28px;
+}
+
+h2.page-title {
+  @include page-title;
+  font-size: 24px;
+}
+
 h3.page-title {
-  color: #456;
-  font-size: 20px;
-  font-weight: normal;
-  line-height: 28px;
-  margin-top: 0px;
-  margin-bottom: 15px;
+  @include page-title;
 }
 
 h6 {
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index 48c8112421f..7cd7790d9cb 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -1,10 +1,9 @@
-%h3.page-title
-  GITLAB
+%h2.page-title
+  GitLab
   .pull-right
     %span= Gitlab::VERSION
     %small= Gitlab::REVISION
-%hr
-%p.lead
+%p.slead
   Self Hosted Git Management
   %br
   Fast, secure and stable solution based on Ruby on Rails.
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index 7db5a21280e..f54a213a3f3 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -5,8 +5,6 @@
 %h3.page-title
   Merge Requests
 
-%br
-
 
 .row
   .span3
-- 
2.30.9