Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(menu): move common styles into core #1600

Merged
merged 1 commit into from
Oct 25, 2016
+50 −38
Merged

chore(menu): move common styles into core #1600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions src/lib/core/style/_menu-common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
@import './variables';
@import './elevation';
@import './list-common';

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add top-level comment here saying that these styles are shared between menu and select.

/** The mixins below are shared between md-menu and md-select */

// menu width must be a multiple of 56px
$md-menu-overlay-min-width: 112px !default; // 56 * 2
$md-menu-overlay-max-width: 280px !default; // 56 * 5

$md-menu-item-height: 48px !default;
$md-menu-font-size: 16px !default;
$md-menu-side-padding: 16px !default;
$md-menu-vertical-padding: 8px !default;

@mixin md-menu-base() {
@include md-elevation(2);
min-width: $md-menu-overlay-min-width;
max-width: $md-menu-overlay-max-width;

overflow: auto;
-webkit-overflow-scrolling: touch; // for momentum scroll on mobile

padding-top: $md-menu-vertical-padding;
padding-bottom: $md-menu-vertical-padding;
}

@mixin md-menu-item-base() {
@include md-truncate-line();

display: flex;
flex-direction: row;
align-items: center;
height: $md-menu-item-height;
padding: 0 $md-menu-side-padding;

font-size: $md-menu-font-size;
font-family: $md-font-family;
text-align: start;
text-decoration: none; // necessary to reset anchor tags

&[disabled] {
cursor: default;
}
}
43 changes: 5 additions & 38 deletions src/lib/menu/menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,22 @@
// TODO(kara): update vars for desktop when MD team responds
// TODO(kara): animation for menu opening
@import '../core/style/variables';
@import '../core/style/elevation';

@import '../core/style/button-common';
@import '../core/style/sidenav-common';
@import '../core/style/list-common';


// menu width must be a multiple of 56px
$md-menu-overlay-min-width: 112px !default; // 56 * 2
$md-menu-overlay-max-width: 280px !default; // 56 * 5

$md-menu-item-height: 48px !default;
$md-menu-font-size: 16px !default;
$md-menu-side-padding: 16px !default;
$md-menu-vertical-padding: 8px !default;
@import '../core/style/menu-common';

.md-menu-panel {
@include md-elevation(2);
min-width: $md-menu-overlay-min-width;
max-width: $md-menu-overlay-max-width;
@include md-menu-base();

// max height must be 100% of the viewport height + one row height
max-height: calc(100vh + 48px);
overflow: auto;
-webkit-overflow-scrolling: touch; // for momentum scroll on mobile

padding-top: $md-menu-vertical-padding;
padding-bottom: $md-menu-vertical-padding;
}

[md-menu-item] {
@include md-button-reset();
@include md-truncate-line();

display: flex;
flex-direction: row;
align-items: center;
height: $md-menu-item-height;
padding: 0 $md-menu-side-padding;

font-size: $md-menu-font-size;
font-family: $md-font-family;
text-align: start;
text-decoration: none; // necessary to reset anchor tags

&[disabled] {
cursor: default;
}
@include md-menu-item-base();
}

button[md-menu-item] {
width: 100%;
}
}