Added new vertical tab selector and nav drawer; revamped navs

concerto · Jul 6, 2012 · 77a5b94 · 77a5b94
1 parent 61fd619
commit 77a5b94
Show file tree

Hide file tree

Showing 10 changed files with 330 additions and 210 deletions.
diff --git a/app/assets/stylesheets/application/common/mixins.scss.erb b/app/assets/stylesheets/application/common/mixins.scss.erb
@@ -147,6 +147,25 @@
 }
 
 
+// Horizontal dividers
+// -------------------
+// Dividers (basically an hr) within dropdowns and nav lists
+@mixin nav-divider($top: #e5e5e5, $bottom: $white) {
+  // IE7 needs a set width since we gave a height. Restricting just
+  // to IE7 to keep the 1px left/right space in other browsers.
+  // It is unclear where IE is getting the extra space that we need
+  // to negative-margin away, but so it goes.
+  *width: 100%;
+  height: 1px;
+  margin: (($baseLineHeight / 2) - 1) 1px; // 8px 1px
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: $top;
+  border-bottom: 1px solid $bottom;
+}
+
+
+
 // IE7 inline-block
 // ----------------
 @mixin ie7-inline-block() {

diff --git a/app/assets/stylesheets/application/common/variables.scss.erb b/app/assets/stylesheets/application/common/variables.scss.erb
@@ -92,17 +92,23 @@ $gridGutterWidthLarge:    30px !default;
 /// FLUID GRID
 // --------------------------------------------------
 
+// to calculate, use this formula: 
+// ($gridColumns * $fluidGridColumnWidth) + ($fluidGridGutterWidth * ($gridColumns - 1)) = 100%
+// ex: 12 * fluidGridColumnWidth + fluidGridGutterWidth * 11 = 100%
+// fluidGridColumnWidth = (100 - 11 * fluidGridGutterWidth) / 12
+// fluidGridGutterWidth = (100 - 12 * fluidGridColumnWidth) / 11
+
 // Default
 // -------------------------
 $fluidGridColumnWidth:         7.2996453905% !default;  /* changed from 6.382978723% !default; */
 $fluidGridGutterWidth:         1.127659574% !default;   /* changed from 2.127659574% !default; */
 
 // Portrait tablet to default desktop
 // -------------------------
-$fluidGridColumnWidthTablet:   5.801104972% !default;
-$fluidGridGutterWidthTablet:   2.762430939% !default;
+$fluidGridColumnWidthTablet:   6.801104972% !default;
+$fluidGridGutterWidthTablet:   1.6715218487 !default;   /* changed from 2.762430939% !default; */
 
 // Large desktop and up
 // -------------------------
-$fluidGridColumnWidthLarge:    5.982905983% !default;
-$fluidGridGutterWidthLarge:    2.564102564% !default;
+$fluidGridColumnWidthLarge:    6.982905983% !default;
+$fluidGridGutterWidthLarge:    1.4731934731 !default;   /* changed from 2.564102564% !default; */
diff --git a/app/assets/stylesheets/application/index-manifest.scss b/app/assets/stylesheets/application/index-manifest.scss
@@ -13,11 +13,10 @@
 @import "layout/type";
 @import "layout/forms";
 @import "layout/tables";
-@import "layout/navigation";
+@import "layout/navs";
 @import "layout/contentcell";
 @import "layout/lists-grid-stacked";
 @import "layout/topmenu";
-@import "layout/modalselector";
 @import "layout/alerts-badges";
 @import "layout/screenmodel";
 

diff --git a/app/assets/stylesheets/application/layout/contentcell.scss.erb b/app/assets/stylesheets/application/layout/contentcell.scss.erb
@@ -55,6 +55,10 @@ section.C {
     padding:2px;
     padding-left: 12px;
     height: 25px;
+
+    .nav {
+      margin: 0px;
+    }
 
     a.button {
       background:$concerto-blue-0;
@@ -65,12 +69,13 @@ section.C {
       text-shadow: 0px 0px 0px;
     }
 
-    .pills {
+    .nav-pills {
       padding-top: 2px;
       margin-bottom: 0px;
 
       > li > a {
         @include border-radius(3px);
+        margin: 0px;
         padding: 0px 4px;
         color: $concerto-blue-0;
         line-height: 22px;

diff --git a/app/assets/stylesheets/application/layout/modalselector.scss.erb b/app/assets/stylesheets/application/layout/modalselector.scss.erb
diff --git a/app/assets/stylesheets/application/layout/navigation.scss.erb b/app/assets/stylesheets/application/layout/navigation.scss.erb