Reorganize Sass files into components, util, and global, to match the structure of...

diff --git a/scss/ink/components/_global.scss b/scss/_global.scss
similarity index 97%
rename from scss/ink/components/_global.scss
rename to scss/_global.scss
index 22ff7e469eab4faf01d4486b5c514fe3fddd7084..79e28ab9e77bee3d06ae793e7a06b24c79a06e18 100755 (executable)
--- a/scss/ink/components/_global.scss
+++ b/scss/_global.scss
@@ -6,8 +6,6 @@
 /// @group global
 ////
 
-@import '../functions';
-
 /// Primary color for interactive components like links and buttons.
 /// @type Color
 $primary-color: #2199e8 !default;
@@ -70,4 +68,4 @@ $global-rounded: 500px !default;
 
 /// Default gutter for the grid system
 /// @type Number
-$grid-column-gutter: 16px;
\ No newline at end of file
+$grid-column-gutter: 16px;

diff --git a/scss/ink/components/_alignment.scss b/scss/components/_alignment.scss
similarity index 100%
rename from scss/ink/components/_alignment.scss
rename to scss/components/_alignment.scss

diff --git a/scss/ink/components/_block-grid.scss b/scss/components/_block-grid.scss
similarity index 97%
rename from scss/ink/components/_block-grid.scss
rename to scss/components/_block-grid.scss
index 6fbed5972998a3a6314b82748a225b09d58438dc..cfe7369d94ed9296c0f9a14160bbfa7cecd07a95 100755 (executable)
--- a/scss/ink/components/_block-grid.scss
+++ b/scss/components/_block-grid.scss
@@ -2,8 +2,6 @@
 // zurb.com/ink/
 // Licensed under MIT Open Source
 
-@import 'global';
-
 ////
 /// @group block-grid
 ////

diff --git a/scss/ink/components/_button.scss b/scss/components/_button.scss
similarity index 99%
rename from scss/ink/components/_button.scss
rename to scss/components/_button.scss
index 31915a291a3a6b5318ad272528a31dc3b8d2cddc..33ce7d825f590dc63b864b015e3bea6f945ef6e9 100755 (executable)
--- a/scss/ink/components/_button.scss
+++ b/scss/components/_button.scss
@@ -2,8 +2,6 @@
 // zurb.com/ink/
 // Licensed under MIT Open Source
 
-@import 'global';
-
 ////
 /// @group button
 ////

diff --git a/scss/ink/components/_callout.scss b/scss/components/_callout.scss
similarity index 98%
rename from scss/ink/components/_callout.scss
rename to scss/components/_callout.scss
index 4b23f06e9dec72853fc21b98006a54e2dc0a9019..843a6fb6b86d1f11ebfbd473cb5cd2213e0cf0f7 100644 (file)
--- a/scss/ink/components/_callout.scss
+++ b/scss/components/_callout.scss
@@ -2,8 +2,6 @@
 // zurb.com/ink/
 // Licensed under MIT Open Source
 
-@import 'global';
-
 ////
 /// @group callout
 ////

diff --git a/scss/ink/components/_grid.scss b/scss/components/_grid.scss
similarity index 99%
rename from scss/ink/components/_grid.scss
rename to scss/components/_grid.scss
index 74c4636c2f90f5ef9f897f1dd67d9a6aeeaacc63..14e75fb2af15018d8f925db6e7f1b41c05baf317 100755 (executable)
--- a/scss/ink/components/_grid.scss
+++ b/scss/components/_grid.scss
@@ -2,8 +2,6 @@
 // zurb.com/ink/
 // Licensed under MIT Open Source
 
-@import 'global';
-
 ////
 /// @group grid
 ////
@@ -79,7 +77,7 @@ th.column.last {
   th.large-#{$i}.last {
     padding-right: $grid-column-gutter;
   }
