From b3be9f9581f04e4a4a908c945d60f91e07eec399 Mon Sep 17 00:00:00 2001 From: Martin Leblanc <m26lebla@uwaterloo.ca> Date: Tue, 13 Sep 2022 09:54:33 -0400 Subject: [PATCH] ISTWCMS-5740: created dashboard.scss to then call the files in needs, made adjustments to dashboard.js --- dashboard.js | 6 +----- src/patterns/03-layouts/block/_block.scss | 5 +++++ src/patterns/dashboard.scss | 8 ++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 src/patterns/dashboard.scss diff --git a/dashboard.js b/dashboard.js index 38f328a8..0084a327 100644 --- a/dashboard.js +++ b/dashboard.js @@ -27,11 +27,7 @@ module.exports = { // Compile Sass. compileDashboard: function () { return src([ - './src/patterns/global.scss', - './src/patterns/01-core/**/*.scss', - './src/patterns/03-layouts/layout/**/*.scss', - './src/patterns/04-components/00-cms-styles/dashboards/*.scss', - './src/patterns/04-components/form-view-search/*.scss' + './src/patterns/dashboard.scss' ]) .pipe(sass.sync({ includePaths: ['node_modules'], diff --git a/src/patterns/03-layouts/block/_block.scss b/src/patterns/03-layouts/block/_block.scss index 5f4fef40..41af0802 100644 --- a/src/patterns/03-layouts/block/_block.scss +++ b/src/patterns/03-layouts/block/_block.scss @@ -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 diff --git a/src/patterns/dashboard.scss b/src/patterns/dashboard.scss new file mode 100644 index 00000000..afbf7d3c --- /dev/null +++ b/src/patterns/dashboard.scss @@ -0,0 +1,8 @@ +// @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 *; -- GitLab