Commit a7ff33c
authored
refactor: merge component token files (#30822)
* refactor: merge button tokens
* refactor: merge button toggle tokens
# Conflicts:
# src/material/button-toggle/button-toggle.scss
* refactor: merge card tokens
* refactor: combine pseudocheckbox tokens
* refactor: merge form field tokens
* refactor: merge tabs tokens
* refactor: rename shadow tokens and delete button token file
* refactor: fix lint
* refactor: make form field overrides a list
* refactor: remove ambiguous tokens test
* refactor: remove unused warning test function
* refactor: fix form field selectors
* refactor: update density
* refactor: fix tabs tokens1 parent b1cc050 commit a7ff33c
File tree
81 files changed
+2159
-4203
lines changed- src/material
- button-toggle
- button
- card
- core
- selection/pseudo-checkbox
- theming/tests
- tokens
- form-field
- slide-toggle
- snack-bar
- tabs
- toolbar
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
81 files changed
+2159
-4203
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | | - | |
| 27 | + | |
29 | 28 | | |
30 | 29 | | |
31 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | | - | |
| 7 | + | |
9 | 8 | | |
10 | 9 | | |
11 | 10 | | |
| |||
16 | 15 | | |
17 | 16 | | |
18 | 17 | | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
| 18 | + | |
| 19 | + | |
25 | 20 | | |
26 | 21 | | |
27 | 22 | | |
| |||
38 | 33 | | |
39 | 34 | | |
40 | 35 | | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
| 36 | + | |
| 37 | + | |
47 | 38 | | |
48 | 39 | | |
49 | 40 | | |
| |||
57 | 48 | | |
58 | 49 | | |
59 | 50 | | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
| 51 | + | |
| 52 | + | |
66 | 53 | | |
67 | 54 | | |
68 | 55 | | |
| |||
76 | 63 | | |
77 | 64 | | |
78 | 65 | | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
| 66 | + | |
| 67 | + | |
85 | 68 | | |
86 | 69 | | |
87 | 70 | | |
88 | 71 | | |
89 | 72 | | |
90 | 73 | | |
91 | 74 | | |
92 | | - | |
93 | | - | |
| 75 | + | |
94 | 76 | | |
95 | 77 | | |
96 | 78 | | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
| 79 | + | |
103 | 80 | | |
104 | 81 | | |
105 | 82 | | |
| |||
141 | 118 | | |
142 | 119 | | |
143 | 120 | | |
144 | | - | |
| 121 | + | |
145 | 122 | | |
146 | 123 | | |
147 | 124 | | |
148 | | - | |
| 125 | + | |
149 | 126 | | |
150 | 127 | | |
151 | 128 | | |
Lines changed: 32 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | | - | |
17 | 15 | | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
18 | 21 | | |
19 | 22 | | |
20 | 23 | | |
| |||
33 | 36 | | |
34 | 37 | | |
35 | 38 | | |
36 | | - | |
37 | 39 | | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | 40 | | |
47 | | - | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
48 | 45 | | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
49 | 64 | | |
50 | 65 | | |
51 | 66 | | |
| |||
57 | 72 | | |
58 | 73 | | |
59 | 74 | | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
60 | 80 | | |
61 | 81 | | |
62 | 82 | | |
| |||
This file was deleted.
0 commit comments