Skip to content

Commit 7b88b01

Browse files
committed
fix: isolate colors
1 parent ce3e251 commit 7b88b01

10 files changed

Lines changed: 10 additions & 30 deletions

File tree

components/chips/_chips.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@use '../../sass/colors.module.css' as *;
2-
31
.chip {
42
--font-size: 14px;
53
--font-size-icon: 18px;
@@ -45,7 +43,7 @@
4543

4644
.chip > .material-icons {
4745
font-size: var(--font-size-icon);
48-
@extend .on-surface-variant-text;
46+
color: var(--md-sys-color-on-surface-variant);
4947
}
5048

5149
.chip .close {

components/collapsible/_collapsible.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@use '../../sass/variables' as *;
22
@use '../../sass/global' as *;
3-
// @use '../../sass/color-variables' as *;
43

54
.collapsible {
65
padding-left: 0;

components/progress-indicators/_preloader.scss

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
@use '../../sass/variables' as *;
2-
@use '../../sass/colors.module.css' as *;
32

43
.progress {
54
position: relative;
65
height: 4px;
76
display: block;
87
width: 100%;
9-
@extend .surface-variant;
8+
background-color: var(--md-sys-color-surface-variant);
109
border-radius: 4px;
1110
margin: $element-top-margin 0 $element-bottom-margin 0;
1211
overflow: hidden;
@@ -82,8 +81,6 @@
8281
}
8382
}
8483

85-
86-
8784
/*
8885
@license
8986
Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -112,7 +109,6 @@
112109
* SHRINK_TIME = 400ms
113110
*/
114111

115-
116112
.preloader-wrapper {
117113
display: inline-block;
118114
position: relative;

components/sliders/_range.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use '../../sass/global' as *;
2-
@use '../../sass/colors.module.css' as *;
32

43
.range-field {
54
position: relative;
@@ -64,7 +63,7 @@ input[type=range] + .thumb {
6463
// Shared
6564
@mixin range-track {
6665
height: 3px;
67-
@extend .surface-variant;
66+
background-color: var(--md-sys-color-surface-variant);
6867
border: none;
6968
}
7069

components/switch/_switches.scss

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@use '../../sass/colors.module.css' as *;
2-
31
.switch {
42
--track-height: 32px;
53
--track-width: 52px;
@@ -41,7 +39,7 @@
4139
height: var(--size-on);
4240
}
4341
&:after {
44-
@extend .surface;
42+
background-color: var(--md-sys-color-surface);
4543
}
4644
}
4745
}
@@ -82,10 +80,9 @@
8280

8381
// NOT CHECKED [DOT]
8482
&:after {
85-
@extend .outline;
83+
background-color: var(--md-sys-color-outline);
8684
height: var(--size-off);
8785
width: var(--size-off);
88-
8986
//@extend .surface-variant;
9087
//box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
9188
}

components/text-fields/_form-field.scss

Whitespace-only changes.

docs/FOR_MAINTAINERS.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ To fully release a new version, you need to have access to the @materializecss o
2020
- In your local copy of Materialize, go into the dev Branch with `git checkout v2-dev` and pull the newest version
2121
with `git pull origin v2-dev` to have the newest version from the server. Run Tests and check if everything works.
2222

23-
- Create a new Release branch with `git checkout -b release-2.X.X`.
24-
In case something happens or needs to be changed during the release it is better to keep the release on its own branch.
25-
2623
- Run `npm version <change-type>`
2724
Where `<change-type> = patch, minor, major`.
2825
[details](https://docs.npmjs.com/updating-your-published-package-version-number)
@@ -33,13 +30,9 @@ To fully release a new version, you need to have access to the @materializecss o
3330
* dist/js
3431
* dist/css
3532

36-
- (Add Commit with message "chore: release 2.X.X-alpha")
37-
38-
- Push to server. `git push --tags`. Remember to push the tags aswell.
39-
40-
- Create a Pull Request (PR) into dev (dev <-- release-branch)
33+
- Push to server. `git push `.
4134

42-
- Create a PR (main <-- dev)
35+
- Create a Pull Request from dev into main
4336

4437
- Merge the Pull Request if all checks pass and there were no concerns. (Set the draft release to public.)
4538

sass/_typography.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
@use "sass:math";
32
@use './variables' as *;
43

sass/_variables.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1+
@use "sass:math";
2+
13
// TypeScale
24
$md_sys_typescale_body-large_size: 16px;
35

4-
@use "sass:math";
5-
@use "./_colors";
6-
76
// Colors
87
$success-color: colorFunc("green", "base") !default;
98
$link-color: colorFunc("light-blue", "darken-1") !default;

sass/materialize.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@forward "./colors.module.css";
88
@forward "./typography";
99
@forward "./mixins.module";
10-
// @forward "./colors"; // => put in seperate file
1110
@forward "./variables";
1211
@forward "./global";
1312
@forward "./grid";
@@ -46,3 +45,4 @@
4645
@forward '../components/text-fields/input-fields';
4746
@forward '../components/text-fields/select';
4847
@forward '../components/text-fields/file-input';
48+
@forward '../components/text-fields/formfields.css';

0 commit comments

Comments
 (0)