File tree Expand file tree Collapse file tree 3 files changed +13
-5
lines changed Expand file tree Collapse file tree 3 files changed +13
-5
lines changed Original file line number Diff line number Diff line change 29
29
}
30
30
}
31
31
32
+ // Collapses unwanted whitespace created by newlines in code like the following:
33
+ // <md-option>
34
+ // {{value}}
35
+ // </md-option>
36
+ .mat-option-text {
37
+ display : inline-block ;
38
+ }
39
+
32
40
.mat-option-ripple {
33
41
@include mat-fill ;
34
42
Original file line number Diff line number Diff line change 5
5
[state] ="selected ? 'checked' : '' " [disabled] ="disabled "> </ md-pseudo-checkbox >
6
6
</ span >
7
7
8
- < ng-content > </ ng-content >
8
+ < span class ="mat-option-text "> < ng-content > </ ng-content > </ span >
9
+
9
10
< div class ="mat-option-ripple " md-ripple
10
11
[mdRippleTrigger] ="_getHostElement() "
11
12
[mdRippleDisabled] ="disabled || disableRipple ">
Original file line number Diff line number Diff line change @@ -93,12 +93,11 @@ export const SELECT_ITEM_HEIGHT_EM = 3;
93
93
* Distance between the panel edge and the option text in
94
94
* multi-selection mode.
95
95
*
96
- * (SELECT_PADDING * 1.75) + 20 = 48
97
- * The padding is multiplied by 1.75 because the checkbox's margin is half the padding, and
98
- * the browser adds ~4px, because we're using inline elements.
96
+ * (SELECT_PANEL_PADDING_X * 1.5) + 20 = 44
97
+ * The padding is multiplied by 1.5 because the checkbox's margin is half the padding.
99
98
* The checkbox width is 20px.
100
99
*/
101
- export const SELECT_MULTIPLE_PANEL_PADDING_X = SELECT_PANEL_PADDING_X * 1.75 + 20 ;
100
+ export const SELECT_MULTIPLE_PANEL_PADDING_X = SELECT_PANEL_PADDING_X * 1.5 + 20 ;
102
101
103
102
/**
104
103
* The panel's padding on the y-axis. This padding indicates there are more
You can’t perform that action at this time.
0 commit comments