Skip to content

Commit 0d33e23

Browse files
authored
fix: don't use rem values for most sizing and spacing (#9674)
1 parent 7834679 commit 0d33e23

File tree

12 files changed

+37
-36
lines changed

12 files changed

+37
-36
lines changed

packages/app-layout/src/styles/vaadin-app-layout-base-styles.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ export const appLayoutStyles = css`
173173
@media (max-width: 800px), (max-height: 600px) {
174174
:host {
175175
--vaadin-app-layout-drawer-overlay: true;
176-
--_vaadin-app-layout-drawer-width: var(--vaadin-app-layout-drawer-width, 20em);
176+
--_vaadin-app-layout-drawer-width: var(--vaadin-app-layout-drawer-width, 320px);
177177
}
178178
}
179179

packages/avatar-group/src/styles/vaadin-avatar-group-base-styles.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ export const avatarGroupStyles = css`
3636
mask-position: calc(
3737
50% +
3838
(
39-
var(--vaadin-avatar-size, 2em) - var(--vaadin-avatar-group-overlap, 8px) + var(--vaadin-avatar-group-gap, 2px)
39+
var(--vaadin-avatar-size, 32px) - var(--vaadin-avatar-group-overlap, 8px) +
40+
var(--vaadin-avatar-group-gap, 2px)
4041
) *
4142
var(--_d)
4243
);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export const avatarStyles = css`
1515
color: var(--vaadin-avatar-color, var(--vaadin-color-subtle));
1616
line-height: 0;
1717
overflow: hidden;
18-
height: var(--vaadin-avatar-size, 2em);
19-
width: var(--vaadin-avatar-size, 2em);
18+
height: var(--vaadin-avatar-size, 32px);
19+
width: var(--vaadin-avatar-size, 32px);
2020
border: var(--vaadin-focus-ring-width) solid transparent;
2121
margin: calc(var(--vaadin-focus-ring-width) * -1);
2222
background: var(--vaadin-avatar-background, var(--vaadin-background-container-strong));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ export const overlayContentStyles = css`
7474
::slotted([slot='years'])::before {
7575
background: var(--vaadin-overlay-background, var(--vaadin-background-color));
7676
border: 1px solid var(--vaadin-date-picker-year-scroller-border-color, var(--vaadin-border-color));
77-
width: 1em;
78-
height: 1em;
77+
width: 16px;
78+
height: 16px;
7979
position: absolute;
8080
left: auto;
8181
z-index: 1;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { css } from 'lit';
99
export const monthCalendarStyles = css`
1010
:host {
1111
display: block;
12-
padding: var(--vaadin-date-picker-month-padding, 0.5rem);
12+
padding: var(--vaadin-date-picker-month-padding, var(--vaadin-padding));
1313
}
1414
1515
[part='month-header'] {

packages/grid/src/styles/vaadin-grid-tree-toggle-base-styles.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const gridTreeToggleStyles = css`
3232
}
3333
3434
#level-spacer {
35-
width: calc(var(--_level, 0) * var(--vaadin-grid-tree-toggle-level-offset, 1em));
35+
width: calc(var(--_level, 0) * var(--vaadin-grid-tree-toggle-level-offset, 16px));
3636
}
3737
3838
[part='toggle'] {

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export const mapStyles = css`
112112
display: grid;
113113
grid-template-columns: min-content 1fr min-content;
114114
grid-template-rows: min-content 1fr min-content min-content min-content min-content;
115-
padding: var(--vaadin-map-controls-inset, 0.25em);
115+
padding: var(--vaadin-map-controls-inset, 4px);
116116
box-sizing: border-box;
117117
grid-template-areas:
118118
'scale mouse-position fullscreen'
@@ -162,7 +162,7 @@ export const mapStyles = css`
162162
163163
.ol-scale-step-text {
164164
position: absolute;
165-
top: 0.75em;
165+
top: 12px;
166166
font-size: 0.625em;
167167
color: #000;
168168
filter: drop-shadow(0 0 1px #fff) drop-shadow(0 0 1px #fff);
@@ -173,19 +173,19 @@ export const mapStyles = css`
173173
.ol-scale-text {
174174
position: absolute;
175175
font-size: 0.625em;
176-
top: 2em;
176+
top: 32px;
177177
color: #000;
178178
white-space: nowrap;
179179
filter: drop-shadow(0 0 1px #fff) drop-shadow(0 0 1px #fff);
180180
}
181181
182182
.ol-scale-singlebar {
183-
height: 0.25em;
183+
height: 4px;
184184
opacity: 0.5;
185185
}
186186
187187
.ol-control {
188-
margin: 0.25em;
188+
margin: 4px;
189189
border-radius: var(--vaadin-button-border-radius, var(--vaadin-radius-m));
190190
}
191191
@@ -197,8 +197,8 @@ export const mapStyles = css`
197197
padding: 0;
198198
color: inherit;
199199
font: inherit;
200-
width: var(--vaadin-map-control-size, 1.5em);
201-
height: var(--vaadin-map-control-size, 1.5em);
200+
width: var(--vaadin-map-control-size, 24px);
201+
height: var(--vaadin-map-control-size, 24px);
202202
border-radius: inherit;
203203
}
204204
@@ -228,8 +228,8 @@ export const mapStyles = css`
228228
}
229229
230230
.ol-attribution.ol-uncollapsible {
231-
margin-inline-end: calc(var(--vaadin-map-controls-inset, 0.25em) * -1);
232-
margin-block-end: calc(var(--vaadin-map-controls-inset, 0.25em) * -1);
231+
margin-inline-end: calc(var(--vaadin-map-controls-inset, 4px) * -1);
232+
margin-block-end: calc(var(--vaadin-map-controls-inset, 4px) * -1);
233233
border-radius: var(--vaadin-radius) 0 0 0;
234234
}
235235
@@ -287,9 +287,9 @@ export const mapStyles = css`
287287
}
288288
289289
.ol-overviewmap-map {
290-
height: 10em;
291-
width: 10em;
292-
margin: 0.25rem;
290+
height: 160px;
291+
width: 160px;
292+
margin: 4px;
293293
border: 0;
294294
border-radius: var(--vaadin-button-border-radius, var(--vaadin-radius));
295295
}
@@ -312,12 +312,12 @@ export const mapStyles = css`
312312
313313
.ol-zoomslider {
314314
grid-area: zoom-slider;
315-
height: 8em;
315+
height: 128px;
316316
}
317317
318318
.ol-zoomslider button {
319319
position: relative;
320-
height: 0.5em;
320+
height: 8px;
321321
display: block;
322322
border-radius: inherit;
323323
}

packages/popover/src/styles/vaadin-popover-overlay-base-styles.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import { overlayStyles } from '@vaadin/overlay/src/styles/vaadin-overlay-base-st
88

99
const popoverOverlay = css`
1010
:host {
11-
--_arrow-size: var(--vaadin-popover-arrow-size, 0.5rem);
12-
--_default-offset: 0.25rem;
11+
--_arrow-size: var(--vaadin-popover-arrow-size, 8px);
12+
--_default-offset: 4px;
1313
--_rtl-multiplier: 1;
1414
--_border-width: var(--vaadin-popover-border-width, var(--vaadin-overlay-border-width, 1px));
1515
}
@@ -85,7 +85,7 @@ const popoverOverlay = css`
8585
}
8686
8787
:host([theme~='arrow']) {
88-
--_default-offset: calc(0.25rem + var(--_arrow-size) / 2);
88+
--_default-offset: calc(4px + var(--_arrow-size) / 2);
8989
}
9090
9191
:host([theme~='arrow']) [part='arrow'] {

packages/progress-bar/src/styles/vaadin-progress-bar-base-styles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ export const progressBarStyles = css`
4545
4646
/* Indeterminate progress */
4747
:host([indeterminate]) [part='value'] {
48-
--_w-min: clamp(0.5em, 5%, 1em);
49-
--_w-max: clamp(1em, 20%, 8em);
48+
--_w-min: clamp(8px, 5%, 16px);
49+
--_w-max: clamp(16px, 20%, 128px);
5050
animation: indeterminate var(--vaadin-progress-bar-animation-duration, 1s) linear infinite alternate;
5151
width: var(--_w-min);
5252
}

packages/split-layout/src/styles/vaadin-split-layout-base-styles.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ export const splitLayoutStyles = css`
2727
}
2828
2929
[part='splitter'] {
30-
--_splitter-size: var(--vaadin-split-layout-splitter-size, 0.5rem);
31-
--_splitter-target-size: var(--vaadin-split-layout-splitter-target-size, 0.5rem);
32-
--_handle-size: var(--vaadin-split-layout-handle-size, 0.25rem);
33-
--_handle-target-size: var(--vaadin-split-layout-handle-target-size, 2rem);
30+
--_splitter-size: var(--vaadin-split-layout-splitter-size, 8px);
31+
--_splitter-target-size: var(--vaadin-split-layout-splitter-target-size, 8px);
32+
--_handle-size: var(--vaadin-split-layout-handle-size, 4px);
33+
--_handle-target-size: var(--vaadin-split-layout-handle-target-size, 32px);
3434
background: var(--vaadin-split-layout-splitter-background, var(--vaadin-background-container-strong));
3535
flex: none;
3636
position: relative;

0 commit comments

Comments
 (0)