Download as
Browse Code »

Commit c1c1a1eeeecaadfd68a586adb8d6fd4daab4064f

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

Restored old h6 of bootstrap. Fixed buttons line-height

Showing 3 changed files with 12 additions and 6 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @c1c1a1e
1 1 .btn {
2 2 @include bg-gradient(#f7f7f7, #d5d5d5);
3 3 border-color:#aaa;
4   - font-size: 13px;
5   - line-height: 18px;
6 4 &:hover {
7 5 @include bg-gray-gradient;
8 6 border-color:#bbb;
... ... @@ -86,7 +84,6 @@
86 84  
87 85 &.small {
88 86 @extend .btn-small;
89   - line-height: 18px;
90 87 }
91 88  
92 89 &.active {
... ...
app/assets/stylesheets/gitlab_bootstrap/typography.scss
  Diff comments   View file @c1c1a1e
... ... @@ -14,6 +14,11 @@ h3.page_title {
14 14 line-height: 28px;
15 15 }
16 16  
  17 +h6 {
  18 + color: #888;
  19 + text-transform: uppercase;
  20 +}
  21 +
17 22 /** CODE **/
18 23 pre {
19 24 font-family:'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
... ...
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @c1c1a1e
... ... @@ -85,14 +85,18 @@
85 85 }
86 86  
87 87 .project_clone_holder {
  88 + input[type="text"],
88 89 .btn {
89   - height: 27px;
  90 + font-size:12px;
  91 + line-height: 18px;
  92 + margin: 0;
  93 + padding: 3px 10px;
90 94 }
  95 +
91 96 input[type="text"] {
92   - height: 17px;
93 97 border: 1px solid #BBB;
94 98 box-shadow: none;
95   - padding: 4px 10px;
  99 + margin-left: -1px;
96 100 }
97 101 }
98 102  
... ...