From 6b04f47eae87dc78e609f7089cf31c14bf42ce6d Mon Sep 17 00:00:00 2001 From: Rob Cresswell Date: Mon, 8 Feb 2016 15:16:01 +0000 Subject: [PATCH] Remove extraneous table padding A bunch of extra padding was added to the tables for some reason. It's not needed, as bootstraps rows/cols provide any padding already. Change-Id: If462004899afa8bcf3d7a10ab181206f47596bea Closes-Bug: 1543166 --- horizon/static/framework/widgets/table/table.scss | 2 +- openstack_dashboard/static/dashboard/scss/_layout.scss | 2 -- openstack_dashboard/static/dashboard/scss/_variables.scss | 1 - .../themes/material/static/horizon/_styles.scss | 6 +----- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/horizon/static/framework/widgets/table/table.scss b/horizon/static/framework/widgets/table/table.scss index 5cb7aff98d..554e45406c 100644 --- a/horizon/static/framework/widgets/table/table.scss +++ b/horizon/static/framework/widgets/table/table.scss @@ -297,7 +297,7 @@ $em-per-priority: floor($table-col-avg-width / $font-size-base) * 3; } @media (min-width: 0em) { - $content-width: $main-content-min-width - $sidebar-width - (2 * $content-body-padding); + $content-width: $main-content-min-width - $sidebar-width; $max-priority: floor($content-width / $font-size-base / $em-per-priority); @for $i from 1 through $max-priority { diff --git a/openstack_dashboard/static/dashboard/scss/_layout.scss b/openstack_dashboard/static/dashboard/scss/_layout.scss index 0561f3dc45..6eeea0bf87 100644 --- a/openstack_dashboard/static/dashboard/scss/_layout.scss +++ b/openstack_dashboard/static/dashboard/scss/_layout.scss @@ -27,8 +27,6 @@ $navbar-true-height: $navbar-height + $navbar-border-size !default; #content_body { width: 100%; - padding-left: $content-body-padding; - padding-right: $content-body-padding; } .page-header { diff --git a/openstack_dashboard/static/dashboard/scss/_variables.scss b/openstack_dashboard/static/dashboard/scss/_variables.scss index 41b15132f8..cee44062b6 100644 --- a/openstack_dashboard/static/dashboard/scss/_variables.scss +++ b/openstack_dashboard/static/dashboard/scss/_variables.scss @@ -15,7 +15,6 @@ $main-content-min-width: 900px !default; $sidebar-width: 220px !default; $border-color: #dddddd !default; $table-bg-odd: $table-bg-accent !default; -$content-body-padding: 15px !default; /* Workflows */ diff --git a/openstack_dashboard/themes/material/static/horizon/_styles.scss b/openstack_dashboard/themes/material/static/horizon/_styles.scss index 1508f74067..5c880e11cf 100644 --- a/openstack_dashboard/themes/material/static/horizon/_styles.scss +++ b/openstack_dashboard/themes/material/static/horizon/_styles.scss @@ -19,11 +19,7 @@ padding-top: $navbar-height; transition: padding-left $sidebar-animation; display: block; - padding-left: $sidebar-width + $content-body-padding; - - @media (max-width: $screen-lg) { - padding-left: $content-body-padding; - } + padding-left: $sidebar-width; } #main_content {