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

update tab-icon attributes

Browse Source
This commit is contained in:
Adam Bradley
2015-08-31 21:49:41 -05:00
parent c0778b0199
commit 3157f2ff66
5 changed files with 37 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ionic/components/app/test/sink/pages/tabs.ts
View File

@@ -66,10 +66,10 @@ class UpdatesTabPage {
<ion-navbar *navbar><ion-nav-items primary><button icon (^click)="toggleMenu()"><i class="icon ion-navicon"></i></button></ion-nav-items><ion-title>Tabs</ion-title></ion-navbar>
<ion-tabs id="tabs">
<ion-tab tab-title="Featured" tab-icon="ion-ios-star" [root]="featuredTab"></ion-tab>
<ion-tab tab-title="Top Charts" tab-icon="ion-ios-list-outline" [root]="topTab"></ion-tab>
<ion-tab tab-title="Search" tab-icon="ion-ios-search" [root]="searchTab"></ion-tab>
<ion-tab tab-title="Updates" tab-icon="ion-ios-download-outline" [root]="updatesTab"></ion-tab>
<ion-tab tab-title="Featured" tab-icon="star" [root]="featuredTab"></ion-tab>
<ion-tab tab-title="Top Charts" tab-icon="stats" [root]="topTab"></ion-tab>
<ion-tab tab-title="Search" tab-icon="search" [root]="searchTab"></ion-tab>
<ion-tab tab-title="Updates" tab-icon="cloud-download" [root]="updatesTab"></ion-tab>
</ion-tabs>
`
})

26
ionic/components/app/test/yerk/tabs.html
View File

@@ -1,23 +1,7 @@
<ion-tabs id="tabs">
<ion-tab tab-title="Home" tab-icon="ion-earth" [root]="homeTab"></ion-tab>
<ion-tab tab-title="Peek" tab-icon="ion-ios-glasses" [root]="peekTab"></ion-tab>
<ion-tab tab-title="Me" tab-icon="ion-ios-person">
</ion-tab>
<ion-tab tab-title="More" tab-icon="ion-ios-more">
</ion-tab>
<ion-tab tab-title="Home" tab-icon="globe" [root]="homeTab"></ion-tab>
<ion-tab tab-title="Peek" tab-icon="glasses" [root]="peekTab"></ion-tab>
<ion-tab tab-title="Me" tab-icon="person"></ion-tab>
<ion-tab tab-title="More" tab-icon="more-horizontal"></ion-tab>
</ion-tabs>
<!--
<ion-tab tab-title="Home" tab-icon="ion-earth"></ion-tab>
<ion-tab tab-title="Peek" tab-icon="ion-ios-glasses">
<ion-content class="padding">
</ion-content>
</ion-tab>
<ion-tab tab-title="Me" tab-icon="ion-ios-person">
<ion-content class="padding">
</ion-content>
</ion-tab>
<ion-tab tab-title="More" tab-icon="ion-ios-more">
<ion-content class="padding">
</ion-content>
</ion-tab>
-->

4
ionic/components/list/modes/material.scss
View File

@@ -44,6 +44,8 @@ $list-md-header-color: #858585 !default;
.item:first-child {
margin-top: 0;
border-top-right-radius: $list-inset-md-border-radius;
border-top-left-radius: $list-inset-md-border-radius;
&:before {
border-top: none;
@@ -52,6 +54,8 @@ $list-md-header-color: #858585 !default;
.item:last-child {
margin-bottom: 0;
border-bottom-right-radius: $list-inset-md-border-radius;
border-bottom-left-radius: $list-inset-md-border-radius;
&:after {
border-top: none;

6
ionic/components/tabs/test/advanced/tabs.html
View File

@@ -1,6 +1,6 @@
<ion-tabs>
<ion-tab tab-title="Heart" tab-icon="ion-ios-heart-outline" [root]="tab1Root"></ion-tab>
<ion-tab tab-title="Star" tab-icon="ion-ios-star-outline" [root]="tab2Root"></ion-tab>
<ion-tab tab-title="Stopwatch" tab-icon="ion-ios-stopwatch-outline" [root]="tab3Root"></ion-tab>
<ion-tab tab-title="Heart" tab-icon="heart" [root]="tab1Root"></ion-tab>
<ion-tab tab-title="Star" tab-icon="star" [root]="tab2Root"></ion-tab>
<ion-tab tab-title="Stopwatch" tab-icon="stopwatch" [root]="tab3Root"></ion-tab>
</ion-tabs>

42
ionic/components/tabs/test/tab-bar-scenarios/main.html
View File

@@ -1,41 +1,41 @@
<ion-tabs>
<ion-tab tab-title="Heart" tab-icon="ion-ios-heart-outline"></ion-tab>
<ion-tab tab-title="Star" tab-icon="ion-ios-star-outline"></ion-tab>
<ion-tab tab-title="Stopwatch" tab-icon="ion-ios-stopwatch-outline"></ion-tab>
<ion-tab tab-title="Gear" tab-icon="ion-ios-gear-outline"></ion-tab>
<ion-tab tab-title="Heart" tab-icon="heart"></ion-tab>
<ion-tab tab-title="Star" tab-icon="star"></ion-tab>
<ion-tab tab-title="Stopwatch" tab-icon="stopwatch"></ion-tab>
<ion-tab tab-title="Settings" tab-icon="settings"></ion-tab>
</ion-tabs>
<ion-tabs tab-bar-icons="bottom">
<ion-tab tab-title="Heart" tab-icon="ion-ios-heart-outline"></ion-tab>
<ion-tab tab-title="Star" tab-icon="ion-ios-star-outline"></ion-tab>
<ion-tab tab-title="Stopwatch" tab-icon="ion-ios-stopwatch-outline"></ion-tab>
<ion-tab tab-title="Gear" tab-icon="ion-ios-gear-outline"></ion-tab>
<ion-tab tab-title="Heart" tab-icon="heart"></ion-tab>
<ion-tab tab-title="Star" tab-icon="star"></ion-tab>
<ion-tab tab-title="Stopwatch" tab-icon="stopwatch"></ion-tab>
<ion-tab tab-title="Settings" tab-icon="settings"></ion-tab>
</ion-tabs>
<ion-tabs tab-bar-icons="right">
<ion-tab tab-title="Heart" tab-icon="ion-ios-heart-outline"></ion-tab>
<ion-tab tab-title="Star" tab-icon="ion-ios-star-outline"></ion-tab>
<ion-tab tab-title="Stopwatch" tab-icon="ion-ios-stopwatch-outline"></ion-tab>
<ion-tab tab-title="Gear" tab-icon="ion-ios-gear-outline"></ion-tab>
<ion-tab tab-title="Heart" tab-icon="heart"></ion-tab>
<ion-tab tab-title="Star" tab-icon="star"></ion-tab>
<ion-tab tab-title="Stopwatch" tab-icon="stopwatch"></ion-tab>
<ion-tab tab-title="Settings" tab-icon="settings"></ion-tab>
</ion-tabs>
<ion-tabs tab-bar-icons="left">
<ion-tab tab-title="Heart" tab-icon="ion-ios-heart-outline"></ion-tab>
<ion-tab tab-title="Star" tab-icon="ion-ios-star-outline"></ion-tab>
<ion-tab tab-title="Stopwatch" tab-icon="ion-ios-stopwatch-outline"></ion-tab>
<ion-tab tab-title="Gear" tab-icon="ion-ios-gear-outline"></ion-tab>
<ion-tab tab-title="Heart" tab-icon="heart"></ion-tab>
<ion-tab tab-title="Star" tab-icon="star"></ion-tab>
<ion-tab tab-title="Stopwatch" tab-icon="stopwatch"></ion-tab>
<ion-tab tab-title="Settings" tab-icon="settings"></ion-tab>
</ion-tabs>
<ion-tabs>
<ion-tab tab-icon="ion-ios-heart-outline"></ion-tab>
<ion-tab tab-icon="ion-ios-star-outline"></ion-tab>
<ion-tab tab-icon="ion-ios-stopwatch-outline"></ion-tab>
<ion-tab tab-icon="ion-ios-gear-outline"></ion-tab>
<ion-tab tab-icon="heart"></ion-tab>
<ion-tab tab-icon="star"></ion-tab>
<ion-tab tab-icon="stopwatch"></ion-tab>
<ion-tab tab-icon="settings"></ion-tab>
</ion-tabs>
@@ -43,7 +43,7 @@
<ion-tab tab-title="Heart"></ion-tab>
<ion-tab tab-title="Star"></ion-tab>
<ion-tab tab-title="Stopwatch"></ion-tab>
<ion-tab tab-title="Gear"></ion-tab>
<ion-tab tab-title="Settings"></ion-tab>
</ion-tabs>