Skip to content

Commit 3d7cd78

Browse files
authored
Merge pull request coollabsio#570 from ArticaDev/main
UI Improvements and minor responsiveness fixes 👍
2 parents fdce709 + cb7659b commit 3d7cd78

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

apps/ui/src/lib/components/Usage.svelte

+7-6
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,19 @@
8585
</script>
8686

8787
<div class="w-full">
88-
<div class="flex items-center">
88+
<div class="items-center grid grid-flow-row md:grid-flow-col md:w-96 gap-4">
8989
<h1 class="title lg:text-3xl">Hardware Details</h1>
90-
<div class="flex space-x-4">
90+
<div class="grid lg:grid-flow-col gap-4">
9191
{#if $appSession.teamId === '0'}
92-
<button on:click={manuallyCleanupStorage} class:loading={loading.cleanup} class="btn btn-sm"
93-
>Cleanup Storage</button
92+
<button
93+
on:click={manuallyCleanupStorage}
94+
class:loading={loading.cleanup}
95+
class="btn btn-sm w-36 h-14">Cleanup Storage</button
9496
>
9597
<button
9698
on:click={restartCoolify}
9799
class:loading={loading.restart}
98-
class="btn btn-sm bg-red-600 hover:bg-red-500">Restart Coolify</button
100+
class="btn btn-sm w-36 h-14 bg-red-600 hover:bg-red-500">Restart Coolify</button
99101
>
100102
{/if}
101103
</div>
@@ -126,7 +128,6 @@
126128
</div>
127129

128130
<div class="stats stats-vertical min-w-[20rem] mb-5 bg-transparent rounded">
129-
130131
<div class="stat">
131132
<div class="stat-title">Total CPU</div>
132133
<div class="stat-value text-2xl">

apps/ui/src/routes/__layout.svelte

+3-1
Original file line numberDiff line numberDiff line change
@@ -394,5 +394,7 @@
394394
{/if}
395395
{/if}
396396
<main>
397-
<slot />
397+
<div class="px-20">
398+
<slot />
399+
</div>
398400
</main>

apps/ui/src/routes/login.svelte

+5-4
Original file line numberDiff line numberDiff line change
@@ -69,28 +69,29 @@
6969
required
7070
bind:this={emailEl}
7171
bind:value={email}
72+
class="w-56 md:w-96"
7273
/>
7374
<input
7475
type="password"
7576
name="password"
7677
placeholder={$t('forms.password')}
7778
bind:value={password}
7879
required
80+
class="w-56 md:w-96"
7981
/>
8082

8183
<div class="flex space-x-2 h-8 items-center justify-center pt-8">
8284
<button
8385
type="submit"
8486
disabled={loading}
8587
class="btn btn-sm"
86-
class:loading={loading}
88+
class:loading
8789
class:bg-coollabs={!loading}
8890
>{loading ? $t('login.authenticating') : $t('login.login')}</button
8991
>
9092

91-
<button
92-
on:click|preventDefault={gotoRegister}
93-
class="btn btn-sm">{$t('register.register')}</button
93+
<button on:click|preventDefault={gotoRegister} class="btn btn-sm"
94+
>{$t('register.register')}</button
9495
>
9596
</div>
9697
</form>

apps/ui/src/routes/register.svelte

+4-2
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
required
102102
bind:this={emailEl}
103103
bind:value={email}
104+
class="w-56 md:w-96"
104105
/>
105106
<input
106107
type="password"
@@ -109,13 +110,15 @@
109110
bind:this={passwordEl}
110111
bind:value={password}
111112
required
113+
class="w-56 md:w-96"
112114
/>
113115
<input
114116
type="password"
115117
name="passwordCheck"
116118
placeholder={$t('forms.password_again')}
117119
bind:value={passwordCheck}
118120
required
121+
class="w-56 md:w-96"
119122
/>
120123

121124
<div class="flex space-x-2 h-8 items-center justify-center pt-8">
@@ -125,8 +128,7 @@
125128
disabled={loading}
126129
class:bg-transparent={loading}
127130
class:bg-coollabs={!loading}
128-
class:loading={loading}
129-
>{loading ? $t('register.registering') : $t('register.register')}</button
131+
class:loading>{loading ? $t('register.registering') : $t('register.register')}</button
130132
>
131133
</div>
132134
</form>

apps/ui/src/tailwind.css

+1-7
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ body {
2424
@apply min-h-screen overflow-x-hidden bg-coolblack text-sm text-white scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200;
2525
}
2626

27-
main,
28-
.main {
29-
width: calc(100% - 4rem);
30-
margin-left: 4rem;
31-
}
32-
3327
input {
3428
@apply h-12 w-96 rounded border border-transparent bg-transparent bg-coolgray-200 p-2 text-xs tracking-tight text-white placeholder-stone-600 outline-none transition duration-150 hover:bg-coolgray-500 focus:bg-coolgray-500 disabled:border disabled:border-dashed disabled:border-coolgray-300 disabled:bg-transparent md:text-sm;
3529
}
@@ -106,7 +100,7 @@ a {
106100
@apply mr-4 text-base tracking-tight md:text-2xl font-bold;
107101
}
108102
.nav-main {
109-
@apply fixed top-0 left-0 min-h-screen w-16 min-w-[4rem] overflow-auto border-r border-stone-800 bg-coolgray-200 scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200 xl:overflow-visible;
103+
@apply fixed top-0 left-0 min-h-screen w-16 min-w-[4rem] overflow-hidden border-r border-stone-800 bg-coolgray-200 scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200 xl:overflow-visible;
110104
}
111105

112106
.nav-side {

0 commit comments

Comments
 (0)