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

refactor(menu-toggle): use .bar-button-menu-toggle and not attr

Browse Source
This commit is contained in:
Adam Bradley
2015-12-08 14:28:40 -06:00
parent 8b0316cbb2
commit 470ac72b6a
4 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -274,17 +274,23 @@ ion-buttons[right] {
// iOS Toolbar Menu Toggle
// --------------------------------------------------
.toolbar {
[menu-toggle] {
order: map-get($toolbar-order-ios, menu-toggle-start);
}
.bar-button-menu-toggle {
margin: 0 6px;
padding: 0;
min-width: 36px;
order: map-get($toolbar-order-ios, menu-toggle-start);
[menu-toggle][end],
[menu-toggle][right] {
order: map-get($toolbar-order-ios, menu-toggle-end);
icon {
padding: 0 6px;
font-size: 2.8rem;
}
}
.bar-button-menu-toggle[end],
.bar-button-menu-toggle[right] {
order: map-get($toolbar-order-ios, menu-toggle-end);
}
// iOS Toolbar Color Generation
// --------------------------------------------------

27
ionic/components/toolbar/modes/md.scss
View File

@@ -258,22 +258,23 @@ ion-buttons[right] {
// Material Design Toolbar Menu Toggle
// --------------------------------------------------
.toolbar {
[menu-toggle],
[menu-toggle].activated {
padding: 0 2px;
min-width: 44px;
.bar-button-menu-toggle {
margin: 0 6px;
padding: 0 2px;
min-width: 44px;
order: map-get($toolbar-order-md, menu-toggle-start);
icon {
font-size: 2.4rem;
}
icon {
padding: 0 6px;
font-size: 2.4rem;
}
}
[menu-toggle][secondary],
[menu-toggle][secondary].activated {
margin: 0 2px;
min-width: 28px;
}
.bar-button-menu-toggle[end],
.bar-button-menu-toggle[right] {
margin: 0 2px;
min-width: 28px;
order: map-get($toolbar-order-md, menu-toggle-end);
}

11
ionic/components/toolbar/toolbar-button.scss
View File

@@ -33,18 +33,9 @@
// Menu Toggle
// --------------------------------------------------
.toolbar [menu-toggle] {
.bar-button-menu-toggle {
display: flex;
align-items: center;
margin: 0 6px;
padding: 0;
min-width: 36px;
box-shadow: none;
}
.toolbar [menu-toggle] icon {
padding: 0 6px;
font-size: 2.8rem;
}

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

@@ -65,7 +65,7 @@ ion-buttons div {
// TODO this is a temp hack to fix segment overlapping ion-nav-item
ion-buttons,
[menu-toggle] {
.bar-button-menu-toggle {
z-index: 99;
}