Prevent page contents from exploding (#4370)

pull/4380/head
Alex Paxton 2018-09-06 12:12:34 -07:00 committed by GitHub
parent f10f1382ea
commit db5304b307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 20 deletions

View File

@ -14,7 +14,7 @@
.page-contents, .page-contents,
.page-contents--split { .page-contents--split {
position: relative; position: relative;
// height: calc(100% - #{$chronograf-page-header-height}) !important; height: calc(100% - #{$chronograf-page-header-height}) !important;
flex: 1 0 0; flex: 1 0 0;
@include gradient-v($g2-kevlar,$g0-obsidian); @include gradient-v($g2-kevlar,$g0-obsidian);
@ -38,8 +38,8 @@
} }
} }
.template-control-bar.show + .page-contents { .template-control-bar + .page-contents,
top: $chronograf-page-header-height * 2; .annotation-control-bar + .page-contents {
height: calc(100% - #{$chronograf-page-header-height * 2}) !important; height: calc(100% - #{$chronograf-page-header-height * 2}) !important;
} }

View File

@ -181,20 +181,16 @@ $table-tab-scrollbar-height: 6px;
*/ */
.alert-history-page, .alert-history-page,
.hosts-list-page { .hosts-list-page {
.page-contents > .container-fluid, .container-fluid,
.page-contents > .container-fluid > .row, .row,
.page-contents > .container-fluid > .row > .col-md-12, .col-md-12,
.page-contents > .container-fluid > .row > .col-md-12 > .panel { .panel,
.panel-body > .generic-empty-state {
height: 100%; height: 100%;
} }
.col-md-12 > .panel { .panel-body {
display: flex; height: calc(100% - 90px);
flex-direction: column;
align-items: stretch;
> .panel-body {flex: 1 0 0%;}
.generic-empty-state {height: 100%;}
} }
} }

View File

@ -9,16 +9,11 @@ $subsection-font: 17px;
.panel { .panel {
border-top-left-radius: 0; border-top-left-radius: 0;
} }
.panel-heading {
height: 60px;
padding-top: 0;
padding-bottom: 0;
}
.panel-heading + .panel-body { .panel-heading + .panel-body {
padding-top: 0; padding-top: 0;
} }
.panel-body { .panel-body {
min-height: 500px; min-height: 320px;
} }
.panel-title { .panel-title {
font-size: $subsection-font; font-size: $subsection-font;

View File

@ -17,6 +17,7 @@ $panel-gutter: 30px;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: $panel-gutter 0; padding: $panel-gutter 0;
min-height: 90px;
} }
.panel-title { .panel-title {