Download as
Browse Code »

Commit 399d0bdde79774b4cc7e6a9dd480a8b7cb690bed

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

Use bootstrap typography for headers

Showing 8 changed files with 14 additions and 33 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  Diff comments   View file @399d0bd
... ... @@ -90,6 +90,7 @@
90 90 line-height: 36px;
91 91 font-size: 14px;
92 92 font-weight: normal;
  93 + margin: 0;
93 94  
94 95 > a {
95 96 text-shadow: 0 1px 1px #fff;
... ... @@ -132,15 +133,6 @@
132 133 margin-bottom: 0;
133 134 padding: 5px 20px;
134 135 }
135   - .middle_title {
136   - background: #f5f5f5;
137   - margin:20px -20px;
138   - padding: 0 20px;
139   - border-top: 1px solid #eee;
140   - border-bottom: 1px solid #eee;
141   - font-size: 14px;
142   - color: #777;
143   - }
144 136 }
145 137  
146 138 .row_title {
... ...
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @399d0bd
... ... @@ -43,11 +43,8 @@
43 43 }
44 44 }
45 45  
46   - &.success {
47   - @extend .btn-success;
48   -
  46 + &.btn-success {
49 47 &:hover {
50   - @extend .btn-success;
51 48 background: #51a351;
52 49 }
53 50  
... ... @@ -59,7 +56,7 @@
59 56  
60 57 &.btn-create {
61 58 @extend .wide;
62   - @extend .success;
  59 + @extend .btn-success;
63 60 }
64 61  
65 62 &.btn-save {
... ...
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @399d0bd
... ... @@ -68,10 +68,6 @@ input[type='text'].danger {
68 68  
69 69 fieldset legend { font-size: 17px; }
70 70  
71   -/** PAGINATION **/
72   -.gitlab_pagination {
73   -}
74   -
75 71 .tab-content {
76 72 overflow: visible;
77 73 }
... ...
app/assets/stylesheets/gitlab_bootstrap/files.scss
  Diff comments   View file @399d0bd
... ... @@ -48,7 +48,8 @@
48 48  
49 49 &.wiki {
50 50 padding: 20px;
51   - font-size: 13px;
  51 + font-size: 14px;
  52 + line-height: 1.6;
52 53  
53 54 .highlight {
54 55 margin-bottom: 9px;
... ...
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
  Diff comments   View file @399d0bd
... ... @@ -79,10 +79,8 @@
79 79 @mixin md-typography {
80 80 code { padding: 0 4px; }
81 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;}
  82 + h1 { margin-top: 30px;}
  83 + h2 { margin-top: 25px;}
  84 + h3 { margin-top: 20px;}
  85 + h4 { margin-top: 15px;}
88 86 }
... ...
app/assets/stylesheets/gitlab_bootstrap/typography.scss
  Diff comments   View file @399d0bd
... ... @@ -3,15 +3,12 @@
3 3 *
4 4 */
5 5  
6   -h1, h2, h3, h4, h5, h6 { margin: 0; }
7   -h3, h4, h5, h6 { line-height: 36px; }
8   -h5 { font-size: 14px; }
9   -
10 6 h3.page-title {
11 7 color: #456;
12 8 font-size: 20px;
13 9 font-weight: normal;
14 10 line-height: 28px;
  11 + margin-top: 0px;
15 12 margin-bottom: 15px;
16 13 }
17 14  
... ... @@ -92,11 +89,10 @@ a:focus {
92 89 *
93 90 */
94 91 .wiki {
  92 + font-size: 14px;
  93 + line-height: 1.6;
95 94 @include md-typography;
96 95  
97   - font-size: 13px;
98   - line-height: 20px;
99   -
100 96 .white .highlight pre { background: #f5f5f5; }
101 97 ul { margin: 0 0 9px 25px !important; }
102 98 }
... ...
app/assets/stylesheets/sections/header.scss
  Diff comments   View file @399d0bd
... ... @@ -45,6 +45,7 @@ header {
45 45 margin: 0 6px;
46 46  
47 47 h1 {
  48 + margin: 0;
48 49 background: url('logo-black.png') no-repeat center 1px;
49 50 background-size: 38px;
50 51 float: left;
... ...
app/views/projects/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @399d0bd
... ... @@ -14,7 +14,7 @@
14 14 %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
15 15 for instructions
16 16 .accept_group
17   - = f.submit "Accept Merge Request", class: "btn success accept_merge_request"
  17 + = f.submit "Accept Merge Request", class: "btn btn-success accept_merge_request"
18 18 - unless @project.root_ref? @merge_request.source_branch
19 19 .remove_branch_holder
20 20 = label_tag :should_remove_source_branch, class: "checkbox" do
... ...