kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix header

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2013-12-31 01:12:02 +02:00
parent 6cbadc953f
commit 2ecf83191d
No known key found for this signature in database
GPG key ID: 627C5F589F467F17
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/gitlab_bootstrap/lists.scss
View file

@ -4,7 +4,9 @@
*/ */
.well-list { .well-list {
margin: 0; margin: 0;
padding: 0;
list-style: none; list-style: none;
li { li {
padding: 10px; padding: 10px;
min-height: 20px; min-height: 20px;

2
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
View file

@ -79,7 +79,7 @@
color: $style_color; color: $style_color;
text-shadow: 0 1px 1px #FFF; text-shadow: 0 1px 1px #FFF;
font-size: 16px; font-size: 16px;
line-height: 40px; line-height: 44px;
font-weight: normal; font-weight: normal;
} }

27
app/assets/stylesheets/sections/header.scss
View file

@ -5,20 +5,23 @@
header { header {
&.navbar-gitlab { &.navbar-gitlab {
margin-bottom: 0; margin-bottom: 0;
height: 40px; min-height: 40px;
overflow: hidden;
.navbar-inner { .navbar-inner {
/*height: 40px;*/
padding: 3px;
background: #F1F1F1; background: #F1F1F1;
border-bottom: 1px solid #DDD;
filter: none; filter: none;
.nav > li > a { .nav > li > a {
color: $style_color; color: $style_color;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
font-size: 14px; font-size: 14px;
padding: 10px; line-height: 32px;
padding: 6px 10px;
&:hover {
background: none;
}
} }
/** NAV block with links and profile **/ /** NAV block with links and profile **/
@ -39,9 +42,6 @@ header {
.app_logo { .app_logo {
float: left; float: left;
margin-right: 9px; margin-right: 9px;
position: relative;
top: -3px;
padding-top: 3px;
a { a {
float: left; float: left;
@ -53,7 +53,7 @@ header {
background: url('logo-black.png') no-repeat center center; background: url('logo-black.png') no-repeat center center;
background-size: 32px; background-size: 32px;
float: left; float: left;
height: 40px; height: 46px;
width: 40px; width: 40px;
@include header-font; @include header-font;
text-indent: -9999px; text-indent: -9999px;
@ -79,7 +79,7 @@ header {
.profile-pic { .profile-pic {
position: relative; position: relative;
top: -4px; top: -1px;
img { img {
width: 26px; width: 26px;
height: 26px; height: 26px;
@ -95,7 +95,7 @@ header {
.search { .search {
margin-right: 10px; margin-right: 10px;
margin-left: 10px; margin-left: 10px;
margin-top: 5px; margin-top: 8px;
form { form {
margin: 0; margin: 0;
@ -115,7 +115,7 @@ header {
box-shadow: none; box-shadow: none;
@include transition(all 0.15s ease-in 0s); @include transition(all 0.15s ease-in 0s);
&:focus { &:focus {
@extend .col-md-4; width: 400px;
} }
} }
} }
@ -192,10 +192,9 @@ header {
.separator { .separator {
float: left; float: left;
height: 46px; height: 46px;
width: 1px; width: 2px;
background: white; background: white;
border-left: 1px solid #DDD; border-left: 1px solid #DDD;
margin-top: -3px;
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
} }