diff --git a/ionic/components/action-menu/action-menu.scss b/ionic/components/action-menu/action-menu.scss index d3db013992..b86c490403 100644 --- a/ionic/components/action-menu/action-menu.scss +++ b/ionic/components/action-menu/action-menu.scss @@ -52,8 +52,7 @@ $action-menu-options-border-color: #d1d3d6 !default; width: auto; overflow: hidden; - button, - [button] { + button { display: block; padding: 1px; width: 100%; @@ -69,8 +68,7 @@ $action-menu-options-border-color: #d1d3d6 !default; } } - button.activated, - [button].activated { + button.activated { box-shadow: none; border-color: $action-menu-options-border-color; color: $action-menu-options-text-color; @@ -94,12 +92,11 @@ $action-menu-options-border-color: #d1d3d6 !default; background-color: #fff; overflow: hidden; - button, - [button] { + button { border-width: 1px 0px 0px 0px; } - button:first-child:last-child, - [button]:first-child:last-child { + + button:first-child:last-child { border-width: 0; } } @@ -108,21 +105,6 @@ $action-menu-options-border-color: #d1d3d6 !default; background: $action-menu-options-bg-color; } -.action-menu-cancel { - button, - [button] { - font-weight: 500; - } -} - -.action-menu-open { - pointer-events: none; - - &.modal-open .modal { - pointer-events: none; - } - - .action-menu-backdrop { - pointer-events: auto; - } +.action-menu-cancel button { + font-weight: 500; } diff --git a/ionic/components/action-menu/extensions/ios.scss b/ionic/components/action-menu/extensions/ios.scss index c93e4f25b1..2d9c85b126 100644 --- a/ionic/components/action-menu/extensions/ios.scss +++ b/ionic/components/action-menu/extensions/ios.scss @@ -57,7 +57,7 @@ $action-menu-ios-icon-font-size: 1.4em !default; background: $action-menu-ios-background-color; font-weight: 400; - @include hairline(bottom, $action-menu-ios-border-color); + border-bottom: 1px solid $action-menu-ios-border-color; } .action-menu-title { @@ -86,15 +86,11 @@ $action-menu-ios-icon-font-size: 1.4em !default; border-bottom-right-radius: $action-menu-ios-border-radius; } - .action-menu-container icon { - display: flex; - align-items: center; - position: absolute; - top: 0; - left: 0; - height: 100%; - padding: 0 10px 2px; - font-size: $action-menu-ios-icon-font-size; - } - +} + +.hairlines .action-menu[mode="ios"] { + .action-menu-title, + .action-menu-option { + border-bottom-width: 0.5px; + } } diff --git a/ionic/components/button/test/block/main.html b/ionic/components/button/test/block/main.html index ba97796b95..0a95f61edf 100644 --- a/ionic/components/button/test/block/main.html +++ b/ionic/components/button/test/block/main.html @@ -21,9 +21,4 @@

-

- a[button][block][full][danger] -