Merge pull request #697 from kinglozzer/body-overflow

Fix body overflow causing scroll bars
silverstripe · Oct 17, 2018 · e31f56a · e31f56a
2 parents 8727629 + 87a5d07
commit e31f56a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/components/Menu/Menu.scss b/client/src/components/Menu/Menu.scss
@@ -129,8 +129,7 @@
     background-color: $base-menu-bg;
     box-shadow: inset $border-color -1px 0 0;
     position: relative;
-    padding: 0 1px 0 0;
-    justify-content: flex-end;
+    padding-right: 1px;
     border-top: 1px solid rgba($border-color, .5);
 
     @include media-breakpoint-down(sm) {

diff --git a/client/src/styles/legacy/_style.scss b/client/src/styles/legacy/_style.scss
@@ -1354,13 +1354,17 @@ form.member-profile-form {
 
 .cms-panel {
   .cms-panel-toggle {
+    display: flex;
+    justify-content: flex-end;
+    padding: 0;
 
     .toggle-collapse,
     .toggle-expand {
-      height: 54px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
       text-align: right;
       text-decoration: none;
-      line-height: 53px;
 
       &:hover {
         background-color: $base-menu;
@@ -1375,7 +1379,7 @@ form.member-profile-form {
     }
 
     .toggle-collapse {
-      display: block;
+      display: flex;
     }
 
     .toggle-expand {
@@ -1392,7 +1396,7 @@ form.member-profile-form {
     }
 
     .cms-panel-toggle a.toggle-expand {
-      display: block;
+      display: flex;
       width: auto;
     }
   }

diff --git a/templates/SilverStripe/Admin/Includes/LeftAndMain_Menu.ss b/templates/SilverStripe/Admin/Includes/LeftAndMain_Menu.ss
@@ -10,7 +10,7 @@
 		<% include SilverStripe\\Admin\\LeftAndMain_MenuList %>
 	</div>
 
-	<div class="toolbar toolbar--south cms-panel-toggle vertical-align-items">
+	<div class="toolbar toolbar--south cms-panel-toggle">
 		<% include SilverStripe\\Admin\\LeftAndMain_MenuToggle %>
 	</div>
 </div>