From 845f26d07b97a281057a09facae28b2bbdb0168b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 2 Dec 2015 15:04:29 +0100
Subject: [PATCH] Remove minimum containe height
---
app/assets/stylesheets/framework/layout.scss | 7 ++++---
app/assets/stylesheets/framework/sidebar.scss | 5 ++---
app/assets/stylesheets/pages/login.scss | 2 ++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss
index b91c15d8910f0..a60940a8beeb1 100644
--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -2,10 +2,10 @@ html {
overflow-y: scroll;
&.touch .tooltip { display: none !important; }
+}
- body {
- padding-top: $header-height;
- }
+body {
+ background-color: #EAEBEC !important;
}
.container {
@@ -18,6 +18,7 @@ html {
}
.navless-container {
+ padding-top: $header-height;
margin-top: 30px;
}
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index c1b0129c86603..81cda68b94cfc 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -1,4 +1,6 @@
.page-with-sidebar {
+ padding-top: $header-height;
+
.sidebar-wrapper {
position: fixed;
top: 0;
@@ -18,15 +20,12 @@
}
.content-wrapper {
- min-height: 100vh;
width: 100%;
padding: 20px;
- background: #EAEBEC;
.container-fluid {
background: #FFF;
padding: $gl-padding;
- min-height: 90vh;
&.container-blank {
background: none;
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss
index 83b866c3a6466..edd517051364e 100644
--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -1,5 +1,7 @@
/* Login Page */
.login-page {
+ background-color: white;
+
.container {
max-width: 960px;
}
--
GitLab