Skip to content

Commit

Permalink
Merge branch 'v2.0' of https://github.com/zurb/foundation-emails into…
Browse files Browse the repository at this point in the history
… v2.0
  • Loading branch information
RafiBomb committed Mar 21, 2016
2 parents 19a0926 + 0da7d1d commit 62714ec
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "foundation-emails",
"version": "2.0.0-rc.3",
"version": "2.0.0-rc.4",
"homepage": "http://foundation.zurb.com/emails",
"authors": [
"ZURB <foundation@zurb.com>"
Expand Down
2 changes: 1 addition & 1 deletion docs/layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h5>Foundation 6 is here!</h5>
<script src="https://cdn.jsdelivr.net/what-input/1.2.3/what-input.min.js"></script>
<script src="https://cdn.jsdelivr.net/foundation/6.0.5/foundation.min.js"></script>
<script src="https://cdn.jsdelivr.net/typeahead.js/0.11.1/typeahead.bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/zeroclipboard/2.2.0/ZeroClipboard.min.js"></script>
<script src="https://cdn.jsdelivr.net/clipboard.js/1.5.9/clipboard.min.js"></script>
<script src="assets/js/docs.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/partials/component-list.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ul class="vertical menu docs-nav" id="docs-menu">
<p class="docs-nav-version">
<span data-docs-version>v2.0.0-rc.3</span>
<span data-docs-version>v2.0.0-rc.4</span>
<a href="https://github.com/zurb/foundation-emails/releases/" target="_blank">(Changelog)</a>
</p>

Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ gulp.task('sass:foundation', function() {

// Compiles documentation JavaScript
gulp.task('javascript:docs', function() {
return gulp.src('docs/assets/js/**/*.js')
return gulp.src(['node_modules/foundation-docs/js/*.js', 'docs/assets/js/**/*.js'])
.pipe($.concat('docs.js'))
.pipe(gulp.dest('_build/assets/js'));
});
Expand Down
10 changes: 8 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "foundation-emails",
"version": "2.0.0-rc.3",
"version": "2.0.0-rc.4",
"description": "A framework for responsive emails made by ZURB",
"keywords": [
"responsive",
Expand All @@ -17,6 +17,7 @@
"devDependencies": {
"browser-sync": "^2.9.10",
"cheerio": "^0.19.0",
"clipboard-js": "^0.2.0",
"foundation-docs": "zurb/foundation-docs",
"foundation-sites": "^6.2.0",
"gulp": "^3.8.11",
Expand Down Expand Up @@ -47,5 +48,10 @@
"typeahead.js": "^0.11.1",
"zeroclipboard": "^2.2.0"
},
"license": "MIT"
"license": "MIT",
"eyeglass": {
"name": "foundation-emails",
"sassDir": "scss",
"needs": "^0.8.0"
}
}

0 comments on commit 62714ec

Please sign in to comment.