Skip to content

Commit 94c36b2

Browse files
committed
Fix CSS layer conflicts for Vuetify 4 upgrade
Vuetify 3 utility classes used !important and won over component styles. Vuetify 4 replaced !important with CSS layers, so unlayered component styles now override them. Consolidate the utility class values into the component CSS rules and remove the now-ineffective utility classes from templates.
1 parent 61cced3 commit 94c36b2

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
@@ -260,10 +260,10 @@ const swiperColor = computed(() => {
260260
class="map"
261261
/>
262262

263-
<div id="map-tooltip" ref="tooltip" class="tooltip pa-0">
263+
<div id="map-tooltip" ref="tooltip" class="tooltip">
264264
<MapTooltip />
265265
</div>
266-
<div id="map-tooltip" ref="compareTooltip" class="tooltip pa-0">
266+
<div id="map-tooltip" ref="compareTooltip" class="tooltip">
267267
<MapTooltip compare-map />
268268
</div>
269269
</div>
@@ -300,7 +300,7 @@ const swiperColor = computed(() => {
300300
301301
.tooltip {
302302
border-radius: 5px;
303-
padding: 10px 20px;
303+
padding: 0;
304304
word-break: break-word;
305305
text-wrap: wrap;
306306
width: fit-content;

web/src/components/projects/ProjectConfig.vue

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

236236
<template>
237237
<div>
238-
<div class="project-row my-5">
238+
<div class="project-row">
239239
<v-select
240240
placeholder="Select a Project"
241241
no-data-text="No available projects."
@@ -545,7 +545,7 @@ watch(() => projectStore.projectConfigMode, () => {
545545
<style>
546546
.project-row {
547547
display: flex;
548-
margin: 0px 8px;
548+
margin: 20px 8px;
549549
align-items: center;
550550
justify-content: space-between;
551551
}

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
@@ -212,7 +212,7 @@ const panels = ref(['A', 'B'] as const);
212212
@update:model-value="selectStyle($event, panel)"
213213
></v-select>
214214
</div>
215-
<table class="aligned-controls px-2">
215+
<table class="aligned-controls">
216216
<tbody>
217217
<tr>
218218
<td><v-label color="primary-text">Opacity</v-label></td>
@@ -254,7 +254,7 @@ const panels = ref(['A', 'B'] as const);
254254
@update:model-value="selectStyle($event, panel)"
255255
></v-select>
256256
</div>
257-
<table class="aligned-controls px-2">
257+
<table class="aligned-controls">
258258
<tbody>
259259
<tr>
260260
<td><v-label color="primary-text">Opacity</v-label></td>
@@ -286,7 +286,7 @@ const panels = ref(['A', 'B'] as const);
286286
font-size: 14px;
287287
}
288288
.aligned-controls {
289-
padding: 0px;
289+
padding: 0 8px;
290290
width: 100%;
291291
}
292292
.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)