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

iOS tab icon updates

Browse Source
This commit is contained in:
Adam Bradley
2015-07-21 15:58:44 -05:00
parent 4a3f213f32
commit d74d5591e1
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/components/tabs/extensions/ios.scss
View File

@ -25,6 +25,10 @@ $tab-bar-ios-height: 50px !default;
min-height: $tab-bar-ios-item-font-size + 1; min-height: $tab-bar-ios-item-font-size + 1;
} }
.has-title-only .tab-button-text {
font-size: $tab-bar-ios-item-font-size + 2;
}
.tab-button-icon { .tab-button-icon {
font-size: $tab-bar-ios-item-icon-size; font-size: $tab-bar-ios-item-icon-size;
height: $tab-bar-ios-item-icon-size; height: $tab-bar-ios-item-icon-size;

5
ionic/components/tabs/extensions/material.scss
View File

@ -14,11 +14,6 @@ $tab-bar-md-item-font-size: 1.4rem !default;
box-shadow: none; box-shadow: none;
border-radius: 0; border-radius: 0;
white-space: normal;
}
.tab-button-text {
white-space: normal;
} }
} }

14
ionic/components/tabs/tabs.scss
View File

@ -85,6 +85,11 @@ button.tab-button {
.tab-button-icon { .tab-button-icon {
order: 10; order: 10;
} }
.tab-button-icon {
margin-top: 2px;
margin-bottom: 0;
}
} }
[tab-bar-icons="left"] > .tab-bar-container button.tab-button { [tab-bar-icons="left"] > .tab-bar-container button.tab-button {
@ -92,7 +97,7 @@ button.tab-button {
.tab-button-icon { .tab-button-icon {
text-align: right; text-align: right;
padding-right: 5px; padding-right: 8px;
} }
} }
@ -102,7 +107,7 @@ button.tab-button {
.tab-button-icon { .tab-button-icon {
order: 10; order: 10;
text-align: left; text-align: left;
padding-left: 5px; padding-left: 8px;
} }
} }
@ -125,6 +130,11 @@ button.tab-button {
display: block; display: block;
} }
.has-title-only,
.has-title-only .tab-button-text {
white-space: normal;
}
button.tab-button[aria-selected="true"] { button.tab-button[aria-selected="true"] {
// Default color is primary // Default color is primary
color: get-color(primary, base); color: get-color(primary, base);