Skip to content

Commit d9ec91b

Browse files
committed
Tailwind v4
1 parent 07522ef commit d9ec91b

File tree

76 files changed

+772
-1628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+772
-1628
lines changed

config/blade-ui-kit.php

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

1818
'components' => [
1919
// 'alert' => Components\Alerts\Alert::class,
20-
'avatar' => Components\Support\Avatar::class,
20+
// 'avatar' => Components\Support\Avatar::class,
2121
// 'carbon' => Components\DateTime\Carbon::class,
2222
// 'checkbox' => Components\Forms\Inputs\Checkbox::class,
2323
// 'color-picker' => Components\Forms\Inputs\ColorPicker::class,

package-lock.json

Lines changed: 571 additions & 1441 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@
99
"@tailwindcss/aspect-ratio": "^0.4.2",
1010
"@tailwindcss/forms": "^0.5.7",
1111
"@tailwindcss/typography": "^0.5.0",
12+
"@tailwindcss/vite": "^4.1.4",
1213
"algoliasearch": "^4.8.4",
13-
"autoprefixer": "^10.4.0",
1414
"axios": "^1.6",
1515
"choices.js": "^11.0.6",
1616
"highlight.js": "^11.9.0",
1717
"laravel-vite-plugin": "^1.0.1",
1818
"pixelmatch": "^5.0.0",
19-
"postcss": "^8.4.31",
20-
"postcss-import": "^16.0.0",
21-
"tailwindcss": "^3.0.2",
19+
"tailwindcss": "^4.1.4",
2220
"textarea-caret": "^3.1.0",
2321
"vite": "^6.2.0"
2422
}

postcss.config.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

public/vendor/horizon/app-dark.css

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/vendor/horizon/app.css

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/vendor/horizon/css/app.css

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/css/app.css

Lines changed: 45 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
1-
@import 'tailwindcss/base';
2-
3-
@import 'highlight.js/styles/hybrid.css';
4-
5-
@import 'tailwindcss/components';
6-
7-
@import 'tailwindcss/utilities';
8-
9-
@import 'articles.css';
10-
@import 'buttons.css';
11-
@import 'labels.css';
12-
@import 'modal.css';
13-
@import 'replies.css';
14-
@import 'tables.css';
15-
@import 'tags.css';
16-
17-
@import url('https://rsms.me/inter/inter.css');
1+
@import 'tailwindcss';
2+
3+
@import 'highlight.js/styles/hybrid.css' layer(base);
4+
5+
@import './articles.css' layer(utilities);
6+
@import './buttons.css' layer(utilities);
7+
@import './labels.css' layer(utilities);
8+
@import './modal.css' layer(utilities);
9+
@import './replies.css' layer(utilities);
10+
@import './tables.css' layer(utilities);
11+
@import './tags.css' layer(utilities);
12+
13+
@config '../../tailwind.config.js';
14+
15+
/*
16+
The default border color has changed to `currentcolor` in Tailwind CSS v4,
17+
so we've added these compatibility styles to make sure everything still
18+
looks the same as it did with Tailwind CSS v3.
19+
20+
If we ever want to remove these styles, we need to add an explicit border
21+
color utility to any element that depends on these defaults.
22+
*/
23+
@layer base {
24+
*,
25+
::after,
26+
::before,
27+
::backdrop,
28+
::file-selector-button {
29+
border-color: var(--color-gray-200, currentcolor);
30+
}
31+
}
1832

