[2375] Update the sidebar modules to have narrower margins

ckan · May 15, 2012 · a7a5da7 · a7a5da7
1 parent 37e051e
commit a7a5da7
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/ckan/public/base/less/module.less b/ckan/public/base/less/module.less
@@ -1,7 +1,3 @@
-// Local Variables
-@module-margin-x: 25px;
-@module-margin-y: 20px;
-
 .module {
   .border-radius(3px);
   .box-shadow(0 0 3px rgba(0, 0, 0, 0.3));
@@ -17,11 +13,12 @@
   #gradient > .vertical(@module-heading-background-color-start, @module-heading-background-color-end);
 }
 
-.module > .heading .btn {
+.module > .heading .action {
   float: right;
-  position: relative;
-  top: 4px;
-  right: -20px;
+  color: #8c8c8c;
+  color: rgba(51, 51, 51, 0.7);
+  font-size: 11px;
+  text-decoration: underline;
 }
 
 .module > .content {
@@ -80,3 +77,14 @@
   font-size: 11px;
   display: block;
 }
+
+// Sidebar specific
+
+.sidebar .module {
+  .heading,
+  .content,
+  .footer {
+    padding-left: @sidebar-module-margin-x;
+    padding-right: @sidebar-module-margin-x;
+  }
+}
diff --git a/ckan/public/base/less/nav.less b/ckan/public/base/less/nav.less
@@ -21,8 +21,18 @@
   box-shadow: @inner-shadow, @outer-shadow;
   cursor: default;
   margin: 2px 5px 3px;
-  padding: 4px 18px;
+  padding: 4px (@module-margin-x - 7);
   background: #000;
   color: #fff;
   border: 1px solid black;
 }
+
+.sidebar .nav-simple > li > a {
+  padding-left:  @sidebar-module-margin-x;
+  padding-right: @sidebar-module-margin-x;
+}
+
+.sideabar .nav-simple > li.selected > a {
+  padding-left:  @sidebar-module-margin-x - 7;
+  padding-right: @sidebar-module-margin-x - 7;
+}
diff --git a/ckan/public/base/less/variables.less b/ckan/public/base/less/variables.less
@@ -12,6 +12,11 @@
 @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;
+
+@sidebar-module-margin-x: 15px;
+@sidebar-module-margin-y: @module-margin-y;
 
 @nav-link-color: #333;