Skip to content

Commit 2a446d2

Browse files
authored
[5.x] Fix UI bugs in Safari 18.2 (#11335)
1 parent c45d71f commit 2a446d2

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

resources/css/elements/buttons.css

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,27 @@ button {
3434
.btn, .btn-default {
3535
@apply text-gray-800 dark:text-dark-150 shadow-button;
3636
background: linear-gradient(180deg, #fff, #f9fafb);
37+
background-clip: padding-box;
3738
border: 1px solid #D3DDE7;
3839
border-bottom: 1px solid #c4cdd6;
3940
box-shadow: inset 0 1px 0 0 #fff, 0 1px 0 0 rgba(0, 0, 0,.05), 0 2px 1px 0 theme(colors.gray.600 / .15), 0 0 0 0 transparent;
4041

4142
.dark & {
4243
background: linear-gradient(180deg, theme(colors.dark.550), theme(colors.dark.600));
44+
background-clip: padding-box;
4345
border-color: theme(colors.dark.700);
4446
box-shadow: inset 0 1px 0 0 theme(colors.dark.300), 0 1px 0 0 rgba(200, 200, 200,.05), 0 2px 1px 0 theme(colors.dark.900 / .15), 0 0 0 0 transparent;
4547
}
4648

4749
&:hover:not(:disabled), &:active:not(:disabled) {
4850
@apply text-gray-800 dark:text-dark-150;
4951
background: linear-gradient(180deg, #f9fafb, #f4f6f8);
52+
background-clip: padding-box;
5053
border-bottom: 1px solid #BFC7D0;
5154

5255
.dark & {
5356
background: linear-gradient(180deg, theme(colors.dark.600), theme(colors.dark.700));
57+
background-clip: padding-box;
5458
border-color: theme(colors.dark.800);
5559
}
5660
}
@@ -78,7 +82,7 @@ button {
7882

7983
/* Primary action button */
8084
.btn-primary {
81-
@apply text-white bg-gradient-to-b from-blue-500 to-blue-600 dark:from-dark-blue-100 dark:to-dark-blue-150 border border-blue-700 dark:border-blue-900 border-b-blue-800 dark:border-b-dark-blue-200 !important;
85+
@apply text-white bg-gradient-to-b from-blue-500 to-blue-600 dark:from-dark-blue-100 dark:to-dark-blue-150 bg-clip-padding border border-blue-700 dark:border-blue-900 border-b-blue-800 dark:border-b-dark-blue-200 !important;
8286
box-shadow: inset 0 1px 0 0 theme('colors.blue.400'), 0 1px 0 0 rgba(25,30,35,.05), 0 3px 2px -1px theme(colors.blue.900 / .15), 0 0 0 0 transparent;
8387

8488
&:hover:not(:disabled), :active:not(:disabled) {
@@ -93,11 +97,11 @@ button {
9397

9498
/* Danger/delete button */
9599
.btn-danger {
96-
@apply text-white bg-gradient-to-b from-red-500 to-red-600 border border-red-600 border-b-red-900;
100+
@apply text-white bg-gradient-to-b from-red-500 to-red-600 bg-clip-padding border border-red-600 border-b-red-900;
97101
box-shadow: inset 0 1px 0 0 theme('colors.red.400'), 0 1px 0 0 rgba(0, 0, 0,.05), 0 3px 2px -1px theme(colors.red.900 / .15), 0 0 0 0 transparent;
98102

99103
&:hover:not(:disabled), &:active:not(:disabled) {
100-
@apply bg-gradient-to-b from-red-600 to-red-700 border border-red-700 border-b-red-900;
104+
@apply bg-gradient-to-b from-red-600 to-red-700 bg-clip-padding border border-red-700 border-b-red-900;
101105
}
102106

103107
&:disabled {
@@ -159,22 +163,26 @@ button {
159163
.btn-round {
160164
@apply rounded-full flex items-center text-center p-0;
161165
background: linear-gradient(180deg, #fff, #f9fafb);
166+
background-clip: padding-box;
162167
border: 1px solid #c4cdd6;
163168
box-shadow: 0 1px 0 0 rgba(25,30,35,.05);
164169
height: 32px;
165170
width: 32px;
166171

167172
.dark & {
168173
background: linear-gradient(180deg, theme(colors.dark.500), theme(colors.dark.550));
174+
background-clip: padding-box;
169175
border-color: theme(colors.dark.400);
170176
}
171177

172178
&:hover:not(:disabled), &:active:not(:disabled) {
173179
background: linear-gradient(180deg, #f9fafb, #f4f6f8);
180+
background-clip: padding-box;
174181
border-color: #c4cdd5;
175182

176183
.dark & {
177184
background: linear-gradient(180deg, theme(colors.dark.550), theme(colors.dark.600));
185+
background-clip: padding-box;
178186
border-color: theme(colors.dark.500);
179187
}
180188
}

resources/css/elements/forms.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,15 @@ input.input-text-minimal:read-only,
9393
.input-group-prepend, .input-group-append, .input-group-item {
9494
@apply rtl:rounded-r ltr:rounded-l px-2 border dark:border-dark-900 text-sm text-gray-800 dark:text-dark-150 select-none;
9595
background: linear-gradient(180deg, #fff, #f9fafb);
96+
background-clip: padding-box;
9697
border: 1px solid #c4cdd6;
9798
box-shadow: 0 1px 0 0 rgba(25,30,35,.05);
9899
height: 2.375rem;
99100
line-height: 36px;
100101

101102
.dark & {
102103
background: linear-gradient(180deg, theme(colors.dark.500), theme(colors.dark.600));
104+
background-clip: padding-box;
103105
border-color: theme(colors.dark.900);
104106
box-shadow: 0 1px 0 0 rgba(0,0,0,.05);
105107
}
@@ -133,10 +135,12 @@ input.input-text-minimal:read-only,
133135
button.input-group-append:hover:not(:disabled),
134136
button.input-group-append:active:not(:disabled) {
135137
background: linear-gradient(180deg, #f9fafb, #f4f6f8);
138+
background-clip: padding-box;
136139
border-color: #c4cdd5;
137140

138141
.dark & {
139142
background: linear-gradient(180deg, theme(colors.dark.550), theme(colors.dark.600));
143+
background-clip: padding-box;
140144
border-color: theme(colors.dark.900);
141145
}
142146
}
@@ -213,22 +217,26 @@ input.input-text-minimal:read-only,
213217
@apply select-none rounded leading-normal align-middle whitespace-nowrap appearance-none subpixel-antialiased;
214218

215219
background: linear-gradient(180deg, #fff, #f9fafb);
220+
background-clip: padding-box;
216221
border: 1px solid #c4cdd6;
217222
height: 2.375rem; /* 38px */
218223
letter-spacing: -0.01em;
219224
padding: .475rem 1.75rem .475rem .75rem ; [dir="rtl"] & { padding: .475rem .75rem .475rem 1.75rem ; }
220225

221226
.dark & {
222227
background: linear-gradient(180deg, theme(colors.dark.500), theme(colors.dark.600));
228+
background-clip: padding-box;
223229
border-color: theme(colors.dark.800);
224230
}
225231

226232
&:hover:not(:disabled), &:active:not(:disabled) {
227233
background: linear-gradient(180deg, #f9fafb, #f4f6f8);
234+
background-clip: padding-box;
228235
border-color: #c4cdd5;
229236

230237
.dark & {
231238
background: linear-gradient(180deg, theme(colors.dark.700), theme(colors.dark.750));
239+
background-clip: padding-box;
232240
border-color: theme(colors.dark.900);
233241
}
234242
}

resources/css/vendors/vue-select.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104

105105
.vs__open-indicator {
106106
@apply clickable;
107-
@apply flex items-center rounded-e px-2 text-sm shrink-0 h-full border-e-0 dark:border-dark-800;
107+
@apply flex items-center rounded-e px-2 text-sm shrink-0 h-full border-e-0 bg-clip-padding dark:border-dark-800;
108108
/* height: 2.375rem; */
109109
}
110110

0 commit comments

Comments
 (0)