1933
.number-block {
2034
box-shadow: 20px 0 40px 5px #e6f6f3 inset, -20px 0 10px 5px #e6f6f3 inset;
@@ -28,7 +42,7 @@ a > span > em {
2842
@apply w-full;
2943
}
3044

31-
@screen lg {
45+
@media (width >= theme(--breakpoint-lg)) {
3246
.search {
3347
width: 720px;
3448
}
@@ -80,7 +94,7 @@ svg .secondary {
8094
}
8195

8296
.nav .dropdown a:focus {
83-
@apply outline-none bg-gray-100;
97+
@apply outline-hidden bg-gray-100;
8498
}
8599

86100
.member:after {
@@ -100,51 +114,51 @@ svg .secondary {
100114
}
101115

102116
.choices__inner {
103-
@apply rounded-md border border-gray-300 w-full bg-white p-2 items-center !important;
117+
@apply rounded-md! border! border-gray-300! w-full! bg-white! p-2! items-center!;
104118
}
105119

106120
.choices__list--dropdown {
107-
@apply border border-gray-300 !important;
121+
@apply border! border-gray-300!;
108122
}
109123

110124
.choices__list--single {
111-
@apply p-0 !important;
125+
@apply p-0!;
112126
}
113127

114128
.choices__item {
115-
@apply text-sm bg-gray-200 text-gray-700 cursor-pointer rounded-md px-2 py-1 my-0 border-0 !important;
129+
@apply text-sm! bg-gray-200! text-gray-700! cursor-pointer! rounded-md! px-2! py-1! my-0! border-0!;
116130
}
117131

118132
.choices__item.choices__item--choice {
119-
@apply rounded-none py-2 !important;
133+
@apply rounded-none! py-2!;
120134
}
121135

122136
.choices__item.choices__item--choice.choices__item--selectable {
123-
@apply bg-white rounded-none text-gray-700 p-2 !important;
137+
@apply bg-white! rounded-none! text-gray-700! p-2!;
124138
}
125139

126140
.choices__item.choices__item--choice.choices__item--selectable:hover {
127-
@apply bg-gray-200 !important;
141+
@apply bg-gray-200!;
128142
}
129143

130144
.choices__item.choices__item--selectable {
131-
@apply bg-lio-500 border-lio-500 text-white !important;
145+
@apply bg-lio-500! border-lio-500! text-white!;
132146
}
133147

134148
.choices__list--single > .choices__item.choices__item--selectable {
135-
@apply bg-white text-gray-700 !important;
149+
@apply bg-white! text-gray-700!;
136150
}
137151

138152
.choices__item.is-highlighted {
139-
@apply bg-lio-600 border-lio-600 text-white !important;
153+
@apply bg-lio-600! border-lio-600! text-white!;
140154
}
141155

142156
.choices[data-type*='select-one']:after {
143-
border-color: theme('colors.gray.500') transparent transparent transparent !important;
157+
border-color: var(--color-gray-500) transparent transparent transparent !important;
144158
}
145159

146160
.choices[data-type*='select-one'] .choices__input {
147-
@apply rounded-none border-b-2 border-gray-300 !important;
161+
@apply rounded-none! border-b-2! border-gray-300!;
148162
}
149163

150164
.editor li[aria-selected='true'] {

resources/css/buttons.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
.button {
2-
@apply bg-gray-300 text-gray-700 rounded px-4 py-2 block text-center cursor-pointer font-sans;
2+
@apply bg-gray-300 text-gray-700 rounded-sm px-4 py-2 block text-center cursor-pointer font-sans;
33
}
44

55
.button:hover {
66
@apply bg-gray-400;
77
}
88

99
.button-primary {
10-
@apply text-white bg-lio-500 !important;
10+
@apply text-white! bg-lio-500!;
1111
}
1212

1313
.button-primary:hover {
1414
@apply bg-lio-600;
1515
}
1616

1717
.button-danger {
18-
@apply text-white bg-red-600 !important;
18+
@apply text-white! bg-red-600!;
1919
}
2020

2121
.button-danger:hover {

resources/css/labels.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.label {
2-
@apply px-2 py-1 rounded text-xs uppercase bg-gray-300 text-gray-700 px-2 py-1 cursor-pointer;
2+
@apply px-2 py-1 rounded-sm text-xs uppercase bg-gray-300 text-gray-700 px-2 py-1 cursor-pointer;
33
}
44

55
a.label:hover,

0 commit comments

Comments
 (0)