Skip to content

Commit 0053a2c

Browse files
committed
feat(divider): move divider out of mat-list
- Creates an independent mat-divider component - Adds inset capability with special accomodations for mat-list-item - Adds vertical option - Removed mat-divider from MatListModule with temporary import to prevent breaking changes - Added styling for dividers in cards
1 parent 76a6e7b commit 0053a2c

26 files changed

+409
-39
lines changed

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 md-button>LIKE</button>
40+
<button md-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
@@ -8,6 +8,7 @@ import {
88
MatChipsModule,
99
MatDatepickerModule,
1010
MatDialogModule,
11+
MatDividerModule,
1112
MatExpansionModule,
1213
MatFormFieldModule,
1314
MatGridListModule,
@@ -55,6 +56,7 @@ import {PortalModule} from '@angular/cdk/portal';
5556
MatTableModule,
5657
MatDatepickerModule,
5758
MatDialogModule,
59+
MatDividerModule,
5860
MatExpansionModule,
5961
MatFormFieldModule,
6062
MatGridListModule,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ <h4 mat-line>{{message.from}}</h4>
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/system-config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ System.config({
5656
'@angular/material/core': 'dist/packages/material/core/index.js',
5757
'@angular/material/datepicker': 'dist/packages/material/datepicker/index.js',
5858
'@angular/material/dialog': 'dist/packages/material/dialog/index.js',
59+
'@angular/material/divider': 'dist/packages/material/divider/index.js',
5960
'@angular/material/expansion': 'dist/packages/material/expansion/index.js',
6061
'@angular/material/form-field': 'dist/packages/material/form-field/index.js',
6162
'@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
@@ -56,6 +56,7 @@ System.config({
5656
'@angular/material/core': 'dist/bundles/material-core.umd.js',
5757
'@angular/material/datepicker': 'dist/bundles/material-datepicker.umd.js',
5858
'@angular/material/dialog': 'dist/bundles/material-dialog.umd.js',
59+
'@angular/material/divider': 'dist/bundles/material-divider.umd.js',
5960
'@angular/material/expansion': 'dist/bundles/material-expansion.umd.js',
6061
'@angular/material/form-field': 'dist/bundles/material-form-field.umd.js',
6162
'@angular/material/grid-list': 'dist/bundles/material-grid-list.umd.js',

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);

src/lib/divider/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Please see the official documentation at https://material.angular.io/components/component/divider
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
@import '../core/theming/palette';
2+
@import '../core/theming/theming';
3+
4+
5+
@mixin mat-divider-theme($theme) {
6+
$foreground: map-get($theme, foreground);
7+
8+
.mat-divider {
9+
border-top-color: mat-color($foreground, divider);
10+
}
11+
12+
.mat-divider-vertical {
13+
border-right-color: mat-color($foreground, divider);
14+
}
15+
}

src/lib/divider/divider-module.ts

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
import {NgModule} from '@angular/core';
10+
import {MatCommonModule} from '@angular/material/core';
11+
import {
12+
MatDivider,
13+
MatDividerCssMatStyler,
14+
} from './divider';
15+
import {CommonModule} from '@angular/common';
16+
17+
18+
@NgModule({
19+
imports: [MatCommonModule, CommonModule],
20+
exports: [
21+
MatDivider,
22+
MatDividerCssMatStyler,
23+
MatCommonModule,
24+
],
25+
declarations: [
26+
MatDivider,
27+
MatDividerCssMatStyler,
28+
],
29+
})
30+
export class MatDividerModule {}

0 commit comments

Comments
 (0)