Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OP-145] --op-border-color rename #212

Merged
merged 1 commit into from
Feb 7, 2024
Merged

[OP-145] --op-border-color rename #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/addons/tom-select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
border: none;
border-radius: var(--op-radius-large);
background-color: var(--op-color-neutral-plus-max);
box-shadow: var(--op-border-all) var(--op-border-color);
box-shadow: var(--op-border-all) var(--op-color-border);
color: var(--op-color-neutral-on-plus-max);
font-size: var(--op-font-x-small);
font-weight: var(--op-font-weight-light);
Expand All @@ -30,7 +30,7 @@
margin: 0;
border-bottom-left-radius: var(--op-radius-large);
border-bottom-right-radius: var(--op-radius-large);
box-shadow: var(--op-border-all) var(--op-border-color);
box-shadow: var(--op-border-all) var(--op-color-border);
contain: paint;

.option,
Expand Down
12 changes: 6 additions & 6 deletions src/components/card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
position: relative;
border-radius: var(--op-radius-medium);
background-color: var(--op-color-background);
box-shadow: var(--op-border-all) var(--op-border-color);
box-shadow: var(--op-border-all) var(--op-color-border);
color: var(--op-color-on-background);
contain: paint;
font-size: var(--op-font-medium);
Expand All @@ -17,31 +17,31 @@

&.card--shadow-x-small {
box-shadow:
var(--op-border-all) var(--op-border-color),
var(--op-border-all) var(--op-color-border),
var(--op-shadow-x-small);
}

&.card--shadow-small {
box-shadow:
var(--op-border-all) var(--op-border-color),
var(--op-border-all) var(--op-color-border),
var(--op-shadow-small);
}

&.card--shadow-medium {
box-shadow:
var(--op-border-all) var(--op-border-color),
var(--op-border-all) var(--op-color-border),
var(--op-shadow-medium);
}

&.card--shadow-large {
box-shadow:
var(--op-border-all) var(--op-border-color),
var(--op-border-all) var(--op-color-border),
var(--op-shadow-large);
}

&.card--shadow-x-large {
box-shadow:
var(--op-border-all) var(--op-border-color),
var(--op-border-all) var(--op-color-border),
var(--op-shadow-x-large);
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/confirm-dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
width: var(--_op-confirm-dialog-width);
border-radius: var(--op-radius-medium);
background-color: var(--op-color-background);
box-shadow: var(--op-border-all) var(--op-border-color);
box-shadow: var(--op-border-all) var(--op-color-border);
color: var(--op-color-on-background);
contain: paint;
font-size: var(--op-font-medium);
Expand All @@ -63,7 +63,7 @@
}

.confirm-dialog__body {
box-shadow: var(--op-border-all) var(--op-border-color);
box-shadow: var(--op-border-all) var(--op-color-border);
}

