Merge "Move Page Layout Styles out of horizon.scss"

This commit is contained in:
Jenkins 2015-12-11 15:11:33 +00:00 committed by Gerrit Code Review
commit f37f32ad06
2 changed files with 33 additions and 34 deletions

View File

@ -0,0 +1,30 @@
// Make the sidebar span the entire page, instead of just the Viewport
// Display Table is not ideal, but it will allow dynamic resizing of
// the sidebar while growing its container to fill the entire window
html, body, #container {
height: 100%;
}
// Theme Note:
// The following 1px is the default 1px for nav border in Bootstrap. If
// this value is customized, then this value must change to compensate
$navbar-border-size: 1px !default;
$navbar-true-height: $navbar-height + $navbar-border-size !default;
#main_content {
height: 100%; /* fallback if needed --> its scrolls, but it works */
height: calc(100% - #{$navbar-true-height});
display: table;
}
#content_body,
#sidebar {
display: table-cell;
vertical-align: top;
}
#content_body {
width: 100%;
padding-left: $content-body-padding;
padding-right: $content-body-padding;
}

View File

@ -15,6 +15,9 @@
@import "/horizon/lib/font-awesome/scss/font-awesome.scss";
@import "/horizon/lib/magic_search/magic_search.scss";
// Main Page Layout
@import "layout";
// Dashboard Components
@import "components/login";
@import "components/resource_browser";
@ -49,40 +52,6 @@
} // IE7
// Basic Page Layout
// Make the sidebar span the entire page, instead of just the Viewport
// Display Table is not ideal, but it will allow dynamic resizing of
// the sidebar while growing its container to fill the entire window
html, body, #container {
height: 100%;
}
// Theme Note:
// The following 1px is the default 1px for nav border in Bootstrap. If
// this value is customized, then this value must change to compensate
$navbar-border-size: 1px !default;
$navbar-true-height: $navbar-height + $navbar-border-size !default;
#main_content {
height: 100%; /* fallback if needed --> its scrolls, but it works */
height: calc(100% - #{$navbar-true-height});
display: table;
}
#content_body,
#sidebar {
display: table-cell;
vertical-align: top;
}
#content_body {
width: 100%;
padding-left: $content-body-padding;
padding-right: $content-body-padding;
}
// Basic Page Layout End
small {
font-size: 11px;
}