Skip to content

Commit 521f693

Browse files
authored
refactor: remove shorthand border props, rename border to divider (#10287)
1 parent c7bd508 commit 521f693

File tree

5 files changed

+10
-19
lines changed

5 files changed

+10
-19
lines changed

packages/aura/src/components/upload.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
--vaadin-upload-background: var(--aura-surface) padding-box;
33
--vaadin-upload-border: 1px solid var(--vaadin-border-color-secondary);
44
--vaadin-upload-padding: var(--vaadin-padding-s);
5-
--vaadin-upload-file-list-border-color: var(--vaadin-border-color-secondary);
6-
--vaadin-upload-file-list-border-width: 1px;
5+
--vaadin-upload-file-list-divider-color: var(--vaadin-border-color-secondary);
6+
--vaadin-upload-file-list-divider-width: 1px;
77
--vaadin-upload-file-error-color: var(--vaadin-text-color-secondary);
88
--vaadin-upload-file-warning-color: var(--aura-red);
99
--vaadin-upload-file-done-color: var(--aura-green);
@@ -124,7 +124,7 @@ vaadin-upload[theme~='no-border'] {
124124
--vaadin-upload-padding: 0;
125125
--vaadin-upload-background: transparent;
126126
--vaadin-upload-border: none;
127-
--vaadin-upload-file-list-border-width: 0;
127+
--vaadin-upload-file-list-divider-width: 0;
128128
--_divider-offset-start: 0px;
129129
--_divider-offset-end: 0px;
130130
outline-offset: 2px;

packages/upload/src/styles/vaadin-upload-base-styles.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ import { css } from 'lit';
99
export const uploadStyles = css`
1010
:host {
1111
background: var(--vaadin-upload-background, transparent);
12-
border: var(
13-
--vaadin-upload-border,
14-
var(--vaadin-upload-border-width, 1px) solid
15-
var(--vaadin-upload-border-color, var(--vaadin-border-color-secondary))
16-
);
12+
border: var(--vaadin-upload-border-width, 1px) solid
13+
var(--vaadin-upload-border-color, var(--vaadin-border-color-secondary));
1714
border-radius: var(--vaadin-upload-border-radius, var(--vaadin-radius-m));
1815
box-sizing: border-box;
1916
display: flex;

packages/upload/src/styles/vaadin-upload-file-base-styles.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,8 @@ export const uploadFileStyles = css`
8484
8585
button {
8686
background: var(--vaadin-upload-file-button-background, transparent);
87-
border: var(
88-
--vaadin-upload-file-button-border,
89-
var(--vaadin-upload-file-button-border-width, 1px) solid
90-
var(--vaadin-upload-file-button-border-color, transparent)
91-
);
87+
border: var(--vaadin-upload-file-button-border-width, 1px) solid
88+
var(--vaadin-upload-file-button-border-color, transparent);
9289
border-radius: var(--vaadin-upload-file-button-border-radius, var(--vaadin-radius-m));
9390
color: var(--vaadin-upload-file-button-text-color, var(--vaadin-text-color));
9491
cursor: var(--vaadin-clickable-cursor);

packages/upload/src/styles/vaadin-upload-file-list-base-styles.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ export const uploadFileListStyles = css`
2727
}
2828
2929
::slotted(li:not(:last-of-type)) {
30-
border-bottom: var(
31-
--vaadin-upload-file-list-border,
32-
var(--vaadin-upload-file-list-border-width, 1px) solid
33-
var(--vaadin-upload-file-list-border-color, var(--vaadin-border-color-secondary))
34-
);
30+
border-bottom: var(--vaadin-upload-file-list-divider-width, 1px) solid
31+
var(--vaadin-upload-file-list-divider-color, var(--vaadin-border-color-secondary));
3532
}
3633
`;

packages/vaadin-lumo-styles/components/upload.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
:where(:root, :host) {
2727
--vaadin-upload-gap: 0;
28-
--vaadin-upload-file-list-border-color: var(
28+
--vaadin-upload-file-list-divider-color: var(
2929
--lumo-contrast-10pct
3030
);
3131
}

0 commit comments

Comments
 (0)