Skip to content

update(): BroccoliSass should build all source files in relative to the sourceroot. #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}, []);
Expand Down
6 changes: 3 additions & 3 deletions src/components/button/_button-base.scss
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/components/card/card.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/components/checkbox/checkbox.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/components/input/input.scss
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/components/list/list.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/components/progress-bar/progress-bar.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/components/progress-circle/progress-circle.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/radio/radio.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "default-theme";
@import "../../core/style/default-theme";

$md-radio-width: 20px !default;

Expand Down
2 changes: 1 addition & 1 deletion src/components/sidenav/sidenav-transitions.scss
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions src/components/sidenav/sidenav.scss
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/components/toolbar/toolbar.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/demo-app/input/input-demo.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'default-theme';
@import 'variables';
@import '../../core/style/default-theme';
@import '../../core/style/variables';

.demo-basic {
padding: 0;
Expand Down