Skip to content

Commit 023d15e

Browse files
committed
Sweep v4 incompatibilities and restore v2 default border color
1 parent 1fe3af7 commit 023d15e

3 files changed

Lines changed: 19 additions & 11 deletions

File tree

frontend/src/components/DropdownMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<MenuItems
2121
v-if="open"
2222
ref="menu-items"
23-
class="z-1000 fixed bg-white rounded overflow-hidden shadow-lg ring-1 ring-black ring-opacity-10 focus:outline-none"
23+
class="z-1000 fixed bg-white rounded overflow-hidden shadow-lg ring-1 ring-black/10 focus:outline-hidden"
2424
:style="teleportedStyle"
2525
>
2626
<div class="apx-1 apy-1">

frontend/src/index.css

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
@config "../../config/tailwind.config.js";
33

44
@layer base {
5+
*,
6+
::after,
7+
::before,
8+
::backdrop,
9+
::file-selector-button {
10+
border-color: var(--color-gray-200, currentColor);
11+
}
12+
513
/* .forge-block {
614
@apply bg-white;
715
@apply shadow;
@@ -39,7 +47,7 @@
3947
@apply inline-flex;
4048
@apply items-center;
4149
@apply text-sm;
42-
@apply focus:outline-none;
50+
@apply focus:outline-hidden;
4351
@apply focus:ring-2;
4452
@apply focus:ring-offset-2;
4553
@apply focus:ring-offset-gray-600;
@@ -64,7 +72,7 @@
6472
@apply inline-flex;
6573
@apply items-center;
6674
@apply text-sm;
67-
@apply focus:outline-none;
75+
@apply focus:outline-hidden;
6876
@apply focus:ring-2;
6977
@apply focus:ring-offset-2;
7078
@apply focus:ring-offset-gray-600;
@@ -88,7 +96,7 @@
8896
@apply inline-flex;
8997
@apply items-center;
9098
@apply text-sm;
91-
@apply focus:outline-none;
99+
@apply focus:outline-hidden;
92100
@apply focus:ring-2;
93101
@apply focus:ring-offset-2;
94102
@apply focus:ring-offset-gray-600;
@@ -112,7 +120,7 @@
112120
@apply inline-flex;
113121
@apply items-center;
114122
@apply text-sm;
115-
@apply focus:outline-none;
123+
@apply focus:outline-hidden;
116124
@apply focus:ring-2;
117125
@apply focus:ring-offset-2;
118126
@apply focus:ring-offset-gray-600;
@@ -136,7 +144,7 @@
136144
@apply inline-flex;
137145
@apply items-center;
138146
@apply text-sm;
139-
@apply focus:outline-none;
147+
@apply focus:outline-hidden;
140148
@apply focus:ring-2;
141149
@apply focus:ring-offset-2;
142150
@apply focus:ring-offset-gray-600;
@@ -161,7 +169,7 @@
161169
@apply inline-flex;
162170
@apply items-center;
163171
@apply text-sm;
164-
@apply focus:outline-none;
172+
@apply focus:outline-hidden;
165173
@apply focus:ring-2;
166174
@apply focus:ring-offset-2;
167175
@apply focus:ring-offset-gray-600;
@@ -335,7 +343,7 @@
335343
@apply py-1;
336344
@apply border;
337345
@apply border-gray-300;
338-
@apply placeholder-gray-500;
346+
@apply placeholder:text-gray-500;
339347
@apply text-gray-600;
340348
}
341349
input[type="radio"],
@@ -353,7 +361,7 @@
353361
input[type="checkbox"]:focus,
354362
select:focus,
355363
textarea:focus {
356-
@apply outline-none;
364+
@apply outline-hidden;
357365
@apply ring-0;
358366
@apply border-indigo-500;
359367
}

frontend/src/ui-components/components/tabs/Tabs.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ChevronLeftIcon class="ff-icon" />
66
<ChevronLeftIcon class="ff-icon ff-icon-second" />
77
</MenuButton>
8-
<MenuItems class="z-50 absolute left-0 top-full origin-top-left mt-1 max-h-96 overflow-y-auto bg-white divide-y divide-gray-100 rounded shadow-lg ring-1 ring-black ring-opacity-10 focus:outline-none" style="max-width: min(14rem, calc(100vw - 1rem)); width: 14rem;">
8+
<MenuItems class="z-50 absolute left-0 top-full origin-top-left mt-1 max-h-96 overflow-y-auto bg-white divide-y divide-gray-100 rounded shadow-lg ring-1 ring-black/10 focus:outline-hidden" style="max-width: min(14rem, calc(100vw - 1rem)); width: 14rem;">
99
<MenuItem
1010
v-for="tab in hiddenLeftTabs"
1111
:key="'left-' + tab.label"
@@ -54,7 +54,7 @@
5454
<ChevronRightIcon class="ff-icon ff-icon-second" />
5555
</MenuButton>
5656
<Teleport to="body">
57-
<MenuItems class="z-50 fixed origin-top-left max-h-96 overflow-y-auto bg-white divide-y divide-gray-100 rounded shadow-lg ring-1 ring-black ring-opacity-10 focus:outline-none" :style="rightMenuStyle">
57+
<MenuItems class="z-50 fixed origin-top-left max-h-96 overflow-y-auto bg-white divide-y divide-gray-100 rounded shadow-lg ring-1 ring-black/10 focus:outline-hidden" :style="rightMenuStyle">
5858
<MenuItem
5959
v-for="tab in hiddenRightTabs"
6060
:key="'right-' + tab.label"

0 commit comments

Comments
 (0)