From 265a50cda5292cd3b46afce97c7dcbfa88f9b32d Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Sun, 16 Jul 2017 13:55:22 +0200 Subject: [PATCH] Replace zen grids with css grid. Move print styles print style file. Remove Drupal specific styles. --- gulpfile.js | 11 --- layouts/_default/baseof.html | 12 +-- layouts/_default/list.html | 2 +- layouts/_default/single.html | 2 +- layouts/index.html | 2 +- layouts/partials/menu.html | 4 +- layouts/partials/meta_cache.html | 1 + layouts/partials/sidebar.html | 2 +- package.json | 2 - sass/_custom.scss | 22 +++++ sass/_init.scss | 6 -- sass/_zen.scss | 44 +-------- sass/base/forms/_forms.scss | 5 - sass/base/links/_links.scss | 22 ----- sass/base/text/_text.scss | 7 -- sass/components/box/_box.scss | 41 +------- sass/components/hidden/_hidden.scss | 12 --- sass/components/hidden/hidden.twig | 3 - .../highlight-mark/_highlight-mark.scss | 9 -- .../inline-links/_inline-links.scss | 12 --- .../inline-sibling/_inline-sibling.scss | 22 ----- sass/components/print-none/_print-none.scss | 14 --- .../responsive-video/_responsive-video.scss | 9 -- .../visually-hidden/_visually-hidden.scss | 13 --- sass/components/wireframe/_wireframe.scss | 18 ++-- sass/init/_colors.scss | 15 ++- sass/init/_variables.scss | 68 +------------ sass/layouts/_layouts.scss | 95 +++++++++++++++++++ sass/navigation/breadcrumb/_breadcrumb.scss | 4 - sass/navigation/more-link/_more-link.scss | 14 +-- sass/navigation/nav-menu/_nav-menu.scss | 21 ---- sass/navigation/navbar/_navbar.scss | 18 ---- sass/navigation/pager/_pager.scss | 6 +- sass/navigation/skip-link/_skip-link.scss | 4 - sass/print.scss | 33 +++++++ sass/styles.scss | 21 +--- static/css/print.css | 1 + static/css/styles.css | 2 +- 38 files changed, 201 insertions(+), 398 deletions(-) delete mode 100644 sass/components/hidden/hidden.twig create mode 100644 sass/layouts/_layouts.scss create mode 100644 sass/print.scss create mode 100644 static/css/print.css diff --git a/gulpfile.js b/gulpfile.js index adbd8e2..485ded4 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -33,20 +33,11 @@ options.sass = { options.theme.sass, options.rootPath.project + 'node_modules/breakpoint-sass/stylesheets', options.rootPath.project + 'node_modules/chroma-sass/sass', - options.rootPath.project + 'node_modules/support-for/sass', options.rootPath.project + 'node_modules/typey/stylesheets' ], outputStyle: 'expanded' }; -// Define which browsers to add vendor prefixes for. -options.autoprefixer = { - browsers: [ - '> 1%', - 'ie 11' - ] -}; - // Define the paths to the JS files to lint. options.eslint = { files : [ @@ -93,7 +84,6 @@ gulp.task('styles', ['clean:css'], function() { return gulp.src(sassFiles) .pipe($.sourcemaps.init()) .pipe(sass(options.sass).on('error', sass.logError)) - .pipe($.autoprefixer(options.autoprefixer)) .pipe($.size({showFiles: true})) .pipe($.sourcemaps.write('./')) .pipe(gulp.dest(options.theme.css)) @@ -102,7 +92,6 @@ gulp.task('styles', ['clean:css'], function() { gulp.task('styles:production', ['clean:css'], function() { return gulp.src(sassFiles) .pipe(sass(options.sass).on('error', sass.logError)) - .pipe($.autoprefixer(options.autoprefixer)) .pipe($.size({showFiles: true})) .pipe(cleanCSS({compatibility: 'ie10'})) .pipe(gulp.dest(options.theme.css)); diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index d5eaad0..4634d0f 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -9,21 +9,19 @@ {{ if and .Site.Params.piwikTrackerUrl .Site.Params.piwikSiteID }}{{ partialCached "piwik.html" . }}{{ end -}} - -
-