diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/gitlab_bootstrap/lists.scss index 83066b5..245cccf 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/lists.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/lists.scss @@ -4,7 +4,9 @@ */ .well-list { margin: 0; + padding: 0; list-style: none; + li { padding: 10px; min-height: 20px; diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss index 5a6b5ac..feb7d48 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss @@ -79,7 +79,7 @@ color: $style_color; text-shadow: 0 1px 1px #FFF; font-size: 16px; - line-height: 40px; + line-height: 44px; font-weight: normal; } diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index 049b6b1..3cbab5a 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -5,20 +5,23 @@ header { &.navbar-gitlab { margin-bottom: 0; - height: 40px; - overflow: hidden; + min-height: 40px; .navbar-inner { - /*height: 40px;*/ - padding: 3px; background: #F1F1F1; + border-bottom: 1px solid #DDD; filter: none; .nav > li > a { color: $style_color; text-shadow: 0 1px 0 #fff; font-size: 14px; - padding: 10px; + line-height: 32px; + padding: 6px 10px; + + &:hover { + background: none; + } } /** NAV block with links and profile **/ @@ -39,9 +42,6 @@ header { .app_logo { float: left; margin-right: 9px; - position: relative; - top: -3px; - padding-top: 3px; a { float: left; @@ -53,7 +53,7 @@ header { background: url('logo-black.png') no-repeat center center; background-size: 32px; float: left; - height: 40px; + height: 46px; width: 40px; @include header-font; text-indent: -9999px; @@ -79,7 +79,7 @@ header { .profile-pic { position: relative; - top: -4px; + top: -1px; img { width: 26px; height: 26px; @@ -95,7 +95,7 @@ header { .search { margin-right: 10px; margin-left: 10px; - margin-top: 5px; + margin-top: 8px; form { margin: 0; @@ -115,7 +115,7 @@ header { box-shadow: none; @include transition(all 0.15s ease-in 0s); &:focus { - @extend .col-md-4; + width: 400px; } } } @@ -192,10 +192,9 @@ header { .separator { float: left; height: 46px; - width: 1px; + width: 2px; background: white; border-left: 1px solid #DDD; - margin-top: -3px; margin-left: 10px; margin-right: 10px; } -- libgit2 0.21.2