From: Geoff Kimball <geoff@zurb.com>
Date: Fri, 1 Apr 2016 00:32:17 +0000 (-0700)
Subject: Update panini and octophant dependencies, and disable automated template updates... 
X-Git-Tag: v6.2.1~13^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b2666da2e96f99aec191490e36152a66b88f35b;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Update panini and octophant dependencies, and disable automated template updates in deploy process for now
---

diff --git a/gulp/deploy.js b/gulp/deploy.js
index d491d174e..b0051fd19 100644
--- a/gulp/deploy.js
+++ b/gulp/deploy.js
@@ -93,7 +93,8 @@ gulp.task('deploy:settings', function(cb) {
       'typography-base',
       'typography-helpers'
     ],
-    imports: ['util/util']
+    imports: ['util/util'],
+    _foundationShim: true
   }
 
   octophant('./scss', options, cb);
@@ -118,22 +119,24 @@ gulp.task('deploy:docs', ['build'], function() {
     }));
 });
 
-gulp.task('deploy:templates', function() {
-  exec('git clone https://github.com/zurb/foundation-sites-template');
-  exec('cp scss/settings/_settings.scss foundation-sites-template/scss/_settings.scss');
-  exec('cd foundation-sites-template');
-  exec('git commit -am "Update settings file to match Foundation "' + NEXT_VERSION);
-  exec('git push origin master');
-  exec('cd ..');
-  exec('rm -rf foundation-sites-template');
-
-  exec('git clone https://github.com/zurb/foundation-zurb-template');
-  exec('cp scss/settings/_settings.scss foundation-zurb-template/src/assets/scss/_settings.scss');
-  exec('cd foundation-zurb-template');
-  exec('git commit -am "Update settings file to match Foundation "' + NEXT_VERSION);
-  exec('git push origin master');
-  exec('cd ..');
-  exec('rm -rf foundation-zurb-template');
+// This part of the deploy process hasn't been tested! It should be done manually for now
+gulp.task('deploy:templates', function(done) {
+  // exec('git clone https://github.com/zurb/foundation-sites-template');
+  // exec('cp scss/settings/_settings.scss foundation-sites-template/scss/_settings.scss');
+  // exec('cd foundation-sites-template');
+  // exec('git commit -am "Update settings file to match Foundation "' + NEXT_VERSION);
+  // exec('git push origin master');
+  // exec('cd ..');
+  // exec('rm -rf foundation-sites-template');
+  //
+  // exec('git clone https://github.com/zurb/foundation-zurb-template');
+  // exec('cp scss/settings/_settings.scss foundation-zurb-template/src/assets/scss/_settings.scss');
+  // exec('cd foundation-zurb-template');
+  // exec('git commit -am "Update settings file to match Foundation "' + NEXT_VERSION);
+  // exec('git push origin master');
+  // exec('cd ..');
+  // exec('rm -rf foundation-zurb-template');
+  done();
 });
 
 // The Customizer runs this function to generate files it needs
diff --git a/package.json b/package.json
index cab260664..aa4af2aea 100644
--- a/package.json
+++ b/package.json
@@ -56,9 +56,9 @@
     "inquirer": "^0.11.2",
     "mocha": "^2.3.3",
     "motion-ui": "^1.1.0",
-    "octophant": "^1.0.0",
+    "octophant": "^1.0.1",
     "opener": "^1.4.1",
-    "panini": "^1.1.1",
+    "panini": "^1.3.0",
     "parker": "0.0.9",
     "prettyjson": "^1.1.3",
     "require-dir": "^0.3.0",
@@ -88,7 +88,9 @@
     "format": "global",
     "shim": {
       "dist/foundation": {
-        "deps": ["jquery"]
+        "deps": [
+          "jquery"
+        ]
       }
     }
   }
diff --git a/scss/settings/_settings.scss b/scss/settings/_settings.scss
index df56c6a70..fdd088616 100644
--- a/scss/settings/_settings.scss
+++ b/scss/settings/_settings.scss
@@ -74,7 +74,6 @@ $global-flexbox: false;
 $print-transparent-backgrounds: true;
 
 @include add-foundation-colors;
-
 // 2. Breakpoints
 // --------------
 
@@ -564,3 +563,4 @@ $topbar-submenu-background: $topbar-background;
 $topbar-title-spacing: 1rem;
 $topbar-input-width: 200px;
 $topbar-unstack-breakpoint: medium;
+