Skip to content

Commit

Permalink
Merge pull request #2517 from Shopify/color-system/hotfix
Browse files Browse the repository at this point in the history
[Color system] fix use of divider that was missed in the change from divider to border
  • Loading branch information
danrosenthal authored Dec 5, 2019
2 parents e745d59 + f9cf16a commit d27aea0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/components/Frame/components/Loading/Loading.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $height: rem(3px);
width: 100%;
height: 100%;
transform-origin: 0;
background-color: var(--p-highlight-divider, color('teal'));
background-color: var(--p-highlight-border, color('teal'));
transition: transform duration(slowest) easing(out);

@media screen and (-ms-high-contrast: active) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/TextStyle/TextStyle.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $code-font-size: 1.15em;
background-color: var(--p-surface-foreground-subdued, color('sky', 'light'));
display: inline-block;
font-size: $code-font-size;
box-shadow: inset 0 0 0 1px var(--p-divider-subdued-on-surface, color('sky'));
box-shadow: inset 0 0 0 1px var(--p-border-subdued-on-surface, color('sky'));

&::after {
content: '';
Expand Down

0 comments on commit d27aea0

Please sign in to comment.