Skip to content

Commit 91a6df8

Browse files
committed
Merge branch 'release/6.0.1'
2 parents c188717 + 40afc78 commit 91a6df8

File tree

6 files changed

+2048
-667
lines changed

6 files changed

+2048
-667
lines changed

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ View partials in `application/views/partials` are rendered to `public` folder li
9696

9797
To limit performance issues, just first level sub-folders will be included in the parse process.
9898

99-
### *More docs to come...*
100-
10199
## Building
102100

103101
From project root:
@@ -152,4 +150,4 @@ When paired with Phing or other deployment systems, remember to set `buildOnly`
152150
WOK was created by [Marco Solazzi](https://github.com/dwightjack) with contributions from [Matteo Guidotto](https://github.com/mguidotto) and [Umberto Quintarelli](https://github.com/quincia).
153151

154152
Original work Copyright © 2014 Intesys S.r.l., released under the MIT license.
155-
Modified work Copyright © 2015-2017 Marco Solazzi, released under the MIT license.
153+
Modified work Copyright © 2015-2018 Marco Solazzi, released under the MIT license.

application/assets/javascripts/base/plugins.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
'markTimeline', 'profile', 'profileEnd', 'table', 'time', 'timeEnd',
1313
'timeStamp', 'trace', 'warn'
1414
];
15-
var length = methods.length;
15+
var length = methods.length; //eslint-disable-line prefer-destructuring
1616
var console = (window.console = window.console || {}); //eslint-disable-line no-multi-assign
1717
var method;
1818

application/assets/stylesheets/base/_mixins.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@
101101
@content;
102102
}
103103

