Skip to content

Commit

Permalink
Revert "fix(menu): allow text wrapping in menu items" (angular#14493)
Browse files Browse the repository at this point in the history
* Revert "build: update nodejs bazel rules (angular#14466)"

This reverts commit a3fef46.

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

This reverts commit 97f52c0.

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

This reverts commit 3661abe.
  • Loading branch information
vivian-hu-zz authored and josephperrott committed Jan 14, 2019
1 parent c2c2fdf commit 53c563b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 15 deletions.
4 changes: 2 additions & 2 deletions src/dev-app/menu/menu-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
];
Expand Down
1 change: 1 addition & 0 deletions src/lib/core/option/option.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
display: flex;
flex-direction: row;
max-width: 100%;
box-sizing: border-box;
align-items: center;
-webkit-tap-highlight-color: transparent;

Expand Down
1 change: 0 additions & 1 deletion src/lib/core/style/_menu-common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions src/lib/menu/menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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,
Expand Down

0 comments on commit 53c563b

Please sign in to comment.