From 17c3edd2a8886e54dfc29962d1f6f8ebaf64d335 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Wed, 12 Aug 2015 20:39:30 -0500 Subject: [PATCH] material action menu updates --- ionic/components/action-menu/action-menu.scss | 1 + ionic/components/action-menu/action-menu.ts | 4 ++-- ionic/components/action-menu/modes/material.scss | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ionic/components/action-menu/action-menu.scss b/ionic/components/action-menu/action-menu.scss index 7a542a5bbc..5286a36bb9 100644 --- a/ionic/components/action-menu/action-menu.scss +++ b/ionic/components/action-menu/action-menu.scss @@ -43,6 +43,7 @@ action-menu-wrapper { display: block; padding: 1px; width: 100%; + margin: 0; border-radius: 0; border-color: $action-menu-options-border-color; background-color: transparent; diff --git a/ionic/components/action-menu/action-menu.ts b/ionic/components/action-menu/action-menu.ts index 320e23e722..13d7b1e879 100644 --- a/ionic/components/action-menu/action-menu.ts +++ b/ionic/components/action-menu/action-menu.ts @@ -110,7 +110,7 @@ class ActionMenuAnimation extends Animation { class ActionMenuSlideIn extends ActionMenuAnimation { constructor(element) { super(element); - this.backdrop.fromTo('opacity', 0, 0.4); + this.backdrop.fromTo('opacity', 0, 0.26); this.wrapper.fromTo('translateY', '100%', '0%'); } } @@ -119,7 +119,7 @@ Animation.register('action-menu-slide-in', ActionMenuSlideIn); class ActionMenuSlideOut extends ActionMenuAnimation { constructor(element) { super(element); - this.backdrop.fromTo('opacity', 0.4, 0); + this.backdrop.fromTo('opacity', 0.26, 0); this.wrapper.fromTo('translateY', '0%', '100%'); } } diff --git a/ionic/components/action-menu/modes/material.scss b/ionic/components/action-menu/modes/material.scss index 97ae2e313e..0308e90062 100644 --- a/ionic/components/action-menu/modes/material.scss +++ b/ionic/components/action-menu/modes/material.scss @@ -8,12 +8,14 @@ $action-menu-md-height: 4.8rem !default; $action-menu-md-title-color: #757575 !default; $action-menu-md-title-font-size: 1.6rem !default; +$action-menu-md-title-padding: 1.9rem 1.6rem 1.7rem !default; $action-menu-md-button-text-color: #222 !default; $action-menu-md-button-font-size: 1.6rem !default; $action-menu-md-background-active: #f1f1f1 !default; $action-menu-md-icon-font-size: 2.4rem !default; +$action-menu-md-icon-margin: 0 28px 0 0 !default; .action-menu[mode=md] { @@ -36,18 +38,17 @@ $action-menu-md-icon-font-size: 2.4rem !default; .icon { display: inline-block; + margin: $action-menu-md-icon-margin; min-width: 24px; text-align: center; vertical-align: middle; font-size: $action-menu-md-icon-font-size; - - margin: 0 32px 0 0; // gap on right, standard left padding } } .action-menu-title { + padding: $action-menu-md-title-padding; font-size: $action-menu-md-title-font-size; - padding: $action-menu-md-title-font-size; color: $action-menu-md-title-color; } @@ -57,6 +58,7 @@ $action-menu-md-icon-font-size: 2.4rem !default; &.activated { background: $action-menu-md-background-active; + border-radius: 0; } }