Selaa lähdekoodia

column to .col & sass specific cleanup

convert .c# over to a sass list / @each directive to streamline output of classes.

convert "column" element over to .col class

convert css comments to sass comments in navbar file.
Scott O'Hara 11 vuotta sitten
vanhempi
commit
7e6b2e5c71
2 muutettua tiedostoa jossa 27 lisäystä ja 44 poistoa
  1. 24 40
      sass/_grid.scss
  2. 3 4
      sass/_navbar.scss

+ 24 - 40
sass/_grid.scss

@@ -1,4 +1,4 @@
-@if $import-grid == true{
+@if $import-grid == true {
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //  Grid system responsive code is in _general.scss
 //  Grid system responsive code is in _general.scss
 //  A hack (for old IEs) for the grid system is located in _iehacks.scss
 //  A hack (for old IEs) for the grid system is located in _iehacks.scss
@@ -14,56 +14,40 @@
   overflow: auto; // needed for proper formed layout
   overflow: auto; // needed for proper formed layout
 }
 }
 
 
-column {
+.col {
   float: left;
   float: left;
   margin: auto 1%;
   margin: auto 1%;
 }
 }
 
 
 // IE Grid Fix
 // IE Grid Fix
-.ie column {
+.ie .col {
   margin: auto .7%;
   margin: auto .7%;
 }
 }
 
 
-.c12 {
-	width: 98%;
-}
-.c11 {
-	width: 89.66%;
-}
-.c10 {
-	width: 81.33%;
-}
-.c9 {
-	width: 73%;
-}
-.c8 {
-	width: 64.66%;
-}
-.c7 {
-	width: 56.33%;
-}
-.c6 {
-	width: 48%;
-}
-.c5 {
-	width: 39.66%
-}
-.c4 {
-	width: 31.33%;
-}
-.c3 {
-	width: 23%;
-}
-.c2 {
-	width: 14.66%;
-}
-.c1 {
-	width: 6.33%;
-}
 
 
+$grid-list: (
+  c1   6.33%,
+  c2   14.66%,
+  c3   23%,
+  c4   31.33%,
+  c5   39.66%,
+  c6   48%,
+  c7   56.33%,
+  c8   64.66%,
+  c9   73%,
+  c10  81.33%,
+  c11  89.66%,
+  c12  98%
+);
+
+@each $value in $grid-list {
+  .#{nth($value, 1)} {
+    width: nth($value, 2);
+  }
+}
 
 
 @media (max-width:870px) {
 @media (max-width:870px) {
-  .row column {
+  .row .col {
     margin: 1% auto;
     margin: 1% auto;
     width: 100%;
     width: 100%;
   }
   }

+ 3 - 4
sass/_navbar.scss

@@ -59,10 +59,9 @@
     // transition: max-height .5s ease-in-out, height .5s ease-in-out;
     // transition: max-height .5s ease-in-out, height .5s ease-in-out;
 
 
     &:focus {
     &:focus {
-      /* Necesary for animations
-      max-height: 500px;
-      height: 100%;
-      */
+      // -- Necesary for animations
+      // max-height: 500px;
+      // height: 100%;
       height: auto;
       height: auto;
     }
     }