diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-02 22:15:38 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-02 22:15:38 +0000 |
commit | bb76a9e2ea071894ffc369c1b4760ff9afd7e106 (patch) | |
tree | f044457acdfbedb54639d7c3092f33da972baf19 | |
parent | 858e8903bfe06fc609d97a4ed44bd613b09b7919 (diff) | |
parent | 845f26d07b97a281057a09facae28b2bbdb0168b (diff) | |
download | gitlab-ce-bb76a9e2ea071894ffc369c1b4760ff9afd7e106.tar.gz |
Merge branch 'ui/no-minimal-height' into 'master'
UI: Remove minimum container height
Depends on !1953
See the commits for more details, the messages mostly speak for themselves.
Before:
![Screen_Shot_2015-12-02_at_15.42.07](/uploads/1d8e19e4738bec39074cbb9afc400ad5/Screen_Shot_2015-12-02_at_15.42.07.png)
After:
![Screen_Shot_2015-12-02_at_15.50.34](/uploads/56153fe19bb72163a2dc9dd83850ad89/Screen_Shot_2015-12-02_at_15.50.34.png)
See merge request !1957
-rw-r--r-- | app/assets/stylesheets/framework/layout.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 5 | ||||
-rw-r--r-- | 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 b91c15d8910..a60940a8bee 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 c1b0129c866..81cda68b94c 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 83b866c3a64..edd51705136 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; } |