diff --git a/components/tabs/index.css b/components/tabs/index.css index 91d1723cbf..e4c38d90b2 100644 --- a/components/tabs/index.css +++ b/components/tabs/index.css @@ -25,7 +25,8 @@ governing permissions and limitations under the License. z-index: 0; margin: 0; - padding: 0 var(--spectrum-tabs-focus-ring-padding-x); + padding-block: 0; + padding-inline: var(--spectrum-tabs-focus-ring-padding-x); /* Friends should align to the top of the tabs */ vertical-align: top; @@ -37,7 +38,7 @@ governing permissions and limitations under the License. box-sizing: border-box; - height: var(--spectrum-tabs-item-height); + block-size: var(--spectrum-tabs-item-height); line-height: var(--spectrum-tabs-item-height); /* Float above the tab line */ @@ -60,26 +61,26 @@ governing permissions and limitations under the License. .spectrum-Icon { /* Vertical centering */ - height: var(--spectrum-tabs-item-height); + block-size: var(--spectrum-tabs-item-height); & + .spectrum-Tabs-itemLabel { /* icons are inexplicably offset by 3px. Subtract this value from the icon-gap to correct the gap in CSS */ - margin-left: calc(var(--spectrum-tabs-icon-gap) - var(--spectrum-global-dimension-size-40)); + margin-inline-start: calc(var(--spectrum-tabs-icon-gap) - var(--spectrum-global-dimension-size-40)); } } &::before { content: ''; position: absolute; - top: 50%; + inset-block-start: 50%; box-sizing: border-box; - height: var(--spectrum-tabs-focus-ring-height); - margin-top: calc(calc(var(--spectrum-tabs-focus-ring-height) / -2) + calc(var(--spectrum-tabs-rule-height) / 2)); - left: calc(-1 * var(--spectrum-tabs-focus-ring-padding-x)); - right: calc(-1 * var(--spectrum-tabs-focus-ring-padding-x)); + block-size: var(--spectrum-tabs-focus-ring-height); + margin-block-start: calc(calc(var(--spectrum-tabs-focus-ring-height) / -2) + calc(var(--spectrum-tabs-rule-height) / 2)); + inset-inline-start: calc(-1 * var(--spectrum-tabs-focus-ring-padding-x)); + inset-inline-end: calc(-1 * var(--spectrum-tabs-focus-ring-padding-x)); border: var(--spectrum-tabs-focus-ring-size) solid transparent; border-radius: var(--spectrum-tabs-focus-ring-border-radius); @@ -103,7 +104,7 @@ governing permissions and limitations under the License. .spectrum-Tabs-selectionIndicator { position: absolute; - left: 0; + inset-inline-start: 0; /* Be below the tab */ z-index: 0; @@ -116,12 +117,12 @@ governing permissions and limitations under the License. .spectrum-Tabs--compact { .spectrum-Tabs-item { - height: var(--spectrum-tabs-compact-item-height); + block-size: var(--spectrum-tabs-compact-item-height); line-height: var(--spectrum-tabs-compact-item-height); .spectrum-Icon { /* Vertical centering */ - height: var(--spectrum-tabs-compact-item-height); + block-size: var(--spectrum-tabs-compact-item-height); } } } @@ -129,30 +130,30 @@ governing permissions and limitations under the License. .spectrum-Tabs--horizontal { align-items: center; - border-bottom: var(--spectrum-tabs-rule-height) solid; + border-block-end: var(--spectrum-tabs-rule-height) solid; .spectrum-Tabs-item { vertical-align: top; /* Target anything since React likes to add lots of happy
s around all things */ & + *:not(.spectrum-Tabs-selectionIndicator) { - margin-left: var(--spectrum-tabs-item-gap); + margin-inline-start: var(--spectrum-tabs-item-gap); } } .spectrum-Tabs-selectionIndicator { position: absolute; - bottom: 0; - height: var(--spectrum-tabs-rule-height); + inset-block-end: 0; + block-size: var(--spectrum-tabs-rule-height); - bottom: calc(-1 * var(--spectrum-tabs-rule-height)); + inset-block-end: calc(-1 * var(--spectrum-tabs-rule-height)); } &.spectrum-Tabs--compact { /* The ActionButton is taller than the tabs, so don't push tabs around */ box-sizing: content-box; - height: var(--spectrum-tabs-compact-item-height); + block-size: var(--spectrum-tabs-compact-item-height); align-items: end; } } @@ -166,41 +167,42 @@ governing permissions and limitations under the License. display: inline-flex; flex-direction: column; padding: 0; - border-left: var(--spectrum-tabs-vertical-rule-width) solid; + border-inline-start: var(--spectrum-tabs-vertical-rule-width) solid; .spectrum-Tabs-item { - height: var(--spectrum-tabs-vertical-item-height); - padding: 0 var(--spectrum-tabs-focus-ring-padding-x); + block-size: var(--spectrum-tabs-vertical-item-height); + padding-block: 0; + padding-inline: var(--spectrum-tabs-focus-ring-padding-x); /* Subtract focus ring padding from margin-left since the padding value already offsets tabs-items */ - margin-left: calc(var(--spectrum-tabs-vertical-item-margin-left) - var(--spectrum-tabs-focus-ring-padding-x)); - margin-bottom: var(--spectrum-tabs-vertical-item-gap); + margin-inline-start: calc(var(--spectrum-tabs-vertical-item-margin-left) - var(--spectrum-tabs-focus-ring-padding-x)); + margin-block-end: var(--spectrum-tabs-vertical-item-gap); &::before { /* padding is included in click area of tab items, so only need to offset by the size of the focus ring's border */ - left: calc(-1 * var(--spectrum-tabs-focus-ring-size)); - right: calc(-1 * var(--spectrum-tabs-focus-ring-size)); - margin-top: calc(calc(var(--spectrum-tabs-focus-ring-height) / -2)); + inset-inline-start: calc(-1 * var(--spectrum-tabs-focus-ring-size)); + inset-inline-end: calc(-1 * var(--spectrum-tabs-focus-ring-size)); + margin-block-start: calc(calc(var(--spectrum-tabs-focus-ring-height) / -2)); } } &.spectrum-Tabs--compact { .spectrum-Tabs-item { - height: var(--spectrum-tabs-compact-vertical-item-height); + block-size: var(--spectrum-tabs-compact-vertical-item-height); line-height: var(--spectrum-tabs-compact-vertical-item-height); - margin-bottom: var(--spectrum-tabs-compact-vertical-item-gap); + margin-block-end: var(--spectrum-tabs-compact-vertical-item-gap); .spectrum-Icon { /* Vertical centering */ - height: var(--spectrum-tabs-compact-vertical-item-height); + block-size: var(--spectrum-tabs-compact-vertical-item-height); } } } .spectrum-Tabs-selectionIndicator { position: absolute; - left: 0px; - width: var(--spectrum-tabs-vertical-rule-width); + inset-inline-start: 0px; + inline-size: var(--spectrum-tabs-vertical-rule-width); - left: calc(-1 * var(--spectrum-tabs-vertical-rule-width)); + inset-inline-start: calc(-1 * var(--spectrum-tabs-vertical-rule-width)); } } diff --git a/components/tabs/skin.css b/components/tabs/skin.css index 9116da942b..c34836cb2e 100644 --- a/components/tabs/skin.css +++ b/components/tabs/skin.css @@ -11,11 +11,11 @@ governing permissions and limitations under the License. */ .spectrum-Tabs { - border-bottom-color: var(--spectrum-tabs-rule-color); + border-block-end-color: var(--spectrum-tabs-rule-color); } .spectrum-Tabs--vertical { - border-left-color: var(--spectrum-tabs-vertical-rule-color); + border-inline-start-color: var(--spectrum-tabs-vertical-rule-color); } .spectrum-Tabs-selectionIndicator { @@ -67,7 +67,7 @@ governing permissions and limitations under the License. } .spectrum-Tabs--quiet { - border-bottom-color: var(--spectrum-tabs-quiet-rule-color); + border-block-end-color: var(--spectrum-tabs-quiet-rule-color); .spectrum-Tabs-selectionIndicator { background-color: var(--spectrum-tabs-quiet-selection-indicator-color); @@ -77,7 +77,7 @@ governing permissions and limitations under the License. .spectrum-Tabs--vertical { &.spectrum-Tabs--quiet, &.spectrum-Tabs--compact { - border-left-color: var(--spectrum-tabs-quiet-vertical-rule-color); + border-inline-start-color: var(--spectrum-tabs-quiet-vertical-rule-color); .spectrum-Tabs-selectionIndicator { background-color: var(--spectrum-tabs-quiet-selection-indicator-color);