Skip to content

Commit 1c3f0bb

Browse files
authored
refactor: rename base styles border color properties (#9937)
1 parent 7c85197 commit 1c3f0bb

File tree

32 files changed

+71
-60
lines changed

32 files changed

+71
-60
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const buttonStyles = css`
3333
background-origin: border-box;
3434
border: var(
3535
--vaadin-button-border,
36-
var(--vaadin-button-border-width, 1px) solid var(--vaadin-button-border-color, var(--vaadin-border-color))
36+
var(--vaadin-button-border-width, 1px) solid var(--vaadin-button-border-color, var(--vaadin-border-color-subtle))
3737
);
3838
border-radius: var(--vaadin-button-border-radius, var(--vaadin-radius-m));
3939
touch-action: manipulation;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const cardStyles = css`
3131
3232
/* Could be an inset outline on the host as well, but let's reserve that for a potential focus outline */
3333
:host::before {
34-
border: var(--vaadin-card-border-width, 0) solid var(--vaadin-card-border-color, var(--vaadin-border-color));
34+
border: var(--vaadin-card-border-width, 0) solid var(--vaadin-card-border-color, var(--vaadin-border-color-subtle));
3535
border-radius: inherit;
3636
content: '';
3737
inset: 0;

packages/charts/src/styles/vaadin-chart-base-styles.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ const tooltipStyles = (scope) => css`
4343
4444
${unsafeCSS(scope)} .highcharts-tooltip-box {
4545
stroke-width: 1px;
46-
stroke: var(--vaadin-charts-tooltip-border, var(--vaadin-border-color));
46+
stroke: var(--vaadin-charts-tooltip-border, var(--vaadin-border-color-subtle));
4747
fill: var(--vaadin-charts-tooltip-background, var(--vaadin-background-color));
4848
fill-opacity: var(--vaadin-charts-tooltip-background-opacity, 1);
4949
}
5050
5151
${unsafeCSS(scope)} .highcharts-tooltip-box .highcharts-label-box {
5252
fill: var(--vaadin-charts-tooltip-background, var(--vaadin-background-color));
5353
fill-opacity: var(--vaadin-charts-tooltip-background-opacity, 1);
54-
stroke: var(--vaadin-charts-tooltip-border, var(--vaadin-border-color));
54+
stroke: var(--vaadin-charts-tooltip-border, var(--vaadin-border-color-subtle));
5555
}
5656
5757
${unsafeCSS(scope)} .highcharts-tooltip-header {
@@ -120,13 +120,13 @@ export const chartStyles = css`
120120
--_secondary-label: var(--vaadin-charts-secondary-label, var(--vaadin-color-subtle));
121121
--_disabled-label: var(--vaadin-charts-disabled-label, var(--vaadin-color-disabled));
122122
--_point-border: var(--vaadin-charts-point-border, var(--_bg));
123-
--_axis-line: var(--vaadin-charts-axis-line, var(--vaadin-border-color));
123+
--_axis-line: var(--vaadin-charts-axis-line, var(--vaadin-border-color-subtle));
124124
--_axis-title: var(--vaadin-charts-axis-title, var(--_secondary-label));
125125
--_axis-label: var(--vaadin-charts-axis-label, var(--_secondary-label));
126-
--_grid-line: var(--vaadin-charts-grid-line, var(--vaadin-border-color));
126+
--_grid-line: var(--vaadin-charts-grid-line, var(--vaadin-border-color-subtle));
127127
--_minor-grid-line: var(
128128
--vaadin-charts-minor-grid-line,
129-
color-mix(in srgb, var(--vaadin-border-color) 60%, transparent)
129+
color-mix(in srgb, var(--vaadin-border-color-subtle) 60%, transparent)
130130
);
131131
--_data-label: var(--vaadin-charts-data-label, var(--_label));
132132
}
@@ -963,7 +963,7 @@ export const chartStyles = css`
963963
}
964964
965965
:where([styled-mode]) .highcharts-candlestick-series .highcharts-point {
966-
stroke: var(--vaadin-charts-candlestick-line, var(--vaadin-border-color-strong));
966+
stroke: var(--vaadin-charts-candlestick-line, var(--vaadin-border-color));
967967
stroke-width: 1px;
968968
}
969969
@@ -1046,7 +1046,7 @@ export const chartStyles = css`
10461046
10471047
:where([styled-mode]) .highcharts-null-point {
10481048
fill: transparent;
1049-
stroke: var(--vaadin-border-color);
1049+
stroke: var(--vaadin-border-color-subtle);
10501050
}
10511051
10521052
/* 3d charts */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const checkbox = css`
1616
1717
:host([readonly]) {
1818
--vaadin-checkbox-background: transparent;
19-
--vaadin-checkbox-border-color: var(--vaadin-border-color-strong);
19+
--vaadin-checkbox-border-color: var(--vaadin-border-color);
2020
--vaadin-checkbox-color: var(--vaadin-color);
2121
}
2222

packages/component-base/src/styles/style-props.js

Lines changed: 2 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ export const crudStyles = css`
1717
--vaadin-grid-border-radius: var(--vaadin-crud-border-radius, var(--vaadin-radius-l));
1818
--vaadin-crud-editor-max-height: 40%;
1919
--vaadin-crud-editor-max-width: 40%;
20-
border: var(--vaadin-crud-border-width, 1px) solid var(--vaadin-crud-border-color, var(--vaadin-border-color));
20+
border: var(--vaadin-crud-border-width, 1px) solid
21+
var(--vaadin-crud-border-color, var(--vaadin-border-color-subtle));
2122
border-radius: var(--vaadin-crud-border-radius, var(--vaadin-radius-l));
2223
height: 400px;
2324
width: 100%;
@@ -60,7 +61,7 @@ export const crudStyles = css`
6061
6162
:host([editor-position='aside'][editor-opened]) #main {
6263
border-inline-end: var(--vaadin-crud-border-width, 1px) solid
63-
var(--vaadin-crud-border-color, var(--vaadin-border-color));
64+
var(--vaadin-crud-border-color, var(--vaadin-border-color-subtle));
6465
}
6566
6667
:host([editor-position='aside'][editor-opened]) ::slotted(vaadin-crud-grid) {
@@ -75,7 +76,7 @@ export const crudStyles = css`
7576
7677
:host([editor-position='bottom'][editor-opened]) #main {
7778
border-bottom: var(--vaadin-crud-border-width, 1px) solid
78-
var(--vaadin-crud-border-color, var(--vaadin-border-color));
79+
var(--vaadin-crud-border-color, var(--vaadin-border-color-subtle));
7980
}
8081
8182
:host([editor-position='bottom'][editor-opened]) :is(#container, [part='editor']) {
@@ -86,7 +87,8 @@ export const crudStyles = css`
8687
[part='toolbar'] {
8788
align-items: baseline;
8889
background: var(--vaadin-crud-toolbar-background, transparent);
89-
border-top: var(--vaadin-crud-border-width, 1px) solid var(--vaadin-crud-border-color, var(--vaadin-border-color));
90+
border-top: var(--vaadin-crud-border-width, 1px) solid
91+
var(--vaadin-crud-border-color, var(--vaadin-border-color-subtle));
9092
display: flex;
9193
flex-shrink: 0;
9294
justify-content: flex-end;
@@ -149,7 +151,8 @@ export const crudStyles = css`
149151
150152
[part='footer'] {
151153
background: var(--vaadin-crud-footer-background, transparent);
152-
border-top: var(--vaadin-crud-border-width, 1px) solid var(--vaadin-crud-border-color, var(--vaadin-border-color));
154+
border-top: var(--vaadin-crud-border-width, 1px) solid
155+
var(--vaadin-crud-border-color, var(--vaadin-border-color-subtle));
153156
display: flex;
154157
flex: none;
155158
gap: var(--vaadin-crud-footer-gap, var(--vaadin-gap-s));

packages/crud/src/styles/vaadin-crud-dialog-overlay-base-styles.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ const crudDialogOverlay = css`
4141
[part='footer'] {
4242
justify-content: normal;
4343
background: var(--vaadin-crud-footer-background, transparent);
44-
border-top: var(--vaadin-crud-border-width, 1px) solid var(--vaadin-crud-border-color, var(--vaadin-border-color));
44+
border-top: var(--vaadin-crud-border-width, 1px) solid
45+
var(--vaadin-crud-border-color, var(--vaadin-border-color-subtle));
4546
}
4647
`;
4748

packages/dashboard/src/styles/vaadin-dashboard-widget-section-base-styles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ export const dashboardWidgetAndSectionStyles = css`
1717
--_widget-background: var(--vaadin-dashboard-widget-background, var(--vaadin-background-color));
1818
--_widget-border-radius: var(--vaadin-dashboard-widget-border-radius, var(--vaadin-radius-m));
1919
--_widget-border-width: var(--vaadin-dashboard-widget-border-width, 1px);
20-
--_widget-border-color: var(--vaadin-dashboard-widget-border-color, var(--vaadin-border-color));
20+
--_widget-border-color: var(--vaadin-dashboard-widget-border-color, var(--vaadin-border-color-subtle));
2121
--_widget-shadow: var(--vaadin-dashboard-widget-shadow, 0 0 0 0 transparent);
2222
--_widget-editable-shadow: 0 1px 4px -1px rgba(0, 0, 0, 0.3);
2323
--_widget-selected-shadow: 0 3px 12px -1px rgba(0, 0, 0, 0.3);
2424
--_drop-target-background: var(--vaadin-dashboard-drop-target-background, var(--vaadin-background-container));
25-
--_drop-target-border-color: var(--vaadin-dashboard-drop-target-border-color, var(--vaadin-border-color));
25+
--_drop-target-border-color: var(--vaadin-dashboard-drop-target-border-color, var(--vaadin-border-color-subtle));
2626
--_focus-ring-color: var(--vaadin-focus-ring-color);
2727
--_focus-ring-width: var(--vaadin-focus-ring-width);
2828
}

packages/date-picker/src/styles/vaadin-date-picker-overlay-content-base-styles.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,24 @@ export const overlayContentStyles = css`
5757
}
5858
5959
:host([desktop]) ::slotted([slot='months']) {
60-
border-bottom: 1px solid var(--vaadin-border-color);
60+
border-bottom: 1px solid var(--vaadin-border-color-subtle);
6161
}
6262
6363
::slotted([slot='years']) {
6464
visibility: hidden;
6565
background: var(--vaadin-date-picker-year-scroller-background, var(--vaadin-background-container));
6666
width: var(--vaadin-date-picker-year-scroller-width, 3rem);
6767
box-sizing: border-box;
68-
border-inline-start: 1px solid var(--vaadin-date-picker-year-scroller-border-color, var(--vaadin-border-color));
68+
border-inline-start: 1px solid
69+
var(--vaadin-date-picker-year-scroller-border-color, var(--vaadin-border-color-subtle));
6970
overflow: visible;
7071
min-height: 0;
7172
clip-path: inset(0);
7273
}
7374
7475
::slotted([slot='years'])::before {
7576
background: var(--vaadin-overlay-background, var(--vaadin-background-color));
76-
border: 1px solid var(--vaadin-date-picker-year-scroller-border-color, var(--vaadin-border-color));
77+
border: 1px solid var(--vaadin-date-picker-year-scroller-border-color, var(--vaadin-border-color-subtle));
7778
width: 16px;
7879
height: 16px;
7980
position: absolute;
@@ -102,6 +103,6 @@ export const overlayContentStyles = css`
102103
103104
:host([fullscreen]) [part='toolbar'] {
104105
grid-area: header;
105-
border-bottom: 1px solid var(--vaadin-border-color);
106+
border-bottom: 1px solid var(--vaadin-border-color-subtle);
106107
}
107108
`;

packages/date-picker/src/styles/vaadin-month-calendar-base-styles.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ export const monthCalendarStyles = css`
5959
content: '';
6060
height: 1px;
6161
flex: 1;
62-
background: var(--vaadin-date-picker-week-divider-color, var(--vaadin-divider-color, var(--vaadin-border-color)));
62+
background: var(
63+
--vaadin-date-picker-week-divider-color,
64+
var(--vaadin-divider-color, var(--vaadin-border-color-subtle))
65+
);
6366
}
6467
6568
[part~='weekday'],

0 commit comments

Comments
 (0)