From 68f46ce25eabb0542450dcf0ad3c8f6da6a78f2f Mon Sep 17 00:00:00 2001
From: Diana Whitten <hurgleburgler@gmail.com>
Date: Mon, 8 Aug 2016 10:08:18 -0700
Subject: [PATCH] Preview Page: Default Theme: Content Horizontally Scrolling

Removal of default styles caused page to scroll horizontally.

Closes-bug: #1611057

Change-Id: I1a9b7e0da950fa6c66862ba82fcc264d2f3b2280
---
 .../developer/theme-preview/theme-preview.html         |  2 +-
 openstack_dashboard/static/dashboard/scss/_layout.scss |  6 ++----
 .../themes/material/static/horizon/_styles.scss        | 10 ++--------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.html b/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.html
index 482860ce9e..9aa1965d4e 100644
--- a/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.html
+++ b/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.html
@@ -3,7 +3,7 @@
 </p>
 
 <div class="row">
-  <div class="col-lg-3 col-md-1 col-sm-4">
+  <div class="col-lg-3 col-sm-4">
     <div class="list-group">
       <a translate class="list-group-item" href="#navbar" target="_self">Navbar</a>
       <a translate class="list-group-item" href="#buttons" target="_self">Buttons</a>
diff --git a/openstack_dashboard/static/dashboard/scss/_layout.scss b/openstack_dashboard/static/dashboard/scss/_layout.scss
index 523585270c..a1e2670bfe 100644
--- a/openstack_dashboard/static/dashboard/scss/_layout.scss
+++ b/openstack_dashboard/static/dashboard/scss/_layout.scss
@@ -14,19 +14,17 @@ $navbar-true-height: $navbar-height + $navbar-border-size !default;
 
 #main_content {
   height: 100%;
-  display: table;
   min-width: $main-content-min-width;
   padding-top: $navbar-true-height;
 }
 
-#content_body,
 #sidebar {
-  display: table-cell;
-  vertical-align: top;
+  position: fixed;
 }
 
 #content_body {
   width: 100%;
+  padding-left: $sidebar-width;
 }
 
 .page-header {
diff --git a/openstack_dashboard/themes/material/static/horizon/_styles.scss b/openstack_dashboard/themes/material/static/horizon/_styles.scss
index 09b10ef476..5e7fa64b11 100644
--- a/openstack_dashboard/themes/material/static/horizon/_styles.scss
+++ b/openstack_dashboard/themes/material/static/horizon/_styles.scss
@@ -16,18 +16,12 @@
   width: 215px;
 }
 
-// General Layout Changes
-#sidebar {
-  position: fixed;
-  display: block;
-}
-
 #content_body {
   transition: padding-left $sidebar-animation;
   display: block;
 
-  @media (min-width: $screen-lg) {
-    padding-left: $sidebar-width;
+  @media (max-width: $screen-lg) {
+    padding-left: 0;
   }
 }