Skip to content

Commit bd0ec64

Browse files
CaerusKarujosephperrott
authored andcommitted
feat(divider): move divider out of mat-list (#5862)
1 parent d773102 commit bd0ec64

32 files changed

+378
-41
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/src/lib/chips/** @tinayuangao
99
/src/lib/datepicker/** @mmalerba
1010
/src/lib/dialog/** @jelbourn @crisbeto
11+
/src/lib/divider/** @jelbourn @crisbeto
1112
/src/lib/expansion/** @josephperrott @jelbourn
1213
/src/lib/form-field/** @mmalerba
1314
/src/lib/grid-list/** @kara @jelbourn

src/demo-app/card/card-demo.html

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,23 @@
2727
</mat-card-footer>
2828
</mat-card>
2929

30+
<mat-card>
31+
<mat-card-subtitle>Subtitle</mat-card-subtitle>
32+
<mat-card-title>Card with title, footer, and inset-divider</mat-card-title>
33+
<mat-card-content>
34+
<p>This is supporting text.</p>
35+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
36+
</mat-card-content>
37+
<mat-divider [inset]="true"></mat-divider>
38+
<mat-card-actions>
39+
<button mat-button>LIKE</button>
40+
<button mat-button>SHARE</button>
41+
</mat-card-actions>
42+
<mat-card-footer>
43+
<mat-progress-bar mode="indeterminate"></mat-progress-bar>
44+
</mat-card-footer>
45+
</mat-card>
46+
3047
<mat-card>
3148
<img mat-card-image src="https://material.angularjs.org/latest/img/washedout.png">
3249
<mat-card-title>Content Title</mat-card-title>

src/demo-app/demo-material-module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
MatChipsModule,
1717
MatDatepickerModule,
1818
MatDialogModule,
19+
MatDividerModule,
1920
MatExpansionModule,
2021
MatFormFieldModule,
2122
MatGridListModule,
@@ -63,6 +64,7 @@ import {PortalModule} from '@angular/cdk/portal';
6364
MatTableModule,
6465
MatDatepickerModule,
6566
MatDialogModule,
67+
MatDividerModule,
6668
MatExpansionModule,
6769
MatFormFieldModule,
6870
MatGridListModule,

src/demo-app/list/list-demo.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ <h3 mat-line>{{contact.name}}</h3>
2424

2525
<mat-list>
2626
<h3 mat-subheader>Today</h3>
27-
<mat-list-item *ngFor="let message of messages">
27+
<mat-list-item *ngFor="let message of messages; last as last">
2828
<img mat-list-avatar [src]="message.image" alt="Image of {{message.from}}">
2929
<h4 mat-line>{{message.from}}</h4>
3030
<p mat-line>
3131
<span>{{message.subject}} -- </span>
3232
<span class="demo-secondary-text">{{message.message}}</span>
3333
</p>
34+
<mat-divider [inset]="true" *ngIf="!last"></mat-divider>
3435
</mat-list-item>
3536
<mat-divider></mat-divider>
3637
<mat-list-item *ngFor="let message of messages">

src/demo-app/menu/menu-demo.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,24 @@
1414
</button>
1515
</mat-menu>
1616
</div>
17+
<div class="menu-section">
18+
<p>Menu with divider</p>
19+
20+
<mat-toolbar>
21+
<button mat-icon-button [matMenuTriggerFor]="divider" aria-label="Open basic menu">
22+
<mat-icon>more_vert</mat-icon>
23+
</button>
24+
</mat-toolbar>
25+
26+
<mat-menu #divider="matMenu">
27+
<ng-container *ngFor="let item of items; last as last">
28+
<button mat-menu-item [disabled]="item.disabled">
29+
{{ item.text }}
30+
</button>
31+
<mat-divider *ngIf="!last"></mat-divider>
32+
</ng-container>
33+
</mat-menu>
34+
</div>
1735
<div class="menu-section">
1836
<p>Nested menu</p>
1937

src/demo-app/system-config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ System.config({
6767
'@angular/material/core': 'dist/packages/material/core/index.js',
6868
'@angular/material/datepicker': 'dist/packages/material/datepicker/index.js',
6969
'@angular/material/dialog': 'dist/packages/material/dialog/index.js',
70+
'@angular/material/divider': 'dist/packages/material/divider/index.js',
7071
'@angular/material/expansion': 'dist/packages/material/expansion/index.js',
7172
'@angular/material/form-field': 'dist/packages/material/form-field/index.js',
7273
'@angular/material/grid-list': 'dist/packages/material/grid-list/index.js',

src/e2e-app/e2e-app-module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
MatButtonModule,
2424
MatCheckboxModule,
2525
MatDialogModule,
26+
MatDividerModule,
2627
MatFormFieldModule,
2728
MatGridListModule,
2829
MatIconModule,
@@ -50,6 +51,7 @@ import {ReactiveFormsModule} from '@angular/forms';
5051
MatButtonModule,
5152
MatCheckboxModule,
5253
MatDialogModule,
54+
MatDividerModule,
5355
MatFormFieldModule,
5456
MatGridListModule,
5557
MatIconModule,

src/e2e-app/system-config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ System.config({
5959
'@angular/material/core': 'dist/bundles/material-core.umd.js',
6060
'@angular/material/datepicker': 'dist/bundles/material-datepicker.umd.js',
6161
'@angular/material/dialog': 'dist/bundles/material-dialog.umd.js',
62+
'@angular/material/divider': 'dist/bundles/material-divider.umd.js',
6263
'@angular/material/expansion': 'dist/bundles/material-expansion.umd.js',
6364
'@angular/material/form-field': 'dist/bundles/material-form-field.umd.js',
6465
'@angular/material/grid-list': 'dist/bundles/material-grid-list.umd.js',

src/lib/card/card.scss

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,22 @@ $mat-card-header-size: 40px !default;
1616
padding: $mat-card-default-padding;
1717
border-radius: $mat-card-border-radius;
1818

19+
.mat-divider {
20+
position: absolute;
21+
left: 0;
22+
width: 100%;
23+
24+
[dir='rtl'] & {
25+
left: auto;
26+
right: 0;
27+
}
28+
29+
&.mat-divider-inset {
30+
position: static;
31+
margin: 0;
32+
}
33+
}
34+
1935
@include cdk-high-contrast {
2036
outline: solid 1px;
2137
}

src/lib/core/theming/_all-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
@import '../../table/table-theme';
1010
@import '../../datepicker/datepicker-theme';
1111
@import '../../dialog/dialog-theme';
12+
@import '../../divider/divider-theme';
1213
@import '../../expansion/expansion-theme';
1314
@import '../../grid-list/grid-list-theme';
1415
@import '../../icon/icon-theme';
@@ -43,6 +44,7 @@
4344
@include mat-table-theme($theme);
4445
@include mat-datepicker-theme($theme);
4546
@include mat-dialog-theme($theme);
47+
@include mat-divider-theme($theme);
4648
@include mat-expansion-panel-theme($theme);
4749
@include mat-form-field-theme($theme);
4850
@include mat-grid-list-theme($theme);

0 commit comments

Comments
 (0)