Commit ac5f9ff4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'container-class-reloaded' of...

Merge branch 'container-class-reloaded' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-container-class-reloaded
parents 8d3eaf5f 2b0a1ca0
......@@ -10,7 +10,10 @@ header {
border: none;
width: 100%;
.navbar-inner {
.container {
width: 100% !important;
padding: 0;
background: #FFF;
border-bottom: 1px solid #DDD;
filter: none;
......@@ -123,11 +126,6 @@ header {
}
}
.container {
width: 100% !important;
padding: 0px;
}
/**
*
* Logo holder
......
......@@ -56,7 +56,7 @@
}
}
.navbar-inner .title {
.container .title {
margin-left: 6px !important;
max-width: 70% !important;
}
......
@mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
header {
&.navbar-gitlab {
.navbar-inner {
.app_logo {
background-color: $color-darker;
......@@ -18,7 +17,6 @@
}
}
}
}
.page-with-sidebar {
background: $color-darker;
......
%header.navbar.navbar-fixed-top.navbar-gitlab
.navbar-inner
.container
%h4.center
= image_tag 'logo-white.png', width: 32, height: 32
%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
.navbar-inner
.container
%div.app_logo
= link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home', data: {toggle: 'tooltip', placement: 'bottom'} do
......
%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
.navbar-inner
.container
%div.app_logo
= link_to explore_root_path, class: "home" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment