Revert "fix(menu): allow text wrapping in menu items" (#14493)

* Revert "build: update nodejs bazel rules (#14466)"

This reverts commit a3fef46a8e.

* Revert "docs(form-field): native select reset values not working in examples (#14236)"

This reverts commit 97f52c0924.

* Revert "fix(menu): allow text wrapping in menu items (#11430)"

This reverts commit 3661abe061.
This commit is contained in:
vivian-hu
2018-12-12 16:17:03 -08:00
committed by GitHub
parent a3fef46a8e
commit a3da8d2b5b
4 changed files with 3 additions and 15 deletions
+2 -2
View File
@@ -19,13 +19,13 @@ export class MenuDemo {
selected = '';
items = [
{text: 'Refresh'},
{text: 'Settings with a longer name so we can test text wrapping'},
{text: 'Settings'},
{text: 'Help', disabled: true},
{text: 'Sign Out'}
];
iconItems = [
{text: 'Redial with a longer name so we can test text wrapping', icon: 'dialpad'},
{text: 'Redial', icon: 'dialpad'},
{text: 'Check voicemail', icon: 'voicemail', disabled: true},
{text: 'Disable alerts', icon: 'notifications_off'}
];
+1
View File
@@ -11,6 +11,7 @@
display: flex;
flex-direction: row;
max-width: 100%;
box-sizing: border-box;
align-items: center;
-webkit-tap-highlight-color: transparent;
-1
View File
@@ -28,7 +28,6 @@ $mat-menu-icon-margin: 16px !default;
line-height: $mat-menu-item-height;
height: $mat-menu-item-height;
padding: 0 $mat-menu-side-padding;
box-sizing: border-box;
text-align: left;
text-decoration: none; // necessary to reset anchor tags
-12
View File
@@ -5,7 +5,6 @@
@import '../../cdk/a11y/a11y';
$mat-menu-vertical-padding: 8px !default;
$mat-menu-item-vertical-padding: 8px !default;
$mat-menu-border-radius: 4px !default;
$mat-menu-submenu-indicator-size: 10px !default;
@@ -31,17 +30,6 @@ $mat-menu-submenu-indicator-size: 10px !default;
@include mat-menu-item-base();
position: relative;
// TODO(crisbeto): most of these can be moved into the `mat-menu-item-base`
// once we start allowing text wrapping in mat-select and mat-autocomplete.
display: flex;
align-items: center;
white-space: normal;
line-height: normal;
height: auto;
min-height: $mat-menu-item-height;
padding-top: $mat-menu-item-vertical-padding;
padding-bottom: $mat-menu-item-vertical-padding;
@include cdk-high-contrast {
&.cdk-program-focused,
&.cdk-keyboard-focused,