From 54a9a4a851c6ad438eb3a7933db3b6453836d6f7 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Sat, 9 Apr 2016 21:29:59 +0200 Subject: [PATCH] update(): BroccoliSass should build all source files in relative to the root * This allows us to import several styles from other components easily. For example needed, when a component is extending from another. * Fixes SCSS validation issues in IDEA's, since the stylesheets are now imported correctly. --- ember-cli-build.js | 4 ++-- src/components/button/_button-base.scss | 6 +++--- src/components/card/card.scss | 6 +++--- src/components/checkbox/checkbox.scss | 6 +++--- src/components/input/input.scss | 6 +++--- src/components/list/list.scss | 4 ++-- src/components/progress-bar/progress-bar.scss | 4 ++-- src/components/progress-circle/progress-circle.scss | 4 ++-- src/components/radio/radio.scss | 2 +- src/components/sidenav/sidenav-transitions.scss | 2 +- src/components/sidenav/sidenav.scss | 8 ++++---- src/components/toolbar/toolbar.scss | 6 +++--- src/demo-app/input/input-demo.scss | 4 ++-- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/ember-cli-build.js b/ember-cli-build.js index 00880a808b1e..13847343b9a6 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -46,8 +46,8 @@ function getCssTree(folder) { return scssFiles.map(fileName => { return BroccoliSass( - [`${srcPath}/${component}`, 'src/core/style'], // Directories w/ scss sources - `./${fileName}.scss`, // Root scss input file + ['src'], // Directories w/ scss sources + `${folder}/${component}/${fileName}.scss`, // Root scss input file `${folder}/${component}/${fileName}.css`); // Css output file }).concat(trees); }, []); diff --git a/src/components/button/_button-base.scss b/src/components/button/_button-base.scss index d15636afb44a..4feecfea5f7d 100644 --- a/src/components/button/_button-base.scss +++ b/src/components/button/_button-base.scss @@ -1,9 +1,9 @@ -@import "variables"; -@import "elevation"; +@import "../../core/style/variables"; +@import "../../core/style/elevation"; // TODO(jelbourn): This goes away. -@import "default-theme"; +@import "../../core/style/default-theme"; @import "button-theme"; // Flat and raised button standards diff --git a/src/components/card/card.scss b/src/components/card/card.scss index f99a69d1fe31..ed93786901d9 100644 --- a/src/components/card/card.scss +++ b/src/components/card/card.scss @@ -1,7 +1,7 @@ -@import "variables"; -@import "elevation"; -@import "default-theme"; // TODO: Remove this +@import "../../core/style/variables"; +@import "../../core/style/elevation"; +@import "../../core/style/default-theme"; // TODO: Remove this $md-card-default-padding: 24px !default; $md-card-mobile-padding: 24px 16px !default; diff --git a/src/components/checkbox/checkbox.scss b/src/components/checkbox/checkbox.scss index bead2ca8f351..6c1954c49c17 100644 --- a/src/components/checkbox/checkbox.scss +++ b/src/components/checkbox/checkbox.scss @@ -1,6 +1,6 @@ -@import "default-theme"; -@import "theme-functions"; -@import "variables"; +@import "../../core/style/default-theme"; +@import "../../core/style/theme-functions"; +@import "../../core/style/variables"; /** The width/height of the checkbox element. */ $md-checkbox-size: 18px !default; diff --git a/src/components/input/input.scss b/src/components/input/input.scss index 10a6453d936b..954b55a9d84f 100644 --- a/src/components/input/input.scss +++ b/src/components/input/input.scss @@ -1,6 +1,6 @@ -@import 'default-theme'; -@import 'mixins'; -@import 'variables'; +@import '../../core/style/default-theme'; +@import '../../core/style/mixins'; +@import '../../core/style/variables'; // Placeholder colors. Required is used for the `*` star shown in the placeholder. diff --git a/src/components/list/list.scss b/src/components/list/list.scss index 89b472c9ea65..9913ef2927ab 100644 --- a/src/components/list/list.scss +++ b/src/components/list/list.scss @@ -1,5 +1,5 @@ -@import "variables"; -@import "default-theme"; +@import "../../core/style/variables"; +@import "../../core/style/default-theme"; $md-list-side-padding: 16px; $md-list-avatar-size: 40px; diff --git a/src/components/progress-bar/progress-bar.scss b/src/components/progress-bar/progress-bar.scss index b3388f8d2a02..49c378c6eea5 100644 --- a/src/components/progress-bar/progress-bar.scss +++ b/src/components/progress-bar/progress-bar.scss @@ -1,5 +1,5 @@ -@import "variables"; -@import "default-theme"; +@import "../../core/style/variables"; +@import "../../core/style/default-theme"; $md-progress-bar-height: 5px !default; $md-progress-bar-full-animation-duration: 2s !default; diff --git a/src/components/progress-circle/progress-circle.scss b/src/components/progress-circle/progress-circle.scss index ee62778911a9..7b45bcba60c4 100644 --- a/src/components/progress-circle/progress-circle.scss +++ b/src/components/progress-circle/progress-circle.scss @@ -1,6 +1,6 @@ -@import "variables"; +@import "../../core/style/variables"; -@import "default-theme"; +@import "../../core/style/default-theme"; /* Animation Durations */ $md-progress-circle-duration : 5.25s !default; diff --git a/src/components/radio/radio.scss b/src/components/radio/radio.scss index 22913dcae1de..400a4eb043d4 100644 --- a/src/components/radio/radio.scss +++ b/src/components/radio/radio.scss @@ -1,4 +1,4 @@ -@import "default-theme"; +@import "../../core/style/default-theme"; $md-radio-width: 20px !default; diff --git a/src/components/sidenav/sidenav-transitions.scss b/src/components/sidenav/sidenav-transitions.scss index 691171a57026..1e568ca46840 100644 --- a/src/components/sidenav/sidenav-transitions.scss +++ b/src/components/sidenav/sidenav-transitions.scss @@ -1,7 +1,7 @@ /** * We separate transitions to be able to disable them in unit tests, by simply not loading this file. */ -@import "variables"; +@import "../../core/style/variables"; :host { diff --git a/src/components/sidenav/sidenav.scss b/src/components/sidenav/sidenav.scss index 42843ae2f3a5..f307fc1e7b8b 100644 --- a/src/components/sidenav/sidenav.scss +++ b/src/components/sidenav/sidenav.scss @@ -1,7 +1,7 @@ -@import "default-theme"; -@import "mixins"; -@import "variables"; -@import "elevation"; +@import "../../core/style/default-theme"; +@import "../../core/style/mixins"; +@import "../../core/style/variables"; +@import "../../core/style/elevation"; // We use invert() here to have the darken the background color expected to be used. If the diff --git a/src/components/toolbar/toolbar.scss b/src/components/toolbar/toolbar.scss index 23f83d2650df..f2bb01d1fb49 100644 --- a/src/components/toolbar/toolbar.scss +++ b/src/components/toolbar/toolbar.scss @@ -1,6 +1,6 @@ -@import "variables"; -@import "mixins"; -@import "default-theme"; //TODO: remove that soon. +@import "../../core/style/variables"; +@import "../../core/style/mixins"; +@import "../../core/style/default-theme"; //TODO: remove that soon. $md-toolbar-min-height: 64px !default; $md-toolbar-font-size: 20px !default; diff --git a/src/demo-app/input/input-demo.scss b/src/demo-app/input/input-demo.scss index e28f5c1c93f1..6a0eddc933b3 100644 --- a/src/demo-app/input/input-demo.scss +++ b/src/demo-app/input/input-demo.scss @@ -1,5 +1,5 @@ -@import 'default-theme'; -@import 'variables'; +@import '../../core/style/default-theme'; +@import '../../core/style/variables'; .demo-basic { padding: 0;