Skip to content
Snippets Groups Projects
Commit 480469d4 authored by Eric Bremner's avatar Eric Bremner
Browse files

Merge branch 'feature/ISTWCMS-5740-ebremner-dashboards' into '1.0.x'

Feature/istwcms 5740 ebremner dashboards

See merge request !36
parents 6e23c4d7 279c2a2b
No related branches found
No related tags found
1 merge request!36Feature/istwcms 5740 ebremner dashboards
......@@ -77,9 +77,12 @@ echo "**************************************************************************
echo "Done running npm install."
echo "**************************************************************************************"
echo "Setting up es lint ..."
echo "Setting up es lint and gulp ..."
rm .eslintignore
ln -s ../.eslintignore .eslintignore
cp ../dashboard.js gulp-tasks
sed -i "3 i const { compileDashboard } = require('./gulp-tasks/dashboard');" gulpfile.js
sed -i "s/parallel(compileSass, compileJS)/parallel(compileSass, compileJS, compileDashboard)/g" gulpfile.js
echo "**************************************************************************************"
echo "Done setting up es lint."
......
'use strict';
// Include gulp
const { src, dest } = require('gulp');
// Include Our Plugins
const sass = require('gulp-sass')(require('sass'));
const prefix = require('gulp-autoprefixer');
const rename = require('gulp-rename');
const minify = require('gulp-minify');
const clean = require('gulp-clean-css');
/**
* Error handler function so we can see when errors happen.
* @param {object} err error that was thrown
* @returns {undefined}
*/
function handleError(err) {
// eslint-disable-next-line no-console
console.error(err.toString());
this.emit('end');
}
// Export our tasks.
module.exports = {
// Compile Sass.
compileDashboard: function () {
return src([
'./src/patterns/dashboard.scss'
])
.pipe(sass.sync({
includePaths: ['node_modules'],
outputStyle: 'expanded'
}).on('error', handleError))
.pipe(prefix({ cascade: false }))
.pipe(rename(function (path) { path.dirname = ''; return path;}))
.pipe(clean())
.pipe(rename('uw-dashboard.min.css'))
.pipe(dest('./dist/css'));
}
};
......@@ -5,6 +5,11 @@
.block {
margin-bottom: var(--grid-gap);
.path-dashboard &,
&.block-page-title-block,
&.block-local-tasks-block {
margin-bottom: 0;
}
}
// disable margin for layout builder blocks
......
// @file
// Admin Dashboards styles
@use '01-core/font-face' as *;
@use '01-core/props' as *;
@use '01-core/utilities' as *;
@use '03-layouts' as *;
@use '04-components/00-cms-styles/dashboards/dashboards' as *;
@use '04-components/form-view-search/form-view-search' as *;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment