Skip to content

Commit 2f36060

Browse files
authored
Design bits (#55)
* Update AdminPanelProvider.php * Add styling for textareas * Add "content" styles * Update AdminPanelProvider.php * Fix flaky register test for password * Update RegisterControllerTest.php
1 parent 79730b3 commit 2f36060

File tree

7 files changed

+129
-13
lines changed

7 files changed

+129
-13
lines changed

app/Providers/Filament/AdminPanelProvider.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Filament\Pages;
1010
use Filament\Panel;
1111
use Filament\PanelProvider;
12-
use Filament\Support\Colors\Color;
1312
use Filament\Widgets;
1413
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
1514
use Illuminate\Cookie\Middleware\EncryptCookies;
@@ -29,7 +28,7 @@ public function panel(Panel $panel): Panel
2928
->path('admin')
3029
->login()
3130
->colors([
32-
'primary' => Color::Amber,
31+
'primary' => '#1e293b',
3332
])
3433
->discoverResources(in: app_path('Filament/Resources'), for: 'App\\Filament\\Resources')
3534
->discoverPages(in: app_path('Filament/Pages'), for: 'App\\Filament\\Pages')

resources/js/Components/Header.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
v-text="link.label"
2525
class="rounded-xl px-3 py-2 text-sm font-medium"
2626
:class="{
27-
'bg-slate-100': link.components.includes($page.component),
27+
'bg-slate-100 text-slate-800': link.components.includes($page.component),
2828
'text-slate-500 hover:text-slate-900': !link.components.includes($page.component),
2929
}"
3030
/>
@@ -68,7 +68,7 @@
6868
v-text="link.label"
6969
class="rounded-xl px-3 py-2 text-base font-medium block"
7070
:class="{
71-
'bg-slate-100': link.components.includes($page.component),
71+
'bg-slate-100 text-slate-800': link.components.includes($page.component),
7272
'text-slate-500 hover:text-slate-900': !link.components.includes($page.component),
7373
}"
7474
aria-current="page"

resources/scss/_content.scss

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
.content {
2+
@apply text-slate-700;
3+
4+
h1,
5+
h2,
6+
h3,
7+
h4,
8+
h5,
9+
h6 {
10+
@apply text-slate-800;
11+
12+
a {
13+
@apply text-slate-800 hover:no-underline;
14+
}
15+
}
16+
17+
h1 {
18+
@apply text-4xl md:text-5xl;
19+
}
20+
21+
h2 {
22+
@apply text-3xl;
23+
}
24+
25+
h3 {
26+
@apply text-2xl;
27+
}
28+
29+
h4 {
30+
@apply text-xl;
31+
}
32+
33+
h5 {
34+
@apply text-lg;
35+
}
36+
37+
h6 {
38+
@apply text-base;
39+
}
40+
41+
li {
42+
@apply ml-8;
43+
}
44+
45+
a {
46+
@apply hover:underline;
47+
}
48+
49+
ul li {
50+
@apply list-disc;
51+
}
52+
53+
ol li {
54+
@apply list-decimal;
55+
}
56+
57+
strong {
58+
@apply font-bold;
59+
}
60+
61+
blockquote {
62+
@apply pl-4 py-3 my-4 border-s-4 border-gray-300 text-xl italic;
63+
}
64+
65+
table {
66+
@apply w-full text-sm text-left;
67+
}
68+
69+
th {
70+
@apply p-4 text-slate-800 font-bold bg-slate-200;
71+
}
72+
73+
td {
74+
@apply p-4 font-medium text-slate-800;
75+
}
76+
77+
tr:not(:last-child) td {
78+
@apply border-b border-slate-200;
79+
}
80+
81+
> * + * {
82+
@apply mt-6;
83+
}
84+
85+
* {
86+
& + h1,
87+
& + h2,
88+
& + h3,
89+
& + h4,
90+
& + h5,
91+
& + h6 {
92+
@apply mt-12;
93+
}
94+
}
95+
96+
p code,
97+
li code {
98+
@apply rounded-full text-xs bg-slate-800 py-1 px-2 text-slate-200 inline-block;
99+
}
100+
}

resources/scss/_forms.scss

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,36 @@
1+
label {
2+
&[for] {
3+
@apply cursor-pointer;
4+
}
5+
}
6+
17
.label {
2-
@apply pb-2 block text-base font-medium leading-6 text-slate-800;
8+
@apply pb-3 block text-base font-medium text-slate-800;
39
}
410

511
.small-label {
6-
@apply block text-sm font-medium leading-6 text-slate-800;
12+
@apply block text-sm font-medium text-slate-800;
713
}
814

915
.inline-label {
1016
@apply flex items-center gap-x-2;
1117
}
1218

13-
.input {
14-
@apply block w-full text-slate-800 rounded-md border-slate-300 shadow-sm focus:border-slate-300 focus:ring focus:ring-slate-200 focus:ring-opacity-50;
19+
.input,
20+
.textarea,
21+
.checkbox {
22+
@apply block text-slate-800 rounded-md border-slate-300 shadow-sm focus:border-slate-300 focus:ring focus:ring-slate-200 focus:ring-opacity-50;
23+
}
24+
25+
.input,
26+
.textarea {
27+
@apply block text-base w-full;
28+
}
29+
30+
.textarea {
31+
@apply min-h-32;
1532
}
1633

1734
.checkbox {
18-
@apply h-5 w-5 text-slate-800 rounded-md border-slate-300 shadow-sm focus:border-slate-300 focus:ring focus:ring-slate-200 focus:ring-opacity-50;
35+
@apply h-5 w-5 cursor-pointer;
1936
}

resources/scss/app.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
@tailwind components;
33
@tailwind utilities;
44

5-
@import "forms";
5+
@import "forms", "content";

resources/views/app.blade.php

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

1616
@inertiaHead
1717

18-
<body class="h-full">
18+
<body class="h-full font-sans text-slate-700">
1919
@inertia
2020
</body>
2121

tests/Feature/Controllers/RegisterControllerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
'first_name' => fake()->firstName(),
3838
'last_name' => fake()->lastName(),
3939
'email' => $email,
40-
'password' => fake()->password(15),
40+
'password' => 'P$ssword12345#',
4141
])
4242
->assertRedirect(route('home'));
4343

@@ -66,7 +66,7 @@
6666
'first_name' => fake()->firstName(),
6767
'last_name' => fake()->lastName(),
6868
'email' => $email,
69-
'password' => fake()->password(15),
69+
'password' => 'P$ssword12345#',
7070
])
7171
->assertSessionHasErrors('email');
7272
});

0 commit comments

Comments
 (0)