Skip to content

Commit 4830c8f

Browse files
authored
build: switch dev app layout to use MDC (#25670)
Switches the dev app layout to use the MDC versions of the components and fixes a couple of visual issues.
1 parent 619abba commit 4830c8f

File tree

5 files changed

+19
-10
lines changed

5 files changed

+19
-10
lines changed

src/dev-app/dev-app/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ ng_module(
1212
deps = [
1313
"//src/cdk/bidi",
1414
"//src/cdk/overlay",
15+
"//src/material/button",
1516
"//src/material/core",
1617
"//src/material/icon",
17-
"//src/material/legacy-button",
18-
"//src/material/legacy-list",
18+
"//src/material/list",
1919
"//src/material/sidenav",
2020
"//src/material/toolbar",
2121
"@npm//@angular/router",

src/dev-app/dev-app/dev-app-404.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {Component} from '@angular/core';
10-
import {MatLegacyButtonModule} from '@angular/material/legacy-button';
10+
import {MatButtonModule} from '@angular/material/button';
1111
import {RouterModule} from '@angular/router';
1212

1313
@Component({
@@ -18,6 +18,6 @@ import {RouterModule} from '@angular/router';
1818
`,
1919
host: {'class': 'mat-typography'},
2020
standalone: true,
21-
imports: [MatLegacyButtonModule, RouterModule],
21+
imports: [MatButtonModule, RouterModule],
2222
})
2323
export class DevApp404 {}

src/dev-app/dev-app/dev-app-layout.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</button>
4545
<div class="demo-toolbar">
4646
<h1>Angular Material Demos</h1>
47-
<div>
47+
<div class="demo-config-buttons">
4848
<button mat-icon-button (click)="toggleFullscreen()" title="Toggle fullscreen">
4949
<mat-icon>fullscreen</mat-icon>
5050
</button>

src/dev-app/dev-app/dev-app-layout.scss

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ body {
1818
min-width: 15vw;
1919
position: fixed;
2020

21-
.mat-button {
21+
.mat-mdc-button {
2222
width: 100%;
2323
position: relative;
2424
bottom: 0;
@@ -69,3 +69,12 @@ body {
6969
// Removes extra space on top of toolbar on IE.
7070
display: block;
7171
}
72+
73+
.demo-config-buttons {
74+
display: flex;
75+
align-items: center;
76+
77+
.mat-mdc-button-base {
78+
--mdc-text-button-label-text-color: inherit;
79+
}
80+
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import {DevAppDirectionality} from './dev-app-directionality';
1313
import {DevAppRippleOptions} from './ripple-options';
1414
import {CommonModule, DOCUMENT} from '@angular/common';
1515
import {MatSidenavModule} from '@angular/material/sidenav';
16-
import {MatLegacyListModule} from '@angular/material/legacy-list';
17-
import {MatLegacyButtonModule} from '@angular/material/legacy-button';
16+
import {MatListModule} from '@angular/material/list';
17+
import {MatButtonModule} from '@angular/material/button';
1818
import {RouterModule} from '@angular/router';
1919
import {MatIconModule} from '@angular/material/icon';
2020
import {MatToolbarModule} from '@angular/material/toolbar';
@@ -32,9 +32,9 @@ export const ANIMATIONS_STORAGE_KEY = 'ANGULAR_COMPONENTS_ANIMATIONS_DISABLED';
3232
standalone: true,
3333
imports: [
3434
CommonModule,
35-
MatLegacyButtonModule,
35+
MatButtonModule,
3636
MatIconModule,
37-
MatLegacyListModule,
37+
MatListModule,
3838
MatSidenavModule,
3939
MatToolbarModule,
4040
RouterModule,

0 commit comments

Comments
 (0)