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

refactor(tabs): fix undefined sass variables

Browse Source
This commit is contained in:
Brandy Carney
2016-07-28 23:35:06 -05:00
parent af01841c86
commit cab7b0d8b5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/tabs/tabs.ios.scss
View File

@ -100,7 +100,7 @@ ion-tabs[tabsPlacement=top] ion-tabbar {
[tabsLayout=icon-hide] .tab-button, [tabsLayout=icon-hide] .tab-button,
.tab-button.has-title-only { .tab-button.has-title-only {
min-height: $tabs-ios-height - 8; min-height: $tabs-ios-tab-min-height - 8;
.tab-button-text { .tab-button-text {
margin: 2px 0; margin: 2px 0;
@ -112,7 +112,7 @@ ion-tabs[tabsPlacement=top] ion-tabbar {
[tabsLayout=title-hide] .tab-button, [tabsLayout=title-hide] .tab-button,
.tab-button.icon-only { .tab-button.icon-only {
min-height: $tabs-ios-height - 8; min-height: $tabs-ios-tab-min-height - 8;
} }
&.hairlines ion-tabs { &.hairlines ion-tabs {

14
src/components/tabs/tabs.wp.scss
View File

@ -13,12 +13,6 @@ $tabs-wp-tab-padding: 12px 10px 5px 10px !default;
// Min height of the tab button // Min height of the tab button
$tabs-wp-tab-min-height: 4.8rem !default; $tabs-wp-tab-min-height: 4.8rem !default;
// Border on the inactive tab button (border-top when [tabsPlacement=bottom] and border-bottom when [tabsPlacement=top])
$tabs-wp-tab-border: 2px solid transparent !default;
// Border color on the active tab button (border-top when [tabsPlacement=bottom] and border-bottom when [tabsPlacement=top])
$tabs-wp-tab-border-color-active: $tabs-wp-tab-color-active !default;
// Font size of the tab button text // Font size of the tab button text
$tabs-wp-tab-font-size: 1.2rem !default; $tabs-wp-tab-font-size: 1.2rem !default;
@ -29,11 +23,17 @@ $tabs-wp-tab-font-weight: normal !default;
$tabs-wp-tab-opacity: .7 !default; $tabs-wp-tab-opacity: .7 !default;
// Text color of the inactive tab button // Text color of the inactive tab button
$tabs-wp-tab-color: rgba($toolbar-wp-color, $tabs-wp-tab-opacity) !default; $tabs-wp-tab-color: rgba($toolbar-wp-inactive-color, $tabs-wp-tab-opacity) !default;
// Text color of the active tab button // Text color of the active tab button
$tabs-wp-tab-color-active: $toolbar-wp-active-color !default; $tabs-wp-tab-color-active: $toolbar-wp-active-color !default;
// Border on the inactive tab button (border-top when [tabsPlacement=bottom] and border-bottom when [tabsPlacement=top])
$tabs-wp-tab-border: 2px solid transparent !default;
// Border color on the active tab button (border-top when [tabsPlacement=bottom] and border-bottom when [tabsPlacement=top])
$tabs-wp-tab-border-color-active: $tabs-wp-tab-color-active !default;
// Background of the tab button when pressed // Background of the tab button when pressed
$tabs-wp-tab-background-activated: rgba(0, 0, 0, .1) !default; $tabs-wp-tab-background-activated: rgba(0, 0, 0, .1) !default;