[2375] Rename @module-margin-(x|y) to @gutter-(x|y)

ckan · May 23, 2012 · 3395d83 · 3395d83
1 parent 64ca918
commit 3395d83
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/ckan/public/base/less/mixins.less b/ckan/public/base/less/mixins.less
@@ -39,7 +39,7 @@
 }
 
 .simple-item {
-  padding: 7px 25px;
+  padding: 7px @gutter-x;
   border-bottom: 1px dotted #ccc;
 }
 
@@ -59,7 +59,7 @@
 }
 
 .secondary .simple-list > li {
-  padding-left:  @secondary-module-margin-x;
-  padding-right: @secondary-module-margin-x;
+  padding-left:  @gutter-small-x;
+  padding-right: @gutter-small-x;
   position: relative;
 }
diff --git a/ckan/public/base/less/module.less b/ckan/public/base/less/module.less
@@ -8,7 +8,7 @@
 
 .module > .heading {
   font-size: 14px;
-  padding: 0 @module-margin-x;
+  padding: 0 @gutter-x;
   border-bottom: 1px solid @module-heading-border-color;
   #gradient > .vertical(@module-heading-background-color-start, @module-heading-background-color-end);
 }
@@ -22,26 +22,26 @@
 }
 
 .module > .content {
-  padding: 0 @module-margin-x;
+  padding: 0 @gutter-x;
   margin: 20px 0;
 }
 
 .module > .content:first-child {
   margin-top: 0;
-  padding-top: @module-margin-y;
+  padding-top: @gutter-y;
 }
 
 .module > .content:last-child {
   margin-bottom: 0;
-  padding-bottom: @module-margin-y;
+  padding-bottom: @gutter-y;
 }
 
 .module > .content :last-child {
   margin-bottom: 0;
 }
 
 .module > .footer {
-  padding: 0 @module-margin-x 7px;
+  padding: 0 @gutter-x 7px;
 }
 
 .module .read-more {
@@ -101,7 +101,7 @@
   .heading,
   .content,
   .footer {
-    padding-left:  @secondary-module-margin-x;
-    padding-right: @secondary-module-margin-x;
+    padding-left:  @gutter-small-x;
+    padding-right: @gutter-small-x;
   }
 }
diff --git a/ckan/public/base/less/nav.less b/ckan/public/base/less/nav.less
@@ -4,8 +4,8 @@
 
 .nav-simple > li > a {
   color: @nav-link-color;
-  margin: -7px -@module-margin-x;
-  padding: 7px @module-margin-x;
+  margin: -7px -@gutter-x;
+  padding: 7px @gutter-x;
   font-size: 12px;
   line-height: 14px; // keeps the overall height an even number
 }
@@ -25,12 +25,12 @@
   margin-right: 7px;
   padding-left: 10px;
   padding-right: 0px;
-  padding: 1px (@module-margin-x - 7);
+  padding: 1px (@gutter-x - 7);
 }
 
 .secondary .nav-simple > li > a {
-  padding-left:  @secondary-module-margin-x;
-  padding-right: @secondary-module-margin-x;
+  padding-left:  @gutter-small-x;
+  padding-right: @gutter-small-x;
   position: relative;
 }
 
@@ -57,6 +57,6 @@
 }
 
 .nav-facet > li.selected > a {
-  padding-left:  @secondary-module-margin-x - 7;
-  padding-right: @secondary-module-margin-x - 7;
+  padding-left:  @gutter-small-x - 7;
+  padding-right: @gutter-small-x - 7;
 }
diff --git a/ckan/public/base/less/toolbar.less b/ckan/public/base/less/toolbar.less
@@ -8,7 +8,7 @@
   .box-shadow(none);
   float: left;
   background: none;
-  margin: 0 0 0 @secondary-module-margin-x;
+  margin: 0 0 0 @gutter-small-x;
   padding: 0;
   border: none;
 }

diff --git a/ckan/public/base/less/variables.less b/ckan/public/base/less/variables.less
@@ -13,11 +13,12 @@
 @module-heading-border-color: #d0d0d0;
 @module-heading-background-color-start: #f5f5f5;
 @module-heading-background-color-end: #f0f0f0;
-@module-margin-x: 25px;
-@module-margin-y: 20px;
 
-@secondary-module-margin-x: 15px;
-@secondary-module-margin-y: @module-margin-y;
+
+@gutter-x: 25px;
+@gutter-y: 20px;
+@gutter-small-x: 15px;
+@gutter-small-y: @gutter-y;
 
 @nav-link-color: #333;