-  
+
   //Collapsed logic
   .collapse {
     td.large-#{$i},
@@ -88,7 +86,7 @@ th.column.last {
       padding-left: 0;
       width: grid-calc-px($i, $grid-column-count, $container-width) + $grid-column-gutter;
     }
-    
+
     //Gotta give it that extra love for the first and last columns.
     td.large-#{$i}.first,
     th.large-#{$i}.first,

diff --git a/scss/ink/components/_media-query.scss b/scss/components/_media-query.scss
similarity index 97%
rename from scss/ink/components/_media-query.scss
rename to scss/components/_media-query.scss
index 05ded79c52a67ae201d17a3914bd8b706236cde8..11d1d003dd7619a1e7b40f00c2dd591c621e2067 100755 (executable)
--- a/scss/ink/components/_media-query.scss
+++ b/scss/components/_media-query.scss
@@ -2,8 +2,6 @@
 // zurb.com/ink/
 // Licensed under MIT Open Source
 
-@import 'global';
-
 ////
 /// @group media-query
 ////
@@ -17,7 +15,7 @@ $small-container-width: 95% !default;
 $small-range: $container-width !default;
 
 @media only screen and (max-width: #{$small-range}) {
-  
+
   table.body img {
     width: auto !important;
     height: auto !important;
@@ -57,7 +55,7 @@ $small-range: $container-width !default;
     td.small-#{$i},
     th.small-#{$i} {
       display: inline-block !important;
-      width: grid-calc-pct($i, $grid-column-count) !important;    
+      width: grid-calc-pct($i, $grid-column-count) !important;
     }
   }
 

diff --git a/scss/ink/components/_menu.scss b/scss/components/_menu.scss
similarity index 97%
rename from scss/ink/components/_menu.scss
rename to scss/components/_menu.scss
index 516186de5dffccf96bd51d5c44e3920e7df3e0b0..05009eba0cc199590ea1f39265e5a62e0ff46e3b 100644 (file)
--- a/scss/ink/components/_menu.scss
+++ b/scss/components/_menu.scss
@@ -2,8 +2,6 @@
 // zurb.com/ink/
 // Licensed under MIT Open Source
 
-@import 'global';
-
 ////
 /// @group inline-list
 ////
@@ -54,4 +52,4 @@ table.menu.vertical {
       }
     }
   }
-}
\ No newline at end of file
+}

diff --git a/scss/ink/components/_normalize.scss b/scss/components/_normalize.scss
similarity index 97%
rename from scss/ink/components/_normalize.scss
rename to scss/components/_normalize.scss
index d1a9555c0ca59f93af0d547d4b8fc53ecf22aee1..fb5ec60795996abab345b26e63d9b237ba36b9df 100755 (executable)
--- a/scss/ink/components/_normalize.scss
+++ b/scss/components/_normalize.scss
@@ -2,9 +2,6 @@
 // zurb.com/ink/
 // Licensed under MIT Open Source
 
-@import 'global';
-@import 'type';
-
 ////
 /// @group normalize
 ////

diff --git a/scss/ink/components/_outlook-first.scss b/scss/components/_outlook-first.scss
similarity index 88%
rename from scss/ink/components/_outlook-first.scss
rename to scss/components/_outlook-first.scss
index 4e63b195bac7e0f6db873dd84efbdfdb345de1fe..9baf53296808a8585e5b122c95f81f685ec82e61 100755 (executable)
--- a/scss/ink/components/_outlook-first.scss
+++ b/scss/components/_outlook-first.scss
@@ -2,8 +2,6 @@
 // zurb.com/ink/
 // Licensed under MIT Open Source
 
-@import 'global';
-
 ////
 /// @group outlook
 ////

