summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnAlbin2016-04-21 21:43:30 (GMT)
committerJohnAlbin2016-04-21 21:43:30 (GMT)
commit184e25e7e84d50b9e68304ed46ee0d6f6e23d137 (patch)
tree12adf00c07bec8e53aecd3ef368c86bfbc37ed70
parent468475c89a4315d5e2e6318e389afc466478cfca (diff)
Generate files.7.x-6.0-beta2
-rw-r--r--STARTERKIT/css/styles.css2
-rw-r--r--STARTERKIT/styleguide/index.html2
-rw-r--r--zen-internals/css/styles.css2
-rw-r--r--zen-internals/gulpfile.js14
-rw-r--r--zen-internals/package.json25
5 files changed, 32 insertions, 13 deletions
diff --git a/STARTERKIT/css/styles.css b/STARTERKIT/css/styles.css
index 36b1383..fcf37c8 100644
--- a/STARTERKIT/css/styles.css
+++ b/STARTERKIT/css/styles.css
@@ -1627,6 +1627,7 @@ tr.drag-previous {
margin-left: -1em;
overflow: hidden;
text-decoration: none;
+ font-size: 12px;
}
[dir="rtl"] .table-drag__handle,
@@ -1644,6 +1645,7 @@ tr.drag-previous {
.table-drag__handle-icon,
.tabledrag-handle .handle {
+ box-sizing: content-box;
background: url(../sass/components/table-drag/handle-icon.png) no-repeat 6px 9px;
height: 13px;
margin: -.4em .5em;
diff --git a/STARTERKIT/styleguide/index.html b/STARTERKIT/styleguide/index.html
index 80d13a9..7f8f384 100644
--- a/STARTERKIT/styleguide/index.html
+++ b/STARTERKIT/styleguide/index.html
@@ -80,7 +80,7 @@
</ul>
<p>While our styles are organized as above in the style guide, our Sass files are organized in a file hierarchy like this:</p>
<ul>
-<li><code>sass/init</code>: The Sass used to initalize everything we need: variables, 3rd-party libraries, custom mixins and custom functions.</li>
+<li><code>sass/init</code>: The Sass used to initialize everything we need: variables, 3rd-party libraries, custom mixins and custom functions.</li>
<li><code>sass/base</code>: default HTML styles</li>
<li><code>sass/components</code>: component-based styles</li>
<li><code>sass/layouts</code>: component styles that only apply layout to major chunks of the page</li>
diff --git a/zen-internals/css/styles.css b/zen-internals/css/styles.css
index 38ec982..b9b08e7 100644
--- a/zen-internals/css/styles.css
+++ b/zen-internals/css/styles.css
@@ -1627,6 +1627,7 @@ tr.drag-previous {
margin-left: -1em;
overflow: hidden;
text-decoration: none;
+ font-size: 12px;
}
[dir="rtl"] .table-drag__handle,
@@ -1644,6 +1645,7 @@ tr.drag-previous {
.table-drag__handle-icon,
.tabledrag-handle .handle {
+ box-sizing: content-box;
background: url(../../STARTERKIT/sass/components/table-drag/handle-icon.png) no-repeat 6px 9px;
height: 13px;
margin: -.4em .5em;
diff --git a/zen-internals/gulpfile.js b/zen-internals/gulpfile.js
index d9c7d37..0047fba 100644
--- a/zen-internals/gulpfile.js
+++ b/zen-internals/gulpfile.js
@@ -107,6 +107,14 @@ options.eslint = {
options.gulpWatchOptions = {};
// options.gulpWatchOptions = {interval: 1000, mode: 'poll'};
+// If you wish to disable the following tasks, you can set these variables to
+// true (which is simpler than re-writing the Gulp tasks to remove them.)
+options.disableTask = {
+ lintSass: false,
+ browserSync: false
+};
+
+
// ################################
// Load Gulp and tools we will use.
// ################################
@@ -192,6 +200,9 @@ gulp.task('lint:js-with-fail', function() {
// Lint Sass.
gulp.task('lint:sass', function() {
+ if (options.disableTask.lintSass) {
+ return Promise.resolve();
+ }
return gulp.src(options.theme.sass + '**/*.scss')
.pipe($.scssLint({'bundleExec': true, 'config': options.scssLint.yml}));
});
@@ -209,6 +220,9 @@ gulp.task('lint:sass-with-fail', function() {
gulp.task('watch', ['browser-sync', 'watch:lint-and-styleguide', 'watch:js']);
gulp.task('browser-sync', ['watch:css'], function() {
+ if (options.disableTask.browserSync) {
+ return Promise.resolve();
+ }
return browserSync.init({
proxy: options.drupalURL,
noOpen: false
diff --git a/zen-internals/package.json b/zen-internals/package.json
index 7a5f53b..de2603c 100644
--- a/zen-internals/package.json
+++ b/zen-internals/package.json
@@ -5,25 +5,26 @@
"version": "1.0.0",
"repository": {},
"devDependencies": {
- "breakpoint-sass": "^2.6.1",
- "browser-sync": "^2.10.1",
- "chroma-sass": "^1.2.1",
+ "breakpoint-sass": "^2.7.0",
+ "browser-sync": "^2.12.3",
+ "chroma-sass": "^1.2.3",
"del": "^2.2.0",
- "eslint": "^1.10.3",
- "gulp": "^3.9.0",
+ "eslint": "^2.8.0",
+ "gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.0",
- "gulp-eslint": "^1.1.1",
+ "gulp-eslint": "^2.0.0",
"gulp-if": "^2.0.0",
- "gulp-load-plugins": "^1.1.0",
+ "gulp-load-plugins": "^1.2.2",
"gulp-rename": "^1.2.2",
"gulp-replace": "^0.5.4",
- "gulp-sass": "^2.1.1",
- "gulp-scss-lint": "^0.3.8",
- "gulp-size": "^2.0.0",
+ "gulp-sass": "2.2.0",
+ "gulp-scss-lint": "^0.3.9",
+ "gulp-size": "^2.1.0",
"gulp-sourcemaps": "^1.6.0",
- "kss": "^2.3.1",
+ "kss": "^2.4.0",
+ "node-sass": "3.4.2",
"node-sass-import-once": "^1.2.0",
- "support-for": "^1.0.3",
+ "support-for": "^1.0.5",
"typey": "^1.0.0",
"zen-grids": "^2.0.1"
},