javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(menu-toggle): right side alignment

Browse Source
This commit is contained in:
Adam Bradley
2015-09-22 11:30:06 -05:00
parent 3bd0b5c8ac
commit 3b7d261290
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ionic/components/toolbar/modes/ios.scss
View File

@@ -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;

13
ionic/components/toolbar/toolbar.scss
View File

@@ -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;