Skip to content

Commit

Permalink
fix: correct scss imports so we do not break consumer builds
Browse files Browse the repository at this point in the history
fix #329
  • Loading branch information
adrianschmidt committed Sep 10, 2019
1 parent 2d5df59 commit 4387292
Show file tree
Hide file tree
Showing 24 changed files with 45 additions and 15 deletions.
2 changes: 2 additions & 0 deletions src/components/badge/badge.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

/**
* @prop --background-color: The color to use for the badge behind the icon.
*/
Expand Down
2 changes: 2 additions & 0 deletions src/components/button-group/button-group.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

limel-button-group {
align-items: center;
display: flex;
Expand Down
1 change: 1 addition & 0 deletions src/components/button/button.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import '../../style/variables';
@import "@lime-material/button/mdc-button";

:host {
Expand Down
2 changes: 2 additions & 0 deletions src/components/chip-set/chip-set.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

$mdc-textarea-background: $mdc-theme-background;
// $mdc-textarea-disabled-background: $mdc-theme-background;

Expand Down
2 changes: 2 additions & 0 deletions src/components/collapsible-section/collapsible-section.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

:host {
display: block;
}
Expand Down
2 changes: 2 additions & 0 deletions src/components/date-picker/date-picker.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

@import '@lime-material/theme/mdc-theme';
@import '../../../node_modules/flatpickr/dist/flatpickr.min.css';

Expand Down
2 changes: 2 additions & 0 deletions src/components/dialog/dialog.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

$mdc-dialog-max-width: false;
$mdc-dialog-max-height: false;
@import "@lime-material/dialog/mdc-dialog";
Expand Down
2 changes: 2 additions & 0 deletions src/components/grid/grid.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

/**
* @prop --lime-grid-area: Grid layout
* @prop --lime-grid-columns: Number of columns in the grid, defaults to 8
Expand Down
2 changes: 2 additions & 0 deletions src/components/icon-button/icon-button.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

@import "@lime-material/icon-button/mdc-icon-button";

:host {
Expand Down
2 changes: 2 additions & 0 deletions src/components/icon/icon.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

:host {
background-color: rgba(0, 0, 0, 0);
display: inline-block;
Expand Down
2 changes: 2 additions & 0 deletions src/components/input-field/input-field.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

$mdc-textarea-background: $mdc-theme-background;
// $mdc-textarea-disabled-background: $mdc-theme-background;

Expand Down
2 changes: 2 additions & 0 deletions src/components/linear-progress/linear-progress.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

@import "@lime-material/linear-progress/mdc-linear-progress";

/**
Expand Down
2 changes: 2 additions & 0 deletions src/components/list/list.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

@import "@lime-material/list/mdc-list";

/**
Expand Down
2 changes: 2 additions & 0 deletions src/components/menu/menu.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

@import "@lime-material/list/mdc-list";
@import "@lime-material/menu/mdc-menu";
@import "@lime-material/menu-surface/mdc-menu-surface";
Expand Down
2 changes: 2 additions & 0 deletions src/components/multi-select/multi-select.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

@import '@lime-material/form-field/mdc-form-field';
@import '@lime-material/checkbox/mdc-checkbox';
@import "@lime-material/floating-label/mdc-floating-label";
Expand Down
2 changes: 2 additions & 0 deletions src/components/picker/picker.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

@import "@lime-material/elevation/mdc-elevation";
@import "@lime-material/menu-surface/mdc-menu-surface";

Expand Down
2 changes: 2 additions & 0 deletions src/components/select/select.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

$mdc-select-fill-color: $mdc-theme-background;
$mdc-select-bottom-line-idle-color: $lime-text-field-bottom-line-color;
$mdc-select-bottom-line-hover-color: $lime-text-field-bottom-line-color;
Expand Down
2 changes: 2 additions & 0 deletions src/components/slider/slider.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

@import '@lime-material/slider/mdc-slider';
@import "@lime-material/floating-label/mdc-floating-label";

Expand Down
2 changes: 2 additions & 0 deletions src/components/snackbar/snackbar.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

@import "@lime-material/button/mdc-button";
@import "@lime-material/snackbar/mdc-snackbar";

Expand Down
2 changes: 2 additions & 0 deletions src/components/spinner/spinner.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

:host {
animation-duration: 1s;
animation-iteration-count: infinite;
Expand Down
2 changes: 2 additions & 0 deletions src/components/switch/switch.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../style/variables';

@import "@lime-material/switch/mdc-switch";

.mdc-switch {
Expand Down
7 changes: 2 additions & 5 deletions stencil.config.dist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@ const targetDist: OutputTargetDist = {
};

export const config: Config = {
copy: [{ src: 'style/' }],
namespace: 'lime-elements',
outputTargets: [targetDist],
plugins: [
sass({
injectGlobalPaths: ['src/style/variables.scss'],
}),
],
plugins: [sass()],
excludeSrc: [
'**/test/**',
'**/examples/**',
Expand Down
6 changes: 1 addition & 5 deletions stencil.config.docs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ export const config: Config = {
hashFileNames: false,
namespace: 'lime-elements',
outputTargets: [targetWww],
plugins: [
sass({
injectGlobalPaths: ['src/style/variables.scss'],
}),
],
plugins: [sass()],
globalScript: 'src/global/index.ts',
globalStyle: 'src/global/colors.scss',
};
6 changes: 1 addition & 5 deletions stencil.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@ export const config: Config = {
],
namespace: 'lime-elements',
outputTargets: [targetWww],
plugins: [
sass({
injectGlobalPaths: ['src/style/variables.scss'],
}),
],
plugins: [sass()],
tsconfig: './tsconfig.dev.json',
globalScript: 'src/global/index.ts',
globalStyle: 'src/global/colors.scss',
Expand Down

0 comments on commit 4387292

Please sign in to comment.