From c1c1a1eeeecaadfd68a586adb8d6fd4daab4064f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 21 Nov 2012 09:14:15 +0200 Subject: [PATCH] Restored old h6 of bootstrap. Fixed buttons line-height --- app/assets/stylesheets/gitlab_bootstrap/buttons.scss | 3 --- app/assets/stylesheets/gitlab_bootstrap/typography.scss | 5 +++++ app/assets/stylesheets/sections/projects.scss | 10 +++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss index b66723d..f9249e8 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss @@ -1,8 +1,6 @@ .btn { @include bg-gradient(#f7f7f7, #d5d5d5); border-color:#aaa; - font-size: 13px; - line-height: 18px; &:hover { @include bg-gray-gradient; border-color:#bbb; @@ -86,7 +84,6 @@ &.small { @extend .btn-small; - line-height: 18px; } &.active { diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss index efe336c..fe3bd68 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss @@ -14,6 +14,11 @@ h3.page_title { line-height: 28px; } +h6 { + color: #888; + text-transform: uppercase; +} + /** CODE **/ pre { font-family:'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index a17d2c9..c9d386a 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -85,14 +85,18 @@ } .project_clone_holder { + input[type="text"], .btn { - height: 27px; + font-size:12px; + line-height: 18px; + margin: 0; + padding: 3px 10px; } + input[type="text"] { - height: 17px; border: 1px solid #BBB; box-shadow: none; - padding: 4px 10px; + margin-left: -1px; } } -- libgit2 0.21.2