diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 082985e0c..c7e7f1fdf 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -291,7 +291,29 @@ $sidebar-active: #f4fcd0; margin-right: rem-calc(12); } + .side-menu-and-admin-content { + display: flex; + + @include breakpoint(small only) { + flex-direction: column; + } + } + + .side-menu { + flex: 25%; + min-width: 250px; + + > :last-child { + height: 100%; + + .admin-sidebar { + height: 100%; + } + } + } + .admin-content { + flex: 75%; .proposal-form { padding-top: 0; @@ -431,10 +453,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/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 45ad2d7d4..16e860b1f 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -1,4 +1,4 @@ -
+