File tree Expand file tree Collapse file tree 5 files changed +40
-14
lines changed Expand file tree Collapse file tree 5 files changed +40
-14
lines changed Original file line number Diff line number Diff line change @@ -31,7 +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 >
34+ < mat-divider inset *ngIf ="!last "> </ mat-divider >
3535 </ mat-list-item >
3636 < mat-divider > </ mat-divider >
3737 < mat-list-item *ngFor ="let message of messages ">
@@ -87,10 +87,11 @@ <h2>Nav lists</h2>
8787 </ mat-list-item >
8888 </ mat-nav-list >
8989 < mat-nav-list >
90- < a mat-list-item *ngFor ="let link of links " href ="http://www.google.com ">
90+ < a mat-list-item *ngFor ="let link of links; last as last " href ="http://www.google.com ">
9191 < mat-icon mat-list-icon > folder</ mat-icon >
9292 < span mat-line > {{ link.name }}</ span >
9393 < span mat-line class ="demo-secondary-text "> Description </ span >
94+ < mat-divider inset *ngIf ="!last "> </ mat-divider >
9495 </ a >
9596 </ mat-nav-list >
9697 < mat-nav-list dense >
Original file line number Diff line number Diff line change @@ -16,6 +16,13 @@ ng_module(
1616)
1717
1818
19+ sass_library (
20+ name = "divider_scss_lib" ,
21+ srcs = ["divider.scss" ],
22+ deps = ["//src/lib/core:core_scss_lib" ],
23+ )
24+
25+
1926sass_binary (
2027 name = "divider_scss" ,
2128 src = "divider.scss" ,
Original file line number Diff line number Diff line change 11$mat-divider-width : 1px ;
22$mat-divider-inset-margin : 80px ;
33
4+ // This mixin provides the correct offset for an inset divider based on the
5+ // size of the parent class (e.g. avatar vs icon)
6+ @mixin mat-inset-divider-offset ($offset , $padding ) {
7+ $mat-inset-divider-offset : #{(2 * $padding ) + $offset } ;
8+ margin-left : $mat-inset-divider-offset ;
9+ width : calc (100% - #{$mat-inset-divider-offset } );
10+
11+ [dir = ' rtl' ] & {
12+ margin-left : auto ;
13+ margin-right : $mat-inset-divider-offset ;
14+ }
15+ }
16+
417.mat-divider {
518 display : block ;
619 margin : 0 ;
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ ng_module(
2323sass_binary (
2424 name = "list_scss" ,
2525 src = "list.scss" ,
26- deps = ["//src/lib/core:core_scss_lib" ],
26+ deps = ["//src/lib/core:core_scss_lib" , "//src/lib/divider:divider_scss_lib" ],
2727)
2828
2929# TODO(jelbourn): remove this when sass_binary supports specifying an output filename and dir.
Original file line number Diff line number Diff line change 11@import ' ../core/style/variables' ;
22@import ' ../core/style/list-common' ;
33@import ' ../core/style/layout-common' ;
4+ @import ' ../divider/divider' ;
45
56
67$mat-list-side-padding : 16px ;
8+ $mat-list-icon-padding : 4px ;
79$mat-list-avatar-size : 40px ;
810
911// Normal list variables
@@ -131,6 +133,10 @@ $mat-list-item-inset-divider-offset: 72px;
131133 width : $mat-list-avatar-size ;
132134 height : $mat-list-avatar-size ;
133135 border-radius : 50% ;
136+
137+ ~ .mat-divider-inset {
138+ @include mat-inset-divider-offset ($mat-list-avatar-size , $mat-list-side-padding );
139+ }
134140 }
135141
136142 .mat-list-icon {
@@ -140,29 +146,28 @@ $mat-list-item-inset-divider-offset: 72px;
140146 font-size : $icon-size ;
141147 box-sizing : content-box ;
142148 border-radius : 50% ;
143- padding : 4px ;
149+ padding : $mat-list-icon-padding ;
150+
151+ ~ .mat-divider-inset {
152+ @include mat-inset-divider-offset ($icon-size + (2 * $mat-list-icon-padding ),
153+ $mat-list-side-padding );
154+ }
144155 }
145156
146157 .mat-divider {
147158 position : absolute ;
148159 bottom : 0 ;
149160 left : 0 ;
150161 width : 100% ;
162+ margin : 0 ;
151163
152164 [dir = ' rtl' ] & {
153- left : auto ;
154- right : 0 ;
165+ margin- left : auto ;
166+ margin- right : 0 ;
155167 }
156168
157169 & .mat-divider-inset {
158- left : $mat-list-item-inset-divider-offset ;
159- width : calc (100% - #{$mat-list-item-inset-divider-offset } );
160- margin : 0 ;
161-
162- [dir = ' rtl' ] & {
163- left : auto ;
164- right : $mat-list-item-inset-divider-offset ;
165- }
170+ position : absolute ; // necessary to override card styles
166171 }
167172 }
168173}
You can’t perform that action at this time.
0 commit comments