Skip to content

Commit 5ccdf53

Browse files
committed
fix: use mdc-web's sass imports and include sass from dev packages
1 parent 429a141 commit 5ccdf53

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+82
-98
lines changed

packages/banner/_style.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '@material/banner/styles';
1+
@use '@material/banner/styles' as banner-styles;
22

33
.smui-banner--force-show {
44
display: block !important;

packages/banner/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/button/_style.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '@material/button/styles';
1+
@use '@material/button/mdc-button';
22
@use '@smui/ripple/style';
33
@use './mixins';
44

packages/button/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/card/_style.scss

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
@use '@material/card/index' as card;
1+
@use '@material/card/mdc-card';
22
@use '@smui/button/style' as button-style;
33
@use '@smui/icon-button/style' as icon-button-style;
44
@use '@smui/ripple/style' as ripple-style;
55

6-
@include card.core-styles;
7-
86
.smui-card--padded,
97
.smui-card__content,
108
.smui-card__primary-action--padded {

packages/card/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/checkbox/_style.scss

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
@use '@material/checkbox/index' as checkbox;
1+
@use '@material/checkbox/mdc-checkbox';
22
@use '@smui/ripple/style';
3-
4-
@include checkbox.core-styles;

packages/checkbox/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/chips/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/circular-progress/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/data-table/_style.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
@use '@material/data-table/data-table';
1+
// Select's styles must be emitted before datatable's due to equal specificity.
2+
// See: https://github.com/material-components/material-components-web/blob/v13.0.0/packages/material-components-web/material-components-web.scss
3+
@use '@smui/select/style' as select-style;
4+
@use '@material/data-table/mdc-data-table';
25
@use '@smui/checkbox/style' as checkbox-style;
36
@use '@smui/icon-button/style' as icon-button-style;
47

5-
@include data-table.core-styles;
6-
@include data-table.theme-baseline;
7-
88
// Unset overflow on sticker header tables, because it interferes.
99
.mdc-data-table--sticky-header > .mdc-data-table__table-container {
1010
overflow-x: unset;

packages/data-table/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"
@@ -41,6 +41,7 @@
4141
"@smui/common": "^5.0.0",
4242
"@smui/icon-button": "^5.0.0",
4343
"@smui/ripple": "^5.0.0",
44+
"@smui/select": "^5.0.0",
4445
"svelte2tsx": "^0.4.8"
4546
},
4647
"devDependencies": {

packages/dialog/_style.scss

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
@use '@material/dialog/index' as dialog;
2-
3-
@include dialog.core-styles;
1+
@use '@material/dialog/mdc-dialog';
42

53
.mdc-dialog.smui-dialog--selection .mdc-dialog__content {
64
padding: 0;

packages/dialog/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/drawer/_style.scss

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
@use '@material/drawer/index' as drawer;
2-
3-
@include drawer.core-styles;
4-
@include drawer.dismissible-core-styles;
5-
@include drawer.modal-core-styles;
1+
@use '@material/drawer/mdc-drawer';
62

73
.mdc-drawer.smui-drawer__absolute,
84
.mdc-drawer-scrim.smui-drawer-scrim__absolute {

packages/drawer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/fab/_style.scss

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
@use '@material/fab/index' as fab;
2-
@use '@smui/ripple/style';
1+
@use '@material/fab/mdc-fab';
2+
@use '@smui/ripple/style' as ripple-style;
33
@use './mixins';
44

5-
@include fab.core-styles;
65
@include mixins.core-styles;

packages/fab/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/floating-label/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/form-field/_style.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@use '@material/form-field/index' as form-field;
1+
@use '@material/form-field/mdc-form-field';
22
@use './mixins';
33

4-
@include form-field.core-styles;
54
@include mixins.core-styles;

packages/form-field/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/icon-button/_style.scss

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
@use '@material/icon-button/icon-button';
2-
@use '@smui/ripple/style';
3-
4-
@include icon-button.core-styles;
1+
@use '@material/icon-button/mdc-icon-button';
2+
@use '@smui/ripple/style' as ripple-style;
53

64
// Prevent pointer giving focus inside.
75
.mdc-icon-button svg {

packages/icon-button/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/image-list/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/layout-grid/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/line-ripple/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/linear-progress/_style.scss

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
@use '@material/linear-progress/index' as linear-progress;
2-
3-
@include linear-progress.core-styles;
1+
@use '@material/linear-progress/mdc-linear-progress';

packages/linear-progress/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/list/_style.scss

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
@use '@material/list/index' as list;
2-
@use '@smui/ripple/style';
1+
@use '@material/list/mdc-list';
2+
@use '@smui/ripple/style' as ripple-style;
33
@use './mixins';
44

5-
@include list.deprecated-core-styles;
65
@include mixins.core-styles;

packages/list/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/menu-surface/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/menu/_style.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use '@material/menu/mdc-menu';
2-
@use '@smui/menu-surface/style';
2+
@use '@smui/menu-surface/style' as menu-surface-style;
33

44
// Increase specificity.
55
.mdc-menu__selection-group

packages/menu/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/notched-outline/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/paper/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/radio/_style.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@use '@material/radio/styles';
2-
@use '@smui/ripple/style';
1+
@use '@material/radio/mdc-radio';
2+
@use '@smui/ripple/style' as ripple-style;

packages/radio/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/ripple/_style.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '@material/ripple/styles';
1+
@use '@material/ripple/mdc-ripple';
22
@use './mixins';
33

44
@include mixins.core-styles;

packages/ripple/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/segmented-button/_style.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@use '@material/segmented-button/styles';
2-
@use '@smui/ripple/style';
1+
@use '@material/segmented-button/styles' as segmented-button-styles;
2+
@use '@smui/ripple/style' as ripple-style;

packages/segmented-button/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

packages/select/_style.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '@material/select/styles';
1+
@use '@material/select/mdc-select';
22
@use '@smui/floating-label/style' as floating-label-style;
33
@use '@smui/line-ripple/style' as line-ripple-style;
44
@use '@smui/notched-outline/style' as notched-outline-style;

packages/select/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"scripts": {
1818
"build": "npm run build:js && npm run build:sass",
1919
"build:js": "tsc",
20-
"build:sass": "sass --no-source-map -I node_modules -I ../../node_modules _style.scss bare.css && sass --no-source-map -I node_modules -I ../../node_modules helper-text/_style.scss helper-text/bare.css && sass --no-source-map -I node_modules -I ../../node_modules icon/_style.scss icon/bare.css",
20+
"build:sass": "sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules _style.scss bare.css && sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules helper-text/_style.scss helper-text/bare.css && sass --no-source-map -I node_modules -I ../smui-theme/node_modules -I ../../node_modules icon/_style.scss icon/bare.css",
2121
"clean": "git status --ignored -u --porcelain . | grep -v node_modules/ | grep -e '^!! ' | sed 's/^!! packages\\/[a-z-]*\\///g' | tr '\\n' ' ' | xargs rm",
2222
"prepare": "npm run build",
2323
"test": "echo \"Error: no test specified\" && exit 1"

0 commit comments

Comments
 (0)