diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 082985e0ccf..b986816e6c6 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -291,8 +291,11 @@ $sidebar-active: #f4fcd0; margin-right: rem-calc(12); } - .admin-content { + .side-menu-and-admin-content { + @include side-menu-and-content; + } + .admin-content { .proposal-form { padding-top: 0; } @@ -311,11 +314,6 @@ $sidebar-active: #f4fcd0; display: none; } -.admin-content { - overflow: scroll; - padding: $line-height !important; -} - @include breakpoint(medium) { tr { @@ -431,10 +429,6 @@ code { background: linear-gradient(to bottom, #245b80 0%, #488fb5 100%); border-right: 1px solid $border; - @include breakpoint(medium) { - min-height: rem-calc(1100); - } - ul { list-style-type: none; margin-bottom: 0; diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index b7f9e5e16fb..7de561c4266 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -16,6 +16,10 @@ // 01. Dashboard global // -------------------- +.dashboard-menu-and-content { + @include side-menu-and-content; +} + .proposal-title { display: inline-block; @@ -288,10 +292,6 @@ background: #fbfbfb; border-right: 1px solid $border; - @include breakpoint(medium) { - min-height: $line-height * 45; - } - [class^="icon-"] { color: $text; display: inline-block; diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index e1f293c13d0..b5fb4b9f32b 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -1,8 +1,9 @@ // Table of Contents // // 01. Logo -// 02. Orbit bullets -// 03. Direct uploads +// 02. Side menu and content +// 03. Orbit bullets +// 04. Direct uploads // ------------------ // 01. Logo @@ -21,7 +22,29 @@ } } -// 02. Orbit bullet +// 02. Side menu and content +// ------------------------- + +@mixin side-menu-and-content { + display: flex; + + > :first-child { + flex: 25%; + min-width: 250px; + + > :first-child { + height: 100%; + } + } + + > :last-child { + flex: 75%; + overflow-x: auto; + padding: $line-height !important; + } +} + +// 03. Orbit bullet // ---------------- @mixin orbit-bullets { @@ -49,7 +72,7 @@ } } -// 03. Direct uploads +// 04. Direct uploads // ------------------ @mixin direct-uploads { diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 45ad2d7d47e..16e860b1f35 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -1,4 +1,4 @@ -
+