Merge pull request #1 from bobdenotter/master

Updating to Foundation 6.3, etc.
rossriley · Dec 18, 2016 · 75211d4 · 75211d4
2 parents a1ff8bb + 18c0a33
commit 75211d4
Show file tree

Hide file tree

Showing 10 changed files with 205 additions and 141 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
-Version 1.0 (tbd)
+Version 2.0
+
+ - Updated for Foundation 6.3
+
+Version 1.0 
 
  - Initial release.
diff --git a/README.md b/README.md
@@ -360,7 +360,7 @@ npm run-script build
 This will build the files that you can deploy, or put into your versioning
 system.
 
-The build process has been tested on NPM 3.7.3 and Node v5.8.0. If you do not
+The build process has been tested on NPM 3.10 and Node v7.2. If you do not
 have the correct versions you can use [n](https://www.npmjs.com/package/n) to
 manage your Node and NPM versions:
 
@@ -371,7 +371,7 @@ sudo n stable
 
 And then go through the above steps again.
 
-If you're interested to learn more about the process these two tutorials on
+If you're interested to learn more about the process, these two tutorials on
 Gulp (which is what we use under the hood) might be of interest to you:
 
  - https://markgoodyear.com/2014/01/getting-started-with-gulp/

diff --git a/css/foundation.css b/css/foundation.css
diff --git a/css/theme.css b/css/theme.css
@@ -33,7 +33,7 @@ p.meta {
   font-size: 90%;
   color: #666; }
 
-@media screen and (min-width: 40em) {
+@media print, screen and (min-width: 40em) {
   h1, h2 {
     margin-bottom: 2rem; }
   img {
@@ -45,17 +45,17 @@ p.meta {
   .no-js .top-bar {
     display: none; } }
 
-@media screen and (min-width: 40em) {
+@media print, screen and (min-width: 40em) {
   .no-js .title-bar {
     display: none; } }
 
 .menu > li {
   padding: 0; }
   .menu > li a {
-    color: #2B2B2B;
+    color: #1779ba;
     text-decoration: none; }
   .menu > li.active > a {
-    color: #2B2B2B;
+    color: #1779ba;
     background-color: inherit;
     border-bottom: 1px solid; }
 

diff --git a/js/foundation.js b/js/foundation.js
diff --git a/source/bower.json b/source/bower.json
@@ -9,7 +9,7 @@
   "license": "MIT",
   "homepage": "http://foundation.zurb.com",
   "dependencies": {
-    "foundation-sites": "~6.2.4",
+    "foundation-sites": "~6.3.0",
     "motion-ui": "~1.2.2",
     "what-input": "~4.0.3",
     "magnific-popup": "^1.1.0",

diff --git a/source/package.json b/source/package.json
@@ -35,7 +35,7 @@
     "gulp-if": "^2.0.2",
     "gulp-load-plugins": "^1.4.0",
     "gulp-minify-css": "^1.2.4",
-    "gulp-sass": "^2.3.2",
+    "gulp-sass": "^3.0.0",
     "gulp-sourcemaps": "^2.2.0",
     "gulp-uglify": "^2.0.0",
     "js-yaml": "^3.6.1",