diff --git a/scss/ink/components/_thumbnail.scss b/scss/components/_thumbnail.scss
similarity index 98%
rename from scss/ink/components/_thumbnail.scss
rename to scss/components/_thumbnail.scss
index 2db1c84c13b363635f7a0a77fd2aea6111b1d2f7..419dc8fd73f6ccca7869cc804538d34951498097 100644 (file)
--- a/scss/ink/components/_thumbnail.scss
+++ b/scss/components/_thumbnail.scss
@@ -2,8 +2,6 @@
 // zurb.com/ink/
 // Licensed under MIT Open Source
 
-@import 'global';
-
 ////
 /// @group thumbnial
 ////

diff --git a/scss/ink/components/_type.scss b/scss/components/_type.scss
similarity index 99%
rename from scss/ink/components/_type.scss
rename to scss/components/_type.scss
index 05eab1cf681070d68e28f78457f99b4b83b33411..4fd08b646d9c57b5a97048866cc82ea8bfe5e3bb 100755 (executable)
--- a/scss/ink/components/_type.scss
+++ b/scss/components/_type.scss
@@ -2,8 +2,6 @@
 // zurb.com/ink/
 // Licensed under MIT Open Source
 
-@import 'global';
-
 ////
 /// @group typography
 ////

diff --git a/scss/ink/components/_visibility.scss b/scss/components/_visibility.scss
similarity index 100%
rename from scss/ink/components/_visibility.scss
rename to scss/components/_visibility.scss

diff --git a/scss/ink.scss b/scss/foundation.scss
similarity index 78%
rename from scss/ink.scss
rename to scss/foundation.scss
index a157754a65cb5ca2a4a7e085f64b60930352c7be..dafe7bcbe7c16e09e747d91e6fb0785ae680abfd 100755 (executable)
--- a/scss/ink.scss
+++ b/scss/foundation.scss
@@ -1,24 +1,22 @@
-// Foundation by ZURB
+// Foundation for Emails by ZURB
 // foundation.zurb.com
 // Licensed under MIT Open Source
 
-$foundation-version: '2.0.0-alpha';
-
-@charset 'UTF-8';
-
 @import
-'ink/components/normalize',
-'ink/components/grid',
-'ink/components/block-grid',
-'ink/components/alignment',
-'ink/components/visibility',
-'ink/components/type',
-'ink/components/button',
-'ink/components/callout',
-'ink/components/thumbnail',
-'ink/components/menu',
-'ink/components/outlook-first',
-'ink/components/media-query';
+  'util/util',
+  'global',
+  'components/normalize',
+  'components/grid',
+  'components/block-grid',
+  'components/alignment',
+  'components/visibility',
+  'components/type',
+  'components/button',
+  'components/callout',
+  'components/thumbnail',
+  'components/menu',
+  'components/outlook-first',
+  'components/media-query';
 
 body {
   background-color: #eeeeee;

diff --git a/scss/ink/_functions.scss b/scss/util/_util.scss
similarity index 100%
rename from scss/ink/_functions.scss
rename to scss/util/_util.scss

diff --git a/testing/package.json b/testing/package.json
index 50fbe965d2a01a4ed25909d69414f6436e52f154..f3da63d4fde4532a30671b8e7ccd70819965e9c0 100644 (file)
--- a/testing/package.json
+++ b/testing/package.json
@@ -24,7 +24,7 @@
     "gulp-sass": "^2.1.0",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-webserver": "^0.9.1",
-    "inky": "git://github.com/zurb/inky.git#0.3.0",
+    "inky": "1.0.0-rc.1",
     "lazypipe": "^1.0.1",
     "media-query-extractor": "^0.1.1",
     "panini": "^1.1.1",

diff --git a/testing/src/assets/scss/app.scss b/testing/src/assets/scss/app.scss
index e3b95f67b3b74628aaf2635543f114676f961119..e7f69df8232e6fc7566a86fe5e076a4ac629a201 100644 (file)
--- a/testing/src/assets/scss/app.scss
+++ b/testing/src/assets/scss/app.scss
@@ -1,2 +1,2 @@
 @import 'settings';
-@import '../../../../scss/ink';
+@import '../../../../scss/foundation';