Skip to content

Commit

Permalink
fix(tokens): Update remaining branding items (#2942)
Browse files Browse the repository at this point in the history
* fix(page-header): Add border to page header card

* fix(buttons): use brand accessible token

* Update snapshots

* fix(tokens): Update remaining brand values from list
  • Loading branch information
brandonferrua authored Dec 11, 2017
1 parent ae7997c commit e2b4fef
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 19 deletions.
4 changes: 2 additions & 2 deletions design-tokens/salesforce-skin/box-shadow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ props:
comment: Shadow on images.
## PAGE HEADERS
PAGE_HEADER_SHADOW:
value: '0 2px 0 0 {!BLACK_TRANSPARENT_10}'
value: '0 2px 2px 0 {!BLACK_TRANSPARENT_10}'
comment: Hard dropshadow on page header
## CARDS
CARD_SHADOW:
value: '0 2px 0 0 {!BLACK_TRANSPARENT_10}'
value: '0 2px 2px 0 {!BLACK_TRANSPARENT_10}'
comment: Hard dropshadow found on outer cards
8 changes: 4 additions & 4 deletions test/__tests__/__snapshots__/layout_card.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ui/components/buttons/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
border-radius: $button-border-radius;
line-height: $line-height-button;
text-decoration: none;
color: $brand-text-link;
color: $brand-accessible;
// stylelint-disable property-no-vendor-prefix
-webkit-appearance: none;
// stylelint-enable property-no-vendor-prefix
Expand All @@ -62,15 +62,15 @@

&:hover,
&:focus {
color: $brand-text-link-active;
color: $brand-accessible-active;
}

&:focus {
@include focus-button;
}

&:active {
color: $brand-text-link-active;
color: $brand-accessible-active;
}

&[disabled] {
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ui/components/checkbox-button/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
height: rem(14px);
width: rem(2px);
margin: auto;
background: $brand-primary-active;
background: $brand-accessible;
}

&:after {
Expand Down
2 changes: 1 addition & 1 deletion ui/components/checkbox-toggle/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
~ .slds-checkbox--faux,
+ .slds-checkbox_faux_container .slds-checkbox_faux,
+ .slds-checkbox--faux_container .slds-checkbox--faux {
background-color: $color-background-toggle-active-hover;
background-color: $brand-accessible-active;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ui/components/checkbox/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
top: 50%;
left: 50%;
transform: translate3d(-50%, -50%, 0) rotate(-45deg);
border-bottom: $border-width-thick solid $brand-primary-active;
border-left: $border-width-thick solid $brand-primary-active;
border-bottom: $border-width-thick solid $brand-accessible;
border-left: $border-width-thick solid $brand-accessible;
}
}

Expand Down
1 change: 1 addition & 0 deletions ui/components/page-headers/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
background: $page-header-color-background;
background-clip: padding-box;
box-shadow: $page-header-shadow;
border: $border-width-thin solid $color-border;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ui/components/radio-group/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
left: 50%;
transform: translate3d(-50%, -50%, 0);
border-radius: $border-radius-circle;
background: $brand-accessible-active;
background: $brand-accessible;
}
}

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit e2b4fef

Please sign in to comment.