104-
&:-moz-placeholder {
104+
&::-moz-placeholder {
105105
@content;
106106
}
107107

108-
&::-moz-placeholder {
108+
&:-moz-placeholder {
109109
@content;
110110
}
111111

application/assets/stylesheets/base/_utility.scss

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,6 @@
3232
text-align: center;
3333
}
3434

35-
//@see bootstrap
36-
.u-text--hide {
37-
border: 0;
38-
background-color: transparent;
39-
color: transparent;
40-
font: 0 / 0 a;
41-
font-size: 0.1px;
42-
text-shadow: none;
43-
}
44-
4535
.u-text--ellipsis {
4636
@include text-ellipsis;
4737
}

package.json

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "wok",
33
"description": "A Static Website Boilerplate",
4-
"version": "6.0.0",
4+
"version": "6.0.1",
55
"license": "MIT",
66
"repository": {
77
"type": "git",
@@ -30,72 +30,72 @@
3030
},
3131
"dependencies": {
3232
"html5shiv": "3.7.3",
33-
"normalize.css": "7.0.0",
34-
"sass-mq": "3.3.2"
33+
"normalize.css": "8.0.0",
34+
"sass-mq": "4.0.2"
3535
},
3636
"devDependencies": {
37-
"autoprefixer": "7.1.3",
37+
"autoprefixer": "8.1.0",
3838
"babel-core": "6.26.0",
39-
"babel-eslint": "7.2.3",
39+
"babel-eslint": "8.2.2",
4040
"babel-plugin-transform-runtime": "6.23.0",
41-
"babel-preset-env": "1.6.0",
41+
"babel-preset-env": "1.6.1",
4242
"babel-preset-stage-2": "6.24.1",
4343
"babel-runtime": "6.26.0",
44-
"browser-sync": "2.18.13",
44+
"browser-sync": "2.23.6",
4545
"customizr": "https://github.com/doctyper/customizr/tarball/develop",
46-
"datauri": "1.0.5",
46+
"datauri": "1.1.0",
4747
"del": "3.0.0",
48-
"eslint": "4.5.0",
49-
"eslint-config-airbnb-base": "11.3.2",
50-
"eslint-plugin-import": "2.7.0",
48+
"eslint": "4.18.2",
49+
"eslint-config-airbnb-base": "12.1.0",
50+
"eslint-plugin-import": "2.9.0",
5151
"ftps": "1.1.0",
5252
"glob": "7.1.2",
5353
"gulp": "3.9.1",
54-
"gulp-babel": "7.0.0",
55-
"gulp-bump": "2.7.0",
56-
"gulp-changed": "3.1.0",
57-
"gulp-clean-css": "3.7.0",
54+
"gulp-babel": "7.0.1",
55+
"gulp-bump": "3.1.0",
56+
"gulp-changed": "3.2.0",
57+
"gulp-clean-css": "3.9.2",
5858
"gulp-concat": "2.6.1",
59-
"gulp-eslint": "4.0.0",
60-
"gulp-filter": "5.0.1",
61-
"gulp-header": "1.8.9",
59+
"gulp-eslint": "^4.0.2",
60+
"gulp-filter": "5.1.0",
61+
"gulp-header": "2.0.1",
6262
"gulp-if": "2.0.2",
63-
"gulp-imagemin": "3.3.0",
63+
"gulp-imagemin": "4.1.0",
6464
"gulp-load-plugins": "1.5.0",
65-
"gulp-notify": "3.0.0",
66-
"gulp-plumber": "1.1.0",
67-
"gulp-postcss": "7.0.0",
65+
"gulp-notify": "3.2.0",
66+
"gulp-plumber": "1.2.0",
67+
"gulp-postcss": "7.0.1",
6868
"gulp-rename": "1.2.2",
69-
"gulp-rev": "8.0.0",
70-
"gulp-rev-replace": "0.4.3",
69+
"gulp-rev": "8.1.1",
70+
"gulp-rev-replace": "0.4.4",
7171
"gulp-sass": "3.1.0",
72-
"gulp-size": "2.1.0",
73-
"gulp-sourcemaps": "2.6.1",
74-
"gulp-stylelint": "4.0.0",
72+
"gulp-size": "3.0.0",
73+
"gulp-sourcemaps": "2.6.4",
74+
"gulp-stylelint": "7.0.0",
7575
"gulp-uglify": "3.0.0",
76-
"gulp-useref": "3.1.2",
76+
"gulp-useref": "3.1.4",
7777
"gulp-util": "3.0.8",
7878
"hasbin": "1.2.3",
79-
"image-size": "0.6.1",
80-
"inquirer": "3.2.2",
79+
"image-size": "0.6.2",
80+
"inquirer": "5.1.0",
8181
"lazypipe": "1.0.1",
82-
"lodash": "4.17.4",
82+
"lodash": "4.17.5",
8383
"lorem-ipsum": "1.0.4",
84-
"marked": "0.3.6",
84+
"marked": "0.3.17",
8585
"mkdirp": "0.5.1",
86-
"modernizr": "3.5.0",
86+
"modernizr": "3.6.0",
8787
"node-sass": "4.5.3",
88-
"nunjucks": "3.0.1",
88+
"nunjucks": "3.1.2",
8989
"nunjucks-markdown": "2.0.1",
9090
"rsyncwrapper": "2.0.1",
91-
"run-sequence": "2.1.0",
92-
"semver": "5.4.1",
91+
"run-sequence": "2.2.1",
92+
"semver": "5.5.0",
9393
"ssh2": "0.5.5",
94-
"stylelint": "8.0.0",
95-
"stylelint-config-standard": "17.0.0",
96-
"stylelint-order": "0.6.0",
97-
"stylelint-scss": "2.1.0",
94+
"stylelint": "9.1.1",
95+
"stylelint-config-standard": "18.2.0",
96+
"stylelint-order": "0.8.1",
97+
"stylelint-scss": "2.5.0",
9898
"through2": "2.0.3",
99-
"yargs": "8.0.2"
99+
"yargs": "11.0.0"
100100
}
101101
}

0 commit comments

Comments
 (0)