Improve layout css

7 files changed, 10 insertions, 13 deletions

diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index da708c96b09..cd6352db85f 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -273,10 +273,6 @@ img.emoji {
   height: 220px;
 }
 
-.navless-container {
-  margin-top: 68px;
-}
-
 .description-block {
   @extend .light-well;
   @extend .light;
diff --git a/app/assets/stylesheets/main/layout.scss b/app/assets/stylesheets/main/layout.scss
index 71522443f10..1085e68b7d4 100644
--- a/app/assets/stylesheets/main/layout.scss
+++ b/app/assets/stylesheets/main/layout.scss
@@ -2,6 +2,10 @@ html {
   overflow-y: scroll;
 
   &.touch .tooltip { display: none !important; }
+
+  body {
+    padding-top: 47px;
+  }
 }
 
 .container {
@@ -13,3 +17,6 @@ html {
   margin: 0 0;
 }
 
+.navless-container {
+  margin-top: 30px;
+}
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index 32b0b10c649..a5098b6da5b 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -8,8 +8,6 @@ header {
     margin-bottom: 0;
     min-height: 40px;
     border: none;
-    position: fixed;
-    top: 0;
     width: 100%;
 
     .navbar-inner {
diff --git a/app/assets/stylesheets/sections/sidebar.scss b/app/assets/stylesheets/sections/nav_sidebar.scss
index 79441eba6db..edb5f90813f 100644
--- a/app/assets/stylesheets/sections/sidebar.scss
+++ b/app/assets/stylesheets/sections/nav_sidebar.scss
@@ -12,7 +12,6 @@
   width: 100%;
   padding: 15px;
   background: #FFF;
-  margin-top: 48px;
 }
 
 .nav-sidebar {
@@ -159,3 +158,4 @@
   @include expanded-sidebar;
 }
 
+
diff --git a/app/views/layouts/_broadcast.html.haml b/app/views/layouts/_broadcast.html.haml
index e589e34dd23..e7d477c225e 100644
--- a/app/views/layouts/_broadcast.html.haml
+++ b/app/views/layouts/_broadcast.html.haml
@@ -2,7 +2,3 @@
   .broadcast-message{ style: broadcast_styling(broadcast_message) }
     %i.fa.fa-bullhorn
     = broadcast_message.message
-  :css
-    .sidebar-wrapper .nav-sidebar {
-      margin-top: 58px;
-    }
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index e98b8ec631d..bdf27562c26 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -1,4 +1,4 @@
-%header.navbar.navbar-static-top.navbar-gitlab
+%header.navbar.navbar-fixed-top.navbar-gitlab
   .navbar-inner
     .container
       %div.app_logo
diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml
index 1d5bbb2aade..e912fea2aee 100644
--- a/app/views/layouts/_public_head_panel.html.haml
+++ b/app/views/layouts/_public_head_panel.html.haml
@@ -1,4 +1,4 @@
-%header.navbar.navbar-static-top.navbar-gitlab
+%header.navbar.navbar-fixed-top.navbar-gitlab
   .navbar-inner
     .container
       %div.app_logo