Skip to content

Commit 6419f55

Browse files
committed
Fix CSS layer conflicts for Vuetify 4 upgrade
Vuetify 4 puts all styles in CSS layers, so unlayered component styles now always override Vuetify utility classes. Consolidate conflicting margin/padding from utility classes into component CSS rules to preserve intended behavior.
1 parent 7194acf commit 6419f55

File tree

6 files changed

+14
-13
lines changed

6 files changed

+14
-13
lines changed

web/src/components/map/LegacyMap.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ watch(() => appStore.openSidebars, () => {
152152

153153
<template>
154154
<div id="mapContainer" class="map">
155-
<div id="map-tooltip" ref="tooltip" class="tooltip pa-0">
155+
<div id="map-tooltip" ref="tooltip" class="tooltip">
156156
<MapTooltip />
157157
</div>
158158
</div>
@@ -189,7 +189,7 @@ watch(() => appStore.openSidebars, () => {
189189
190190
.tooltip {
191191
border-radius: 5px;
192-
padding: 10px 20px;
192+
padding: 0;
193193
word-break: break-word;
194194
text-wrap: wrap;
195195
width: fit-content;

web/src/components/map/ToggleCompareMap.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,10 @@ const swiperColor = computed(() => {
258258
class="map"
259259
/>
260260

261-
<div id="map-tooltip" ref="tooltip" class="tooltip pa-0">
261+
<div id="map-tooltip" ref="tooltip" class="tooltip">
262262
<MapTooltip />
263263
</div>
264-
<div id="map-tooltip" ref="compareTooltip" class="tooltip pa-0">
264+
<div id="map-tooltip" ref="compareTooltip" class="tooltip">
265265
<MapTooltip compare-map />
266266
</div>
267267
</div>
@@ -298,7 +298,7 @@ const swiperColor = computed(() => {
298298
299299
.tooltip {
300300
border-radius: 5px;
301-
padding: 10px 20px;
301+
padding: 0;
302302
word-break: break-word;
303303
text-wrap: wrap;
304304
width: fit-content;

web/src/components/projects/ProjectConfig.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ watch(() => projectStore.projectConfigMode, () => {
234234

235235
<template>
236236
<div>
237-
<div class="project-row my-5">
237+
<div class="project-row">
238238
<v-select
239239
placeholder="Select a Project"
240240
no-data-text="No available projects."
@@ -544,7 +544,7 @@ watch(() => projectStore.projectConfigMode, () => {
544544
<style>
545545
.project-row {
546546
display: flex;
547-
margin: 0px 8px;
547+
margin-inline: 8px;
548548
align-items: center;
549549
justify-content: space-between;
550550
}

web/src/components/sidebars/ColormapEditor.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,8 @@ onMounted(init)
277277
<template v-slot:activator="{ props }">
278278
<div
279279
v-bind="props"
280-
class="color-square ma-0"
280+
class="color-square"
281+
style="margin: 0"
281282
:style="{backgroundColor: marker.color}"
282283
/>
283284
</template>

web/src/components/sidebars/CompareLayerStyle.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ const panels = ref(['A', 'B'] as const);
211211
@update:model-value="selectStyle($event, panel)"
212212
></v-select>
213213
</div>
214-
<table class="aligned-controls px-2">
214+
<table class="aligned-controls">
215215
<tbody>
216216
<tr>
217217
<td><v-label color="primary-text">Opacity</v-label></td>
@@ -253,7 +253,7 @@ const panels = ref(['A', 'B'] as const);
253253
@update:model-value="selectStyle($event, panel)"
254254
></v-select>
255255
</div>
256-
<table class="aligned-controls px-2">
256+
<table class="aligned-controls">
257257
<tbody>
258258
<tr>
259259
<td><v-label color="primary-text">Opacity</v-label></td>
@@ -285,7 +285,7 @@ const panels = ref(['A', 'B'] as const);
285285
font-size: 14px;
286286
}
287287
.aligned-controls {
288-
padding: 0px;
288+
padding: 0 8px;
289289
width: 100%;
290290
}
291291
.aligned-controls td {

web/src/components/sidebars/LayerStyle.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ onMounted(resetCurrentStyle)
573573
/>
574574
</div>
575575

576-
<table class="aligned-controls px-2">
576+
<table class="aligned-controls">
577577
<tbody>
578578
<tr v-if="frames.length > 1">
579579
<td><v-label>Default Frame</v-label></td>
@@ -1595,7 +1595,7 @@ onMounted(resetCurrentStyle)
15951595
font-size: 14px;
15961596
}
15971597
.aligned-controls {
1598-
padding: 0px;
1598+
padding: 0 8px;
15991599
width: 100%;
16001600
}
16011601
.aligned-controls td {

0 commit comments

Comments
 (0)