From 3e79b819559c5254d661c2f0693b14a092d998fa Mon Sep 17 00:00:00 2001 From: Diana Whitten Date: Tue, 22 Dec 2015 09:50:54 -0700 Subject: [PATCH] Clean up horizon.scss - _layout.scss A major part of the css reorg is a better organization of the css styles themselves. horizon.scss should be a global import level file. Move remaining layout styles to _layout.scss. Also, fix minor bug with min size. Change-Id: I6dd847e65a2cbf7f8dc9e415bed4a6958e3b787e Partially-Implements: blueprint horizon-theme-css-reorg --- .../static/dashboard/scss/_layout.scss | 13 +++++++++++++ .../static/dashboard/scss/horizon.scss | 11 ----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/openstack_dashboard/static/dashboard/scss/_layout.scss b/openstack_dashboard/static/dashboard/scss/_layout.scss index f1b3161f8..d170a92f9 100644 --- a/openstack_dashboard/static/dashboard/scss/_layout.scss +++ b/openstack_dashboard/static/dashboard/scss/_layout.scss @@ -15,6 +15,7 @@ $navbar-true-height: $navbar-height + $navbar-border-size !default; height: 100%; /* fallback if needed --> its scrolls, but it works */ height: calc(100% - #{$navbar-true-height}); display: table; + min-width: $main-content-min-width; } #content_body, @@ -28,3 +29,15 @@ $navbar-true-height: $navbar-height + $navbar-border-size !default; padding-left: $content-body-padding; padding-right: $content-body-padding; } + +.page-header { + margin: 0 0 5px 0; + padding: 10px 0 5px 0; + border-bottom: 0; + height: auto; + width: 100%; + h1 { + margin: 0; + } +} + diff --git a/openstack_dashboard/static/dashboard/scss/horizon.scss b/openstack_dashboard/static/dashboard/scss/horizon.scss index 6e83c9aa9..45846df4d 100644 --- a/openstack_dashboard/static/dashboard/scss/horizon.scss +++ b/openstack_dashboard/static/dashboard/scss/horizon.scss @@ -74,17 +74,6 @@ a:focus { text-decoration: underline; } -.page-header { - margin: 0 0 5px 0; - padding: 10px 0 5px 0; - border-bottom: 0; - height: auto; - width: 100%; - h1 { - margin: 0; - } -} - h2 { color: $headings-color; font-size: 30px;