Skip to content

Commit

Permalink
refactor(sass): rename bg to background in all sass variables
Browse files Browse the repository at this point in the history
BREAKING CHANGE:

`$item-ios-divider-bg` is now `$item-ios-divider-background`
`$item-ios-sliding-content-bg` is now
`$item-ios-sliding-content-background`

`$item-md-divider-bg` is now `$item-md-divider-background`
`$item-md-sliding-content-bg` is now
`$item-md-sliding-content-background`

`$item-wp-divider-bg` is now `$item-wp-divider-background`
`$item-wp-sliding-content-bg` is now
`$item-wp-sliding-content-background`

references #5651
  • Loading branch information
brandyscarney committed Mar 10, 2016
1 parent bf3f016 commit fe256c7
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions ionic/components/item/item.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ $item-ios-thumbnail-size: 5.6rem !default;
$item-ios-note-color: darken($list-ios-border-color, 10%) !default;
$item-ios-detail-push-color: $list-ios-border-color !default;

$item-ios-divider-bg: #f7f7f7 !default;
$item-ios-divider-background: #f7f7f7 !default;
$item-ios-divider-color: #222 !default;
$item-ios-divider-padding: 5px 15px !default;

$item-ios-sliding-content-bg: $list-ios-background-color !default;
$item-ios-sliding-content-background: $list-ios-background-color !default;


// iOS Item
Expand Down Expand Up @@ -188,7 +188,7 @@ ion-item-group {
ion-item-divider {
padding: $item-ios-padding-top $item-ios-padding-right $item-ios-padding-bottom $item-ios-padding-left;
color: $item-ios-divider-color;
background-color: $item-ios-divider-bg;
background-color: $item-ios-divider-background;
}


Expand All @@ -207,7 +207,7 @@ ion-item-divider {
// --------------------------------------------------

ion-item-sliding {
background-color: $item-ios-sliding-content-bg;
background-color: $item-ios-sliding-content-background;
}

// iOS item right-to-left
Expand Down
8 changes: 4 additions & 4 deletions ionic/components/item/item.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ $item-md-avatar-size: 4rem !default;
$item-md-thumbnail-size: 8rem !default;
$item-md-note-color: darken($list-md-border-color, 10%) !default;

$item-md-divider-bg: #fff !default;
$item-md-divider-background: #fff !default;
$item-md-divider-color: #222 !default;
$item-md-divider-padding: 5px 15px !default;

$item-md-sliding-content-bg: $list-md-background-color !default;
$item-md-sliding-content-background: $list-md-background-color !default;


.item {
Expand Down Expand Up @@ -149,7 +149,7 @@ ion-note {

ion-item-divider {
padding: $item-md-padding-top $item-md-padding-right $item-md-padding-bottom $item-md-padding-left;
background-color: $item-md-divider-bg;
background-color: $item-md-divider-background;
color: $item-md-divider-color;
}

Expand All @@ -169,5 +169,5 @@ ion-item-divider {
// --------------------------------------------------

ion-item-sliding {
background-color: $item-md-sliding-content-bg;
background-color: $item-md-sliding-content-background;
}
8 changes: 4 additions & 4 deletions ionic/components/item/item.wp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ $item-wp-avatar-size: 4rem !default;
$item-wp-thumbnail-size: 8rem !default;
$item-wp-note-color: $input-wp-border-color !default;

$item-wp-divider-bg: #fff !default;
$item-wp-divider-background: #fff !default;
$item-wp-divider-color: #222 !default;
$item-wp-divider-padding: 5px 15px !default;

$item-wp-sliding-content-bg: $list-wp-background-color !default;
$item-wp-sliding-content-background: $list-wp-background-color !default;


.item {
Expand Down Expand Up @@ -155,7 +155,7 @@ ion-note {

ion-item-divider {
padding: $item-wp-padding-top $item-wp-padding-right $item-wp-padding-bottom $item-wp-padding-left;
background-color: $item-wp-divider-bg;
background-color: $item-wp-divider-background;
color: $item-wp-divider-color;
}

Expand All @@ -175,5 +175,5 @@ ion-item-divider {
// --------------------------------------------------

ion-item-sliding {
background-color: $item-wp-sliding-content-bg;
background-color: $item-wp-sliding-content-background;
}
2 changes: 1 addition & 1 deletion ionic/themes/dark.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $list-ios-activated-background-color: #d9d9d9 !default;
// iOS List header
// --------------------------------------------------
$list-ios-header-color: $text-color !default;
$item-ios-divider-bg: #151515 !default;
$item-ios-divider-background: #151515 !default;
$item-ios-divider-color: $text-color !default;

ion-list-header {
Expand Down
2 changes: 1 addition & 1 deletion ionic/themes/dark.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ $item-md-padding-media-top: 9px !default;
$item-md-padding-media-bottom: 9px !default;
$item-md-padding-icon-top: 11px !default;
$item-md-padding-icon-bottom: 10px !default;
$item-md-divider-bg: #151515 !default;
$item-md-divider-background: #151515 !default;
$item-md-divider-color: map-get($colors-md, light) !default;

// Material Design Toggle
Expand Down
2 changes: 1 addition & 1 deletion ionic/themes/dark.wp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ $item-wp-padding-media-top: 9px !default;
$item-wp-padding-media-bottom: 9px !default;
$item-wp-padding-icon-top: 11px !default;
$item-wp-padding-icon-bottom: 10px !default;
$item-wp-divider-bg: #151515 !default;
$item-wp-divider-background: #151515 !default;
$item-wp-divider-color: map-get($colors-wp, light) !default;


Expand Down

0 comments on commit fe256c7

Please sign in to comment.