Skip to content

Commit 605e2c9

Browse files
andrewseguinAndrew Seguin
andrewseguin
and
Andrew Seguin
authored
fix(material/core): rename utility-classes to system-classes (#31745)
* fix(material/core): rename utility-classes to system-classes * fix(material/core): update more prefixes --------- Co-authored-by: Andrew Seguin <andrewseguin@google.com>
1 parent 6a7583a commit 605e2c9

File tree

12 files changed

+70
-72
lines changed

12 files changed

+70
-72
lines changed

‎src/dev-app/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ ng_project(
8585
"//src/dev-app/snack-bar",
8686
"//src/dev-app/stepper",
8787
"//src/dev-app/system",
88+
"//src/dev-app/system-classes-demo",
8889
"//src/dev-app/table",
8990
"//src/dev-app/table-scroll-container",
9091
"//src/dev-app/tabs",
@@ -94,7 +95,6 @@ ng_project(
9495
"//src/dev-app/tooltip",
9596
"//src/dev-app/tree",
9697
"//src/dev-app/typography",
97-
"//src/dev-app/utility-classes-demo",
9898
"//src/dev-app/virtual-scroll",
9999
"//src/dev-app/youtube-player",
100100
"//src/material/core",

‎src/dev-app/dev-app/dev-app-layout.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ export class DevAppLayout {
116116
{name: 'Snack Bar', route: '/snack-bar'},
117117
{name: 'Stepper', route: '/stepper'},
118118
{name: 'System', route: '/system'},
119+
{name: 'System classes', route: '/system-classes'},
119120
{name: 'Table Scroll Container', route: '/table-scroll-container'},
120121
{name: 'Table', route: '/table'},
121122
{name: 'Tabs', route: '/tabs'},
@@ -125,7 +126,6 @@ export class DevAppLayout {
125126
{name: 'Tooltip', route: '/tooltip'},
126127
{name: 'Tree', route: '/tree'},
127128
{name: 'Typography', route: '/typography'},
128-
{name: 'Utility', route: '/utility'},
129129
{name: 'Virtual Scrolling', route: '/virtual-scroll'},
130130
{name: 'YouTube Player', route: '/youtube-player'},
131131
];

‎src/dev-app/routes.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,15 +302,15 @@ export const DEV_APP_ROUTES: Routes = [
302302
loadComponent: () =>
303303
import('./youtube-player/youtube-player-demo').then(m => m.YouTubePlayerDemo),
304304
},
305-
{
306-
path: 'utility',
307-
loadComponent: () =>
308-
import('./utility-classes-demo/utility-classes-demo').then(m => m.UtilityClassesDemo),
309-
},
310305
{
311306
path: 'selection',
312307
loadComponent: () => import('./selection/selection-demo').then(m => m.SelectionDemo),
313308
},
309+
{
310+
path: 'system-classes',
311+
loadComponent: () =>
312+
import('./system-classes-demo/system-classes-demo').then(m => m.SystemClassesDemo),
313+
},
314314
{
315315
path: 'examples',
316316
loadComponent: () => import('./examples-page/examples-page').then(m => m.ExamplesPage),

‎src/dev-app/utility-classes-demo/BUILD.bazel‎ renamed to ‎src/dev-app/system-classes-demo/BUILD.bazel‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ load("//tools:defaults.bzl", "ng_project", "sass_binary")
33
package(default_visibility = ["//visibility:public"])
44

55
ng_project(
6-
name = "utility-classes-demo",
6+
name = "system-classes-demo",
77
srcs = glob(["**/*.ts"]),
88
assets = [
9-
"utility-classes-demo.html",
10-
":utility_classes_demo_scss",
9+
"system-classes-demo.html",
10+
":system_classes_demo_scss",
1111
],
1212
deps = [
1313
"//:node_modules/@angular/core",
1414
],
1515
)
1616

1717
sass_binary(
18-
name = "utility_classes_demo_scss",
19-
src = "utility-classes-demo.scss",
18+
name = "system_classes_demo_scss",
19+
src = "system-classes-demo.scss",
2020
)

‎src/dev-app/utility-classes-demo/utility-classes-demo.html‎ renamed to ‎src/dev-app/system-classes-demo/system-classes-demo.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,32 @@ <h2>Text Color</h2>
3434
<section>
3535
<h2>Typography</h2>
3636
<div class="demo-typography">
37-
<div class="mat-font-display-large">Display Large</div>
38-
<div class="mat-font-display-medium">Display Medium</div>
39-
<div class="mat-font-display-small">Display Small</div>
40-
<div class="mat-font-headline-large">Headline Large</div>
41-
<div class="mat-font-headline-medium">Headline Medium</div>
42-
<div class="mat-font-headline-small">Headline Small</div>
43-
<div class="mat-font-title-large">Title Large</div>
44-
<div class="mat-font-title-medium">Title Medium</div>
45-
<div class="mat-font-title-small">Title Small</div>
46-
<div class="mat-font-body-large">Body Large</div>
47-
<div class="mat-font-body-medium">Body Medium</div>
48-
<div class="mat-font-body-small">Body Small</div>
37+
<div class="mat-font-display-lg">mat-font-display-lg (Display Large)</div>
38+
<div class="mat-font-display-md">mat-font-display-md (Display Medium)</div>
39+
<div class="mat-font-display-sm">mat-font-display-sm (Display Small)</div>
40+
<div class="mat-font-headline-lg">mat-font-headline-lg (Headline Large)</div>
41+
<div class="mat-font-headline-md">mat-font-headline-md (Headline Medium)</div>
42+
<div class="mat-font-headline-sm">mat-font-headline-sm (Headline Small)</div>
43+
<div class="mat-font-title-lg">mat-font-title-lg (Title Large)</div>
44+
<div class="mat-font-title-md">mat-font-title-md (Title Medium)</div>
45+
<div class="mat-font-title-sm">mat-font-title-sm (Title Small)</div>
46+
<div class="mat-font-body-lg">mat-font-body-lg (Body Large)</div>
47+
<div class="mat-font-body-md">mat-font-body-md (Body Medium)</div>
48+
<div class="mat-font-body-sm">mat-font-body-sm (Body Small)</div>
4949
</div>
5050
</section>
5151

5252
<section>
5353
<h2>Shape</h2>
5454
<div class="demo-grid">
55-
<div class="mat-corner-extra-small demo-box mat-bg-primary-container">
56-
mat-corner-extra-small
55+
<div class="mat-corner-extra-sm demo-box mat-bg-primary-container">
56+
mat-corner-extra-sm
5757
</div>
58-
<div class="mat-corner-small demo-box mat-bg-primary-container">mat-corner-small</div>
59-
<div class="mat-corner-medium demo-box mat-bg-primary-container">mat-corner-medium</div>
60-
<div class="mat-corner-large demo-box mat-bg-primary-container">mat-corner-large</div>
61-
<div class="mat-corner-extra-large demo-box mat-bg-primary-container">
62-
mat-corner-extra-large
58+
<div class="mat-corner-sm demo-box mat-bg-primary-container">mat-corner-sm</div>
59+
<div class="mat-corner-md demo-box mat-bg-primary-container">mat-corner-md</div>
60+
<div class="mat-corner-lg demo-box mat-bg-primary-container">mat-corner-lg</div>
61+
<div class="mat-corner-xl demo-box mat-bg-primary-container">
62+
mat-corner-xl
6363
</div>
6464
<div class="mat-corner-full demo-box mat-bg-primary-container">mat-corner-full</div>
6565
</div>

‎src/dev-app/utility-classes-demo/utility-classes-demo.scss‎ renamed to ‎src/dev-app/system-classes-demo/system-classes-demo.scss‎

File renamed without changes.

‎src/dev-app/system-classes-demo/system-classes-demo.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import {ChangeDetectionStrategy, Component} from '@angular/core';
2+
3+
@Component({
4+
selector: 'app-system-classes-demo',
5+
templateUrl: './system-classes-demo.html',
6+
styleUrls: ['./system-classes-demo.scss'],
7+
changeDetection: ChangeDetectionStrategy.OnPush,
8+
})
9+
export class SystemClassesDemo {}

‎src/dev-app/theme-m3.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ html {
5353
));
5454
}
5555

56-
@include mat.utility-classes();
56+
@include mat.system-classes();
5757
}
5858

5959
@include mat.typography-hierarchy($light-theme);

‎src/dev-app/theme.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $candy-app-theme: mat.m2-define-light-theme((
2424
@include mat.app-background();
2525
@include mat.elevation-classes();
2626
@include mat.m2-theme($candy-app-theme);
27-
@include mat.utility-classes();
27+
@include mat.system-classes();
2828

2929
// Include the default theme styles.
3030
@include mat.all-component-themes($candy-app-theme);

‎src/dev-app/utility-classes-demo/utility-classes-demo.ts‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)