Replace Git submodule for testing template with an actual folder

diff --git a/.gitignore b/.gitignore
index e3402bd37e3d90c6952012442933b22d84a2d8c3..7fab60965c64404f955503d42d1b614ce0d41c06 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ node_modules/
 npm-debug.log
 temp/
 dist/
-_build/
\ No newline at end of file
+_build/
+inky

diff --git a/README.md b/README.md
index a0d8e5d60a52484f482a252e5c118d5ee074bf90..1932f437328c7763c2eaaf26c1d909f7d8d7eca8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -20,9 +20,9 @@ The Sass is compiled using libsass, which requires the GCC to be installed on yo
 To get going with Foundation for Emails you'll need run the following commands in your projects directory:
 
 ```
-git clone --recursive https://github.com/zurb/foundation-emails.git
+git clone https://github.com/zurb/foundation-emails.git
 cd foundation-emails
-npm install
+./setup.sh
 ```
 
 Note: this is the repo for the private release of the framework, we'll eventually be releasing a template repo to the public!
@@ -36,13 +36,13 @@ Foundation for Emails utilizes [Panini](https://github.com/zurb/panini), our sup
 foundation-emails/
 ├── _build/
 │   └── ...
-├── foundation-emails-template/
+├── testing/
 │   └── layouts
 │        └── ...
 │   └── pages
 │        └── ...
 ```
-You'll be working within the `foundation-emails-template/layouts/` and `foundation-emails-template/pages/` to write your HTML emails. The `dist/` directory will have all of your outputted emails.
+You'll be working within the `testing/layouts/` and `testing/pages/` to write your HTML emails. The `dist/` directory will have all of your outputted emails.
 
 ## Commands
 You'll have two commands that will give you all the tools you need for F4E.

diff --git a/foundation-emails-template b/foundation-emails-template
deleted file mode 160000 (submodule)
index 98c5173..0000000
--- a/foundation-emails-template
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 98c51736b5162081395a53c1311f633a3cdf3f2b

diff --git a/package.json b/package.json
index 7ac91e67a71fc88b5d1d5fcb63e1fe910fc09cfb..56e55673e1af838b6eefc52e14bb9f5f8baeb19e 100644 (file)
--- a/package.json
+++ b/package.json
@@ -4,9 +4,9 @@
   "description": "A framework for responsive emails made by ZURB",
   "scripts": {
     "start": "gulp",
-    "test": "cd foundation-emails-template && npm start",
-    "production": "cd foundation-emails-template && npm run build",
-    "postinstall": "cd foundation-emails-template && npm i"
+    "test": "cd testing && npm start",
+    "production": "cd testing && npm run build",
+    "postinstall": "cd testing && npm i"
   },
   "devDependencies": {
     "browser-sync": "^2.9.10",
@@ -18,7 +18,6 @@
     "gulp-htmlmin": "^1.1.1",
     "gulp-if": "^2.0.0",
     "gulp-inject": "^1.2.0",
-    "gulp-inky": "git://github.com/zurb/gulp-inky.git",
     "gulp-inline-css": "^2.0.0",
     "gulp-load-plugins": "^1.0.0-rc.1",
     "gulp-ruby-sass": "^1.0.5",

diff --git a/setup.sh b/setup.sh
new file mode 100755 (executable)
index 0000000..1de07b6
--- /dev/null
+++ b/setup.sh
@@ -0,0 +1,4 @@
+npm install
+git clone https://github.com/zurb/inky
+cd testing
+npm link ../inky

diff --git a/testing b/testing
new file mode 160000 (submodule)
index 0000000..56a5d18
--- /dev/null
+++ b/testing
@@ -0,0 +1 @@
+Subproject commit 56a5d18485653308c87f42760c59f3dd3d6a7cb7