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>
31
31
< span > {{message.subject}} -- </ span >
32
32
< span class ="demo-secondary-text "> {{message.message}}</ span >
33
33
</ p >
34
- < mat-divider [ inset] =" true " *ngIf ="!last "> </ mat-divider >
34
+ < mat-divider inset *ngIf ="!last "> </ mat-divider >
35
35
</ mat-list-item >
36
36
< mat-divider > </ mat-divider >
37
37
< mat-list-item *ngFor ="let message of messages ">
@@ -87,10 +87,11 @@ <h2>Nav lists</h2>
87
87
</ mat-list-item >
88
88
</ mat-nav-list >
89
89
< 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 ">
91
91
< mat-icon mat-list-icon > folder</ mat-icon >
92
92
< span mat-line > {{ link.name }}</ span >
93
93
< span mat-line class ="demo-secondary-text "> Description </ span >
94
+ < mat-divider inset *ngIf ="!last "> </ mat-divider >
94
95
</ a >
95
96
</ mat-nav-list >
96
97
< mat-nav-list dense >
Original file line number Diff line number Diff line change @@ -16,6 +16,13 @@ ng_module(
16
16
)
17
17
18
18
19
+ sass_library (
20
+ name = "divider_scss_lib" ,
21
+ srcs = ["divider.scss" ],
22
+ deps = ["//src/lib/core:core_scss_lib" ],
23
+ )
24
+
25
+
19
26
sass_binary (
20
27
name = "divider_scss" ,
21
28
src = "divider.scss" ,
Original file line number Diff line number Diff line change 1
1
$mat-divider-width : 1px ;
2
2
$mat-divider-inset-margin : 80px ;
3
3
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
+
4
17
.mat-divider {
5
18
display : block ;
6
19
margin : 0 ;
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ ng_module(
23
23
sass_binary (
24
24
name = "list_scss" ,
25
25
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" ],
27
27
)
28
28
29
29
# TODO(jelbourn): remove this when sass_binary supports specifying an output filename and dir.
Original file line number Diff line number Diff line change 1
1
@import ' ../core/style/variables' ;
2
2
@import ' ../core/style/list-common' ;
3
3
@import ' ../core/style/layout-common' ;
4
+ @import ' ../divider/divider' ;
4
5
5
6
6
7
$mat-list-side-padding : 16px ;
8
+ $mat-list-icon-padding : 4px ;
7
9
$mat-list-avatar-size : 40px ;
8
10
9
11
// Normal list variables
@@ -131,6 +133,10 @@ $mat-list-item-inset-divider-offset: 72px;
131
133
width : $mat-list-avatar-size ;
132
134
height : $mat-list-avatar-size ;
133
135
border-radius : 50% ;
136
+
137
+ ~ .mat-divider-inset {
138
+ @include mat-inset-divider-offset ($mat-list-avatar-size , $mat-list-side-padding );
139
+ }
134
140
}
135
141
136
142
.mat-list-icon {
@@ -140,29 +146,28 @@ $mat-list-item-inset-divider-offset: 72px;
140
146
font-size : $icon-size ;
141
147
box-sizing : content-box ;
142
148
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
+ }
144
155
}
145
156
146
157
.mat-divider {
147
158
position : absolute ;
148
159
bottom : 0 ;
149
160
left : 0 ;
150
161
width : 100% ;
162
+ margin : 0 ;
151
163
152
164
[dir = ' rtl' ] & {
153
- left : auto ;
154
- right : 0 ;
165
+ margin- left : auto ;
166
+ margin- right : 0 ;
155
167
}
156
168
157
169
& .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
166
171
}
167
172
}
168
173
}
You can’t perform that action at this time.
0 commit comments