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