From e627820d3d29311325a2eb2a35d74dd34aa87deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 24 Feb 2016 17:06:02 +0100 Subject: [PATCH] ux(): padding / margin tweaks and polish --- public/sass/_variables.scss | 3 ++- public/sass/base/_reboot.scss | 2 +- public/sass/components/_dashboard.scss | 3 +-- public/sass/components/_submenu.scss | 2 +- public/sass/components/_tabbed_view.scss | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss index b7bd23938db..fd5857c30a0 100644 --- a/public/sass/_variables.scss +++ b/public/sass/_variables.scss @@ -217,5 +217,6 @@ $btn-border-radius: 3px; $side-menu-width: 14rem; // dashboard -$dashboard-padding: $spacer / 2; +$panel-margin: 0.4rem; +$dashboard-padding: ($panel-margin * 2) $panel-margin $panel-margin $panel-margin; diff --git a/public/sass/base/_reboot.scss b/public/sass/base/_reboot.scss index e1590769636..806ba2aa43d 100644 --- a/public/sass/base/_reboot.scss +++ b/public/sass/base/_reboot.scss @@ -131,7 +131,7 @@ ol, ul, dl { margin-top: 0; - margin-bottom: 1rem; + margin-bottom: 0rem; } ol ol, diff --git a/public/sass/components/_dashboard.scss b/public/sass/components/_dashboard.scss index cec89b49fdc..c4fbb994b24 100644 --- a/public/sass/components/_dashboard.scss +++ b/public/sass/components/_dashboard.scss @@ -69,7 +69,6 @@ } } - .row-control-inner { padding:0px; margin:0px; @@ -111,7 +110,7 @@ div.flot-text { } .panel-margin { - margin: 5px; + margin: 0 0.4rem 0.4rem 0.4rem; display: block; } diff --git a/public/sass/components/_submenu.scss b/public/sass/components/_submenu.scss index 218d34ffbdc..5d1d0648dda 100644 --- a/public/sass/components/_submenu.scss +++ b/public/sass/components/_submenu.scss @@ -1,5 +1,5 @@ .submenu-controls { - margin: 0 5px; + margin: 0 $panel-margin ($panel-margin*2) $panel-margin; font-size: 16px; } diff --git a/public/sass/components/_tabbed_view.scss b/public/sass/components/_tabbed_view.scss index 4581a15f548..00fcf4c54ff 100644 --- a/public/sass/components/_tabbed_view.scss +++ b/public/sass/components/_tabbed_view.scss @@ -1,7 +1,7 @@ .tabbed-view { background-color: $page-bg; background-image: $page-gradient; - margin: -$dashboard-padding; + margin: -($panel-margin*2); margin-bottom: $spacer*2; padding: $spacer*3;