summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnAlbin2016-05-01 09:42:24 +0800
committerJohnAlbin2016-05-01 09:42:24 +0800
commit281c4d9bbb985c912957343642405221c746adb0 (patch)
treebe2d080f1dd2eaec6e33bed9ec83dadf784c54b2
parente08cf3c81a9c826de48b51112a7b8ae658477a33 (diff)
Build files.7.x-6.0-rc3
-rw-r--r--STARTERKIT/css/styles.css8
-rw-r--r--zen-internals/css/styles.css14
-rw-r--r--zen-internals/gulpfile.js23
-rw-r--r--zen-internals/package.json13
4 files changed, 37 insertions, 21 deletions
diff --git a/STARTERKIT/css/styles.css b/STARTERKIT/css/styles.css
index 7782a44..dd09c9d 100644
--- a/STARTERKIT/css/styles.css
+++ b/STARTERKIT/css/styles.css
@@ -1704,6 +1704,14 @@ tr.drag-previous {
text-shadow: none;
}
+.tabs--off,
+.views-displays .secondary {
+ margin: 0;
+ border-bottom: 0;
+ padding: 0;
+ background-image: none;
+}
+
.tabs--secondary {
margin-top: 1.5rem;
font-size: 0.875rem;
diff --git a/zen-internals/css/styles.css b/zen-internals/css/styles.css
index 495f024..93146ad 100644
--- a/zen-internals/css/styles.css
+++ b/zen-internals/css/styles.css
@@ -1699,12 +1699,19 @@ tr.drag-previous {
background: #eaeaea;
}
-.tabs__tab-link.is-active, .tabs__tab-link--is-active,
-.tabs__tab-link:active {
+.tabs__tab-link:active, .tabs__tab-link.is-active, .tabs__tab-link--is-active {
background: #fff;
text-shadow: none;
}
+.tabs--off,
+.views-displays .secondary {
+ margin: 0;
+ border-bottom: 0;
+ padding: 0;
+ background-image: none;
+}
+
.tabs--secondary {
margin-top: 1.5rem;
font-size: 0.875rem;
@@ -1745,8 +1752,7 @@ tr.drag-previous {
border-color: #999999;
}
-.tabs--secondary .tabs__tab-link.is-active, .tabs--secondary .tabs__tab-link--is-active,
-.tabs--secondary .tabs__tab-link:active {
+.tabs--secondary .tabs__tab-link:active, .tabs--secondary .tabs__tab-link.is-active, .tabs--secondary .tabs__tab-link--is-active {
color: white;
text-shadow: #333333 0 1px 0;
background: #666666;
diff --git a/zen-internals/gulpfile.js b/zen-internals/gulpfile.js
index a81ae27..a5f14ad 100644
--- a/zen-internals/gulpfile.js
+++ b/zen-internals/gulpfile.js
@@ -1,6 +1,6 @@
// This script is used by the MAINTAINERS to generate the CSS files from the
-// STARTERKIT's Sass files. It's a copy of STARTERKIT/gulpfile.s with the
-// "default" task overridden and the STARTERKIT path added to includePaths.
+// STARTERKIT's Sass files. It's a copy of STARTERKIT/gulpfile.s with a
+// few lines added to the very bottom.
'use strict';
@@ -21,7 +21,6 @@ var options = {};
options.rootPath = {
project : __dirname + '/',
styleGuide : __dirname + '/styleguide/',
- starterkit : path.resolve('../STARTERKIT') + '/',
theme : __dirname + '/'
};
@@ -39,7 +38,6 @@ options.drupalURL = 'http://localhost';
options.sass = {
importer: importOnce,
includePaths: [
- options.rootPath.starterkit + 'sass',
options.theme.sass,
options.rootPath.project + 'node_modules/breakpoint-sass/stylesheets',
options.rootPath.project + 'node_modules/chroma-sass/sass',
@@ -63,7 +61,7 @@ options.sassFiles = [
options.autoprefixer = {
browsers: [
'> 1%',
- 'ie 8'
+ 'ie 9'
]
};
@@ -129,7 +127,7 @@ var gulp = require('gulp'),
kss = require('kss');
// The default task.
-gulp.task('default', ['styles:production']);
+gulp.task('default', ['build']);
// #################
// Build everything.
@@ -161,8 +159,8 @@ gulp.task('styles:production', ['clean:css'], function() {
// ##################
// Build style guide.
// ##################
-gulp.task('styleguide', ['clean:styleguide', 'styleguide:chroma-kss-markup'], function(cb) {
- kss(options.styleGuide, cb);
+gulp.task('styleguide', ['clean:styleguide', 'styleguide:chroma-kss-markup'], function() {
+ return kss(options.styleGuide);
});
gulp.task('styleguide:chroma-kss-markup', function() {
@@ -175,9 +173,9 @@ gulp.task('styleguide:chroma-kss-markup', function() {
});
// Debug the generation of the style guide with the --verbose flag.
-gulp.task('styleguide:debug', ['clean:styleguide', 'styleguide:chroma-kss-markup'], function(cb) {
+gulp.task('styleguide:debug', ['clean:styleguide', 'styleguide:chroma-kss-markup'], function() {
options.styleGuide.verbose = true;
- kss(options.styleGuide, cb);
+ return kss(options.styleGuide);
});
// #########################
@@ -274,3 +272,8 @@ gulp.task('clean:css', function() {
// - https://github.com/google/web-starter-kit/blob/master/gulpfile.babel.js
// - https://github.com/dlmanning/gulp-sass/blob/master/README.md
// - http://www.browsersync.io/docs/gulp/
+
+
+// Overrides for the Zen base theme version of this file.
+options.sass.includePaths.unshift(path.resolve('../STARTERKIT') + '/sass');
+gulp.task('default', ['styles:production']);
diff --git a/zen-internals/package.json b/zen-internals/package.json
index bcc40be..e1915af 100644
--- a/zen-internals/package.json
+++ b/zen-internals/package.json
@@ -7,9 +7,9 @@
"devDependencies": {
"breakpoint-sass": "^2.7.0",
"browser-sync": "^2.12.3",
- "chroma-sass": "^1.2.3",
+ "chroma-sass": "^1.2.4",
"del": "^2.2.0",
- "eslint": "^2.8.0",
+ "eslint": "^2.9.0",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.0",
"gulp-eslint": "^2.0.0",
@@ -17,16 +17,15 @@
"gulp-load-plugins": "^1.2.2",
"gulp-rename": "^1.2.2",
"gulp-replace": "^0.5.4",
- "gulp-sass": "2.2.0",
+ "gulp-sass": "2.3.1",
"gulp-scss-lint": "^0.3.9",
"gulp-size": "^2.1.0",
"gulp-sourcemaps": "^1.6.0",
- "kss": "^3.0.0-beta.2",
- "node-sass": "3.4.2",
+ "kss": "^3.0.0-beta.3",
"node-sass-import-once": "^1.2.0",
- "support-for": "^1.0.5",
+ "support-for": "^1.0.6",
"typey": "^1.0.0",
- "zen-grids": "^2.0.1"
+ "zen-grids": "^2.0.2"
},
"engines": {
"node": ">=4.0.0"