javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

md aside-toggle updates

Browse Source
This commit is contained in:
Adam Bradley
2015-09-03 10:26:56 -05:00
parent d669f2c51b
commit 8a4dedecdd
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ionic/components/aside/test/basic/page2.html
View File

@ -1,11 +1,9 @@
<ion-navbar *navbar> <ion-navbar *navbar>
<ion-nav-items primary> <button aside-toggle id="e2eHeaderToggleAside">
<button aside-toggle id="e2eHeaderToggleAside"> <icon menu></icon>
<icon menu></icon> </button>
</button>
</ion-nav-items>
<ion-title> <ion-title>
Aside Aside

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

@ -20,7 +20,7 @@ $toolbar-md-button-font-size: 1.4rem !default;
font-weight: 500; font-weight: 500;
} }
.toolbar-primary-item ion-nav-items button:first-child { .toolbar-primary-item button:first-child {
margin-left: 0; margin-left: 0;
} }
@ -33,4 +33,15 @@ $toolbar-md-button-font-size: 1.4rem !default;
box-shadow: none; box-shadow: none;
} }
[aside-toggle],
[aside-toggle].activated {
margin: -$toolbar-padding 0 -$toolbar-padding -$toolbar-padding;
padding-bottom: $toolbar-padding / 2;
height: $toolbar-md-height;
}
[aside-toggle] icon {
padding: 0 33px 0 20px;
}
} }

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

@ -2,6 +2,8 @@
// Toolbar // Toolbar
// -------------------------------------------------- // --------------------------------------------------
$toolbar-padding: 4px !default;
$toolbar-order: ( $toolbar-order: (
backButton: 10, backButton: 10,
aside-toggle: 20, aside-toggle: 20,
@ -15,9 +17,6 @@ $toolbar-order: (
position: relative; position: relative;
z-index: $z-index-toolbar; z-index: $z-index-toolbar;
width: 100%;
padding: 4px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
@ -25,6 +24,9 @@ $toolbar-order: (
order: $flex-order-toolbar-top; order: $flex-order-toolbar-top;
flex: 0; flex: 0;
padding: $toolbar-padding;
width: 100%;
border: 0; border: 0;
border-color: $toolbar-border-color; border-color: $toolbar-border-color;
background-color: $toolbar-background-color; background-color: $toolbar-background-color;