Skip to content

Commit

Permalink
fix: updated deprecated tokens
Browse files Browse the repository at this point in the history
  • Loading branch information
GarthDB committed Aug 20, 2020
1 parent 70dd116 commit 1286203
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 14 deletions.
35 changes: 24 additions & 11 deletions components/accordion/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,17 @@ governing permissions and limitations under the License.
--spectrum-accordion-icon-height: 10px;

/* Subtract the size of the border since it's on the item itself */
--spectrum-accordion-item-height-actual: calc(var(--spectrum-accordion-item-height) - var(--spectrum-accordion-item-border-size));
--spectrum-accordion-item-title-tracking-actual: calc(var(--spectrum-accordion-item-title-tracking) / 100);

--spectrum-accordion-item-title-padding-y: var(--spectrum-global-dimension-size-150);
--spectrum-accordion-item-height-actual: calc(
var(--spectrum-accordion-item-height) -
var(--spectrum-accordion-item-border-size)
);
--spectrum-accordion-item-title-tracking-actual: calc(
var(--spectrum-accordion-item-title-tracking) / 100
);

--spectrum-accordion-item-title-padding-y: var(
--spectrum-global-dimension-size-150
);
--spectrum-accordion-item-line-height: 1.3;
}

Expand All @@ -34,8 +41,11 @@ governing permissions and limitations under the License.
display: block;

position: absolute;
inset-inline-start: var(--spectrum-accordion-icon-spacing);
inset-block-start: calc(var(--spectrum-accordion-item-height-actual) / 2 - var(--spectrum-accordion-icon-height) / 2);
inset-inline-start: var(--spectrum-accordion-icon-gap);
inset-block-start: calc(
var(--spectrum-accordion-item-height-actual) / 2 -
var(--spectrum-accordion-icon-height) / 2
);

transition: transform ease var(--spectrum-global-animation-duration-100);

Expand All @@ -52,7 +62,8 @@ governing permissions and limitations under the License.
border-block-end: var(--spectrum-accordion-item-border-size) solid transparent;

&:first-of-type {
border-block-start: var(--spectrum-accordion-item-border-size) solid transparent;
border-block-start: var(--spectrum-accordion-item-border-size) solid
transparent;
}
}

Expand All @@ -70,7 +81,8 @@ governing permissions and limitations under the License.
box-sizing: border-box;
/* left padding takes into account the icon's size as well as the focus state's left border */
padding-block: var(--spectrum-accordion-item-title-padding-y);
padding-inline: calc(calc(var(--spectrum-accordion-item-padding) * 2) + 2px) var(--spectrum-accordion-item-padding);
padding-inline: calc(calc(var(--spectrum-accordion-item-padding-x) * 2) + 2px)
var(--spectrum-accordion-item-padding-x);
margin: 0;

min-block-size: var(--spectrum-accordion-item-height-actual);
Expand Down Expand Up @@ -98,21 +110,22 @@ governing permissions and limitations under the License.
outline: none;

&::after {
content: '';
content: "";

position: absolute;
inset-inline-start: 0;
inset-block-start: calc(-1 * var(--spectrum-accordion-item-border-size));
inset-block-end: calc(-1 * var(--spectrum-accordion-item-border-size));

inline-size: var(--spectrum-accordion-item-border-size-key-focus);
inline-size: var(--spectrum-accordion-item-border-left-size-key-focus);
}
}
}

.spectrum-Accordion-itemContent {
padding-block: 0 var(--spectrum-accordion-item-content-padding);
padding-inline: var(--spectrum-accordion-item-content-padding) var(--spectrum-accordion-item-content-padding);
padding-inline: var(--spectrum-accordion-item-content-padding)
var(--spectrum-accordion-item-content-padding);
display: none;
}

Expand Down
6 changes: 4 additions & 2 deletions components/accordion/skin.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ governing permissions and limitations under the License.
}

&:focus-ring {
&:after {
background-color: var(--spectrum-accordion-border-left-color-key-focus);
&:after {
background-color: var(
--spectrum-accordion-item-border-left-color-key-focus
);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion components/divider/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@spectrum-css/button": "^3.0.0-beta.3",
"@spectrum-css/buttongroup": "^3.0.0-beta.3",
"@spectrum-css/component-builder": "^1.2.0",
"@spectrum-css/vars": "^1.0.0-alpha.0",
"@spectrum-css/vars": "^2.3.0",
"gulp": "^4.0.0"
},
"publishConfig": {
Expand Down

0 comments on commit 1286203

Please sign in to comment.