diff --git a/css/comp-13.scss b/css/comp-13.scss index 1d888ee92..770fd8727 100644 --- a/css/comp-13.scss +++ b/css/comp-13.scss @@ -4,6 +4,10 @@ #app-content { flex-grow: 1; height: 100%; + + &.details-visible { + margin-right: 500px; + } } #app-sidebar { @@ -18,21 +22,14 @@ } } -#app-content { - &.details-visible { - margin-right: 500px; - } -} - #content[class*='app-'] * { box-sizing: border-box; } - body:not(.snapjs-left) { .app-navigation-hide { #app-content { - margin-left: 0 !important; /* overwrite margin since we want the translateX to handle it*/ + margin-left: 0 !important; } #app-navigation { display: none; diff --git a/css/style.scss b/css/style.scss index dfcbaf4fc..4f0d73c8c 100644 --- a/css/style.scss +++ b/css/style.scss @@ -73,27 +73,27 @@ input.input-inline { /** * Generic app layout */ - -.app.app-deck { - width: 100%; - height: 100%; - display: flex; -} - - -#app-content { - display: flex; - flex-direction: column; -} #content-wrapper { overflow: hidden; position: fixed; width: 100%; height: 100%; + #content { height: calc(100% - 50px); min-height: initial; } + + .app.app-deck { + width: 100%; + height: 100%; + display: flex; + } + + #app-content { + display: flex; + flex-direction: column; + } } /**