.confirm-dialog__footer {
Expand Down
2 changes: 1 addition & 1 deletion src/components/divider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
--__op-divider-height: var(--_op-divider-height-small);
--__op-divider-padding: 0;

background-color: var(--op-border-color);
background-color: var(--op-color-border);

// Size Modifiers
&.divider--small {
Expand Down
4 changes: 2 additions & 2 deletions src/components/modal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
width: var(--_op-modal-width);
border-radius: var(--op-radius-medium);
background-color: var(--op-color-background);
box-shadow: var(--op-border-all) var(--op-border-color);
box-shadow: var(--op-border-all) var(--op-color-border);
color: var(--op-color-on-background);
contain: paint;
font-size: var(--op-font-medium);
Expand All @@ -71,7 +71,7 @@

.modal__body {
max-height: var(--_op-modal-max-height);
box-shadow: var(--op-border-all) var(--op-border-color);
box-shadow: var(--op-border-all) var(--op-color-border);
overflow-y: auto;
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/side_panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

// Modifiers
&.side-panel--border-left {
box-shadow: var(--op-border-left) var(--op-border-color);
box-shadow: var(--op-border-left) var(--op-color-border);
}

&.side-panel--border-right {
box-shadow: var(--op-border-right) var(--op-border-color);
box-shadow: var(--op-border-right) var(--op-color-border);
}

&.side-panel--border-left.side-panel--border-right {
Expand Down
8 changes: 4 additions & 4 deletions src/components/table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
width: 100%;
border-radius: var(--op-radius-medium);
border-collapse: collapse;
box-shadow: var(--op-border-all) var(--op-border-color);
box-shadow: var(--op-border-all) var(--op-color-border);
contain: paint;
table-layout: auto;

thead {
background-color: var(--op-color-neutral-plus-eight);
box-shadow: inset var(--op-border-top) var(--op-border-color);
box-shadow: inset var(--op-border-top) var(--op-color-border);
color: var(--op-color-neutral-on-plus-eight);

// This Currently does not work in Firefox since it does not support :has yet, but fails gracefully.
Expand Down Expand Up @@ -47,11 +47,11 @@
}

tr:not(:last-child) {
box-shadow: inset var(--op-border-top) var(--op-border-color);
box-shadow: inset var(--op-border-top) var(--op-color-border);
}

tfoot tr {
box-shadow: var(--op-border-top) var(--op-border-color);
box-shadow: var(--op-border-top) var(--op-color-border);
}

// Layout Modifiers
Expand Down
8 changes: 4 additions & 4 deletions src/core/tokens/base_tokens.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ $breakpoint-x-large: 1440px; // medium laptop
* @tokens Border Color
* @presenter Color
*/
--op-border-color: var(--op-color-neutral-plus-five);
--op-color-border: var(--op-color-neutral-plus-five);
}

@mixin box-shadows {
// E.G. box-shadow: var(--op-border-top) var(--op-border-color);
// E.G. box-shadow: var(--op-border-top) var(--op-color-border);

/**
* @tokens Border Shadow
Expand All @@ -144,8 +144,8 @@ $breakpoint-x-large: 1440px; // medium laptop
--op-border-right: var(--op-border-width) 0 0 0;
--op-border-bottom: 0 var(--op-border-width) 0 0;
--op-border-left: calc(-1 * var(--op-border-width)) 0 0 0;
--op-border-y: var(--op-border-top) var(--op-border-color), var(--op-border-bottom) var(--op-border-color);
--op-border-x: var(--op-border-left) var(--op-border-color), var(--op-border-right) var(--op-border-color);
--op-border-y: var(--op-border-top) var(--op-color-border), var(--op-border-bottom) var(--op-color-border);
--op-border-x: var(--op-border-left) var(--op-color-border), var(--op-border-right) var(--op-color-border);
}

@mixin font-scales {
Expand Down
4 changes: 2 additions & 2 deletions src/stories/Tokens/Border/BorderStroke.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ These can be composed with other box shadows such as [Shadow](?path=/docs/tokens
These tokens can be applied as a box shadow with any color you wish.

```css
box-shadow: var(--op-border-all) var(--op-border-color);
box-shadow: var(--op-border-all) var(--op-color-border);
// or
box-shadow: var(--op-border-left) var(--op-color-primary-base);
```
Expand All @@ -23,7 +23,7 @@ box-shadow: var(--op-border-left) var(--op-color-primary-base);
`inset` can be prefixed to invert a border.

```css
box-shadow: inset var(--op-border-all) var(--op-border-color);
box-shadow: inset var(--op-border-all) var(--op-color-border);
// or
box-shadow: inset var(--op-border-left) var(--op-color-primary-base);
```
Expand Down
4 changes: 2 additions & 2 deletions src/stories/Tokens/Color/BorderColor.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ Border color tokens can be used to define the color of borders and box shadows.
These tokens can be applied with a border or box shadow.

```css
border-color: var(--op-border-color);
border-color: var(--op-color-border);
// or
box-shadow: var(--op-border-top) var(--op-border-color);
box-shadow: var(--op-border-top) var(--op-color-border);
```

## Available tokens and their definitions
Expand Down
Loading