Просмотр исходного кода

ux(): padding / margin tweaks and polish

Torkel Ödegaard 9 лет назад
Родитель
Сommit
e627820d3d

+ 2 - 1
public/sass/_variables.scss

@@ -217,5 +217,6 @@ $btn-border-radius:              3px;
 $side-menu-width:  14rem;
 $side-menu-width:  14rem;
 
 
 // dashboard
 // dashboard
-$dashboard-padding: $spacer / 2;
+$panel-margin: 0.4rem;
+$dashboard-padding: ($panel-margin * 2) $panel-margin $panel-margin $panel-margin;
 
 

+ 1 - 1
public/sass/base/_reboot.scss

@@ -131,7 +131,7 @@ ol,
 ul,
 ul,
 dl {
 dl {
   margin-top: 0;
   margin-top: 0;
-  margin-bottom: 1rem;
+  margin-bottom: 0rem;
 }
 }
 
 
 ol ol,
 ol ol,

+ 1 - 2
public/sass/components/_dashboard.scss

@@ -69,7 +69,6 @@
   }
   }
 }
 }
 
 
-
 .row-control-inner {
 .row-control-inner {
   padding:0px;
   padding:0px;
   margin:0px;
   margin:0px;
@@ -111,7 +110,7 @@ div.flot-text {
 }
 }
 
 
 .panel-margin {
 .panel-margin {
-  margin: 5px;
+  margin: 0 0.4rem 0.4rem 0.4rem;
   display: block;
   display: block;
 }
 }
 
 

+ 1 - 1
public/sass/components/_submenu.scss

@@ -1,5 +1,5 @@
 .submenu-controls {
 .submenu-controls {
-  margin: 0 5px;
+  margin: 0 $panel-margin ($panel-margin*2) $panel-margin;
   font-size: 16px;
   font-size: 16px;
 }
 }
 
 

+ 1 - 1
public/sass/components/_tabbed_view.scss

@@ -1,7 +1,7 @@
 .tabbed-view {
 .tabbed-view {
   background-color: $page-bg;
   background-color: $page-bg;
   background-image: $page-gradient;
   background-image: $page-gradient;
-  margin: -$dashboard-padding;
+  margin: -($panel-margin*2);
   margin-bottom: $spacer*2;
   margin-bottom: $spacer*2;
   padding: $spacer*3;
   padding: $spacer*3;