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

fix(toolbar/tabs): change toolbar-background to use the background property

Browse Source 
Renamed Sass variables for toolbar and tabbar to use just background,
not color. Closes #716
This commit is contained in:
Brandy Carney
2015-12-10 11:02:38 -05:00
parent 5793716b67
commit 901508e035
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
// iOS Tabs
// --------------------------------------------------
$tabbar-ios-background-color: $toolbar-ios-background-color !default;
$tabbar-ios-background: $toolbar-ios-background !default;
$tabbar-ios-item-padding: 0px 10px !default;
$tabbar-ios-item-font-size: 10px !default;
$tabbar-ios-item-icon-size: 32px !default;
@@ -18,7 +18,7 @@ $tab-button-ios-inactive-color: $toolbar-ios-inactive-color !default;
tabbar {
border-top: 1px solid $toolbar-ios-border-color;
background: $tabbar-ios-background-color;
background: $tabbar-ios-background;
}
ion-tabs[tabbar-placement=top] tabbar {

4
ionic/components/tabs/tabs.md.scss
View File

@@ -4,7 +4,7 @@
// Material Design Tabs
// --------------------------------------------------
$tabbar-md-background-color: $toolbar-md-background-color !default;
$tabbar-md-background: $toolbar-md-background !default;
$tabbar-md-item-padding: 12px 10px 5px 10px !default;
$tabbar-md-item-font-size: 1.4rem !default;
$tabbar-md-item-font-weight: 500 !default;
@@ -16,7 +16,7 @@ $tab-button-md-inactive-color: $toolbar-md-inactive-color !default;
tabbar {
background: $tabbar-md-background-color;
background: $tabbar-md-background;
}

4
ionic/components/toolbar/toolbar.ios.scss
View File

@@ -43,7 +43,7 @@ ion-navbar-section {
border-bottom-width: 1px;
border-bottom-style: solid;
border-color: $toolbar-ios-border-color;
background-color: $toolbar-ios-background-color;
background: $toolbar-ios-background;
}
&.hairlines .toolbar-background {
@@ -82,7 +82,7 @@ ion-title {
.toolbar[#{$color-name}] {
.toolbar-background {
background-color: $color-value;
background: $color-value;
border-color: darken($color-value, 10%);
}

6
ionic/components/toolbar/toolbar.md.scss
View File

@@ -41,7 +41,7 @@ ion-navbar-section {
.toolbar-background {
border-color: $toolbar-md-border-color;
background-color: $toolbar-md-background-color;
background: $toolbar-md-background;
}
@@ -67,7 +67,7 @@ ion-title {
.toolbar[#{$color-name}] {
.toolbar-background {
background-color: $color-value;
background: $color-value;
}
.toolbar-title,
@@ -112,7 +112,7 @@ ion-buttons[right] {
margin-top: 0;
margin-bottom: 0;
margin-left: 0.2rem;
margin-right: 0.2rem;
margin-right: 0.2rem;
padding: 0 5px;
min-height: 32px;
border: 0;