File tree Expand file tree Collapse file tree 2 files changed +11
-8
lines changed Expand file tree Collapse file tree 2 files changed +11
-8
lines changed Original file line number Diff line number Diff line change 22@import ' ../../cdk/a11y/a11y' ;
33
44$mat-toolbar-height-desktop : 64px !default ;
5+ $mat-toolbar-height-mobile : 56px !default ;
6+ $mat-toolbar-row-padding : 16px !default ;
7+
8+ /* * @deprecated @deletion-target 8.0.0 */
59$mat-toolbar-height-mobile-portrait : 56px !default ;
10+ /* * @deprecated @deletion-target 8.0.0 */
611$mat-toolbar-height-mobile-landscape : 48px !default ;
712
8- $mat-toolbar-row-padding : 16px !default ;
913
1014
1115@mixin mat-toolbar-height ($height ) {
@@ -49,10 +53,9 @@ $mat-toolbar-row-padding: 16px !default;
4953// Set the default height for the toolbar.
5054@include mat-toolbar-height ($mat-toolbar-height-desktop );
5155
52- // As per specs, mobile devices will use a different height for toolbars than for desktop.
53- // The height for mobile landscape devices has been ignored since relying on `@media orientation`
54- // is causing issues on devices with a soft-keyboard.
55- // See: https://material.io/guidelines/layout/structure.html#structure-app-bar
56+ // As per specs, toolbars should have a different height in mobile devices. This has been
57+ // specified in the old guidelines and is still observable in the new specifications by looking at
58+ // the spec images. See: https://material.io/design/components/app-bars-top.html#anatomy
5659@media ($mat-xsmall ) {
57- @include mat-toolbar-height ($mat-toolbar-height-mobile-portrait );
60+ @include mat-toolbar-height ($mat-toolbar-height-mobile );
5861}
Original file line number Diff line number Diff line change @@ -45,8 +45,8 @@ export class MatToolbarRow {}
4545 inputs : [ 'color' ] ,
4646 host : {
4747 'class' : 'mat-toolbar' ,
48- '[class.mat-toolbar-multiple-rows]' : 'this. _toolbarRows.length' ,
49- '[class.mat-toolbar-single-row]' : '!this. _toolbarRows.length'
48+ '[class.mat-toolbar-multiple-rows]' : '_toolbarRows.length > 0 ' ,
49+ '[class.mat-toolbar-single-row]' : '_toolbarRows.length === 0' ,
5050 } ,
5151 changeDetection : ChangeDetectionStrategy . OnPush ,
5252 encapsulation : ViewEncapsulation . None ,
You can’t perform that action at this time.
0 commit comments