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

toolbar buttons e2e

Browse Source
This commit is contained in:
Adam Bradley
2015-07-22 11:51:08 -05:00
parent ba6cc11bc1
commit cb06c5580a
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ button,
will-change: transform; will-change: transform;
margin: $button-margin; margin: $button-margin;
line-height: 1; line-height: 1.1;
@include appearance(none); @include appearance(none);

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

@ -3,7 +3,7 @@
// -------------------------------------------------- // --------------------------------------------------
$toolbar-material-title-font-size: 2rem !default; $toolbar-material-title-font-size: 2rem !default;
$toolbar-material-button-font-size: 24px !default; $toolbar-material-button-font-size: 1.8rem !default;
.toolbar[mode="md"] { .toolbar[mode="md"] {

10
ionic/components/toolbar/test/scenarios/main.html
View File

@ -14,15 +14,17 @@
<ion-toolbar><ion-nav-items primary><button primary>Btn</button></ion-nav-items><ion-title>Title</ion-title><ion-nav-items secondary><button secondary>Btn</button><button secondary>Btn</button><button secondary>Btn</button></ion-nav-items></ion-toolbar> <ion-toolbar><ion-nav-items primary><button primary>Btn</button></ion-nav-items><ion-title>Title</ion-title><ion-nav-items secondary><button secondary>Btn</button><button secondary>Btn</button><button secondary>Btn</button></ion-nav-items></ion-toolbar>
<ion-toolbar><ion-nav-items primary><button><icon name="ion-navicon"></icon></button><button><icon name="ion-heart"></icon></button></ion-nav-items><ion-nav-items secondary><button><icon name="ion-home"></icon></button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar> <ion-toolbar><ion-nav-items primary><button><icon name="ion-navicon"></icon></button><button><icon name="ion-heart"></icon></button></ion-nav-items><ion-nav-items secondary><button><icon name="ion-ionic"></icon></button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
<ion-toolbar><ion-nav-items primary><button primary><icon name="ion-navicon"></icon></button primary><button primary><icon name="ion-star"></icon></button></ion-nav-items><ion-nav-items secondary><button secondary><icon name="ion-ionic"></icon></button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
<ion-toolbar><ion-nav-items primary><button primary outline><icon name="ion-navicon"></icon></button primary><button primary outline><icon name="ion-star"></icon></button></ion-nav-items><ion-nav-items secondary><button secondary outline><icon name="ion-flag"></icon></button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar> <ion-toolbar><ion-nav-items primary><button primary outline><icon name="ion-navicon"></icon></button primary><button primary outline><icon name="ion-star"></icon></button></ion-nav-items><ion-nav-items secondary><button secondary outline><icon name="ion-flag"></icon></button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
<ion-toolbar><ion-nav-items primary><button><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar> <ion-toolbar><ion-nav-items primary><button clear primary><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-title>Title</ion-title><ion-nav-items secondary><button clear secondary><icon name="ion-help-circled"></icon>Help</button></ion-nav-items></ion-toolbar>
<ion-toolbar><ion-nav-items primary><button primary><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-nav-items secondary><button primary><icon name="ion-help-circled"></icon>Help</button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
<style> <style>

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

@ -11,10 +11,19 @@
margin: 0 4px; margin: 0 4px;
padding: 0 4px; padding: 0 4px;
min-width: 3.2rem; min-width: 2.8rem;
min-height: 2.8rem; min-height: 2.8rem;
box-shadow: none; box-shadow: none;
&[clear] {
padding: 0;
}
}
icon {
font-size: 2.4rem;
padding: 0 4px;
} }
} }