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

toolbar fixes

Browse Source
This commit is contained in:
Adam Bradley
2015-04-20 14:01:00 -05:00
parent 128c4250c5
commit 39fa99b431
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/tabs/tabs.scss
View File

@ -2,7 +2,7 @@
// Tabs // Tabs
// -------------------------------------------------- // --------------------------------------------------
$tab-bar-min-height: 66px !default; $tab-bar-min-height: 10px !default;
$tab-bar-background-color: #f7f7f8 !default; $tab-bar-background-color: #f7f7f8 !default;
$tab-bar-item-padding: 10px !default; $tab-bar-item-padding: 10px !default;

12
src/components/tabs/test/advanced/pages/sign-in.html
View File

@ -1,4 +1,4 @@
<ion-view nav-title="Toolbar Instance: {{ instanceVal }}"> <ion-view nav-title="Sign In">
<ion-nav-items side="primary"> <ion-nav-items side="primary">
<button class="button" (click)="instanceCheck()"> <button class="button" (click)="instanceCheck()">
@ -8,21 +8,15 @@
<ion-content class="padding"> <ion-content class="padding">
<p>
Content Instance: {{ instanceVal }}
</p>
<p> <p>
<button class="button button-primary" (click)="signIn()"> <button class="button button-primary" (click)="signIn()">
Sign In Sign In
</button> </button>
</p> <button class="button button-primary button-outline" (click)="instanceCheck()">
<p>
<button class="button" (click)="instanceCheck()">
<icon class="ion-star"></icon> <icon class="ion-star"></icon>
</button> </button>
</p> </p>
<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f> <f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>
</ion-content> </ion-content>

1
src/components/view/view.js
View File

@ -59,6 +59,7 @@ export class View {
if (!navViewportEle) return if (!navViewportEle) return
var toolbarContainer = navViewportEle.querySelector('.toolbar-container') var toolbarContainer = navViewportEle.querySelector('.toolbar-container')
if (!toolbarContainer) return
toolbarContainer.appendChild(toolbar) toolbarContainer.appendChild(toolbar)
}) })