diff --git a/ionic/components/toolbar/modes/ios.scss b/ionic/components/toolbar/modes/ios.scss index 05175cad78..ffb070d458 100644 --- a/ionic/components/toolbar/modes/ios.scss +++ b/ionic/components/toolbar/modes/ios.scss @@ -4,9 +4,10 @@ $toolbar-order-ios: ( back-button: 10, - menu-toggle: 20, + menu-toggle-primary: 20, primary: 30, - secondary: 50 + secondary: 50, + menu-toggle-secondary: 60, ); $toolbar-ios-height: 4.4rem !default; @@ -21,10 +22,14 @@ $toolbar-ios-title-font-size: 1.7rem !default; min-height: $toolbar-ios-height; [menu-toggle] { - order: map-get($toolbar-order-ios, 'menu-toggle'); + order: map-get($toolbar-order-ios, menu-toggle-primary); cursor: pointer; } + [menu-toggle][secondary] { + order: map-get($toolbar-order-ios, menu-toggle-secondary); + } + button, [button] { margin-top: 0; diff --git a/ionic/components/toolbar/toolbar.scss b/ionic/components/toolbar/toolbar.scss index 38a89c3d1c..8dd473f512 100644 --- a/ionic/components/toolbar/toolbar.scss +++ b/ionic/components/toolbar/toolbar.scss @@ -6,10 +6,11 @@ $toolbar-padding: 4px !default; $toolbar-order: ( backButton: 10, - menu-toggle: 20, + menu-toggle-primary: 20, title: 30, primary: 40, - secondary: 50 + secondary: 50, + menu-toggle-secondary: 60, ); @@ -47,7 +48,7 @@ $toolbar-order: ( background-color: transparent; } -.toolbar[position="bottom"] { +.toolbar[position=bottom] { order: $flex-order-toolbar-bottom; } @@ -79,10 +80,14 @@ ion-title { margin: 0 6px; padding: 0; min-width: 36px; - order: map-get($toolbar-order, 'menu-toggle'); + order: map-get($toolbar-order, menu-toggle-primary); box-shadow: none; } +.toolbar [menu-toggle][secondary] { + order: map-get($toolbar-order, menu-toggle-secondary); +} + .toolbar [menu-toggle] icon { padding: 0 6px; font-size: 2.8rem;