Skip to content

Commit 6f7b010

Browse files
authored
merge: Merge pull request #105 from ArunaStorage/refactor/layout
Update global design layout
2 parents efe4241 + cb679aa commit 6f7b010

Some content is hidden

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

57 files changed

+1422
-1655
lines changed

app.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {parseJwt} from "~/composables/utils";
77
88
import {h} from 'vue';
99
import Toaster from '@/components/ui/toast/Toaster.vue'
10-
import RegistrationDialog from "@/components/custom-ui/RegistrationDialog.vue";
10+
import RegistrationDialog from "~/components/custom-ui/dialog/RegistrationDialog.vue";
1111
import {useToast} from '@/components/ui/toast/use-toast'
1212
1313
const {toast} = useToast()
@@ -79,8 +79,10 @@ async function updateUser() {
7979
description: h('div',
8080
{class: 'flex space-x-2 items-center justify-center'},
8181
[
82-
h(IconPlant, {class: 'flex-shrink-0 size-5 text-gray-700'}),
83-
h('span', {class: 'text-aruna-800'}, ['Please wait until your account gets activated by an administrator.'])
82+
h(IconPlant, {class: 'flex-shrink-0 size-5 text-green-400'}),
83+
h('span',
84+
{class: 'text-fuchsia-50'},
85+
['Please wait until your account gets activated by an administrator.'])
8486
]),
8587
duration: 10000
8688
})
@@ -139,7 +141,7 @@ onBeforeMount(() => updateUser())
139141
</div>
140142

141143
<div v-else
142-
class="flex flex-col flex-grow md:min-h-screen px-6 py-2 bg-gradient-to-b from-aruna-800/[.30] via-transparent to-aruna-800/[.10]">
144+
class="flex flex-col flex-grow md:min-h-screen bg-[url('/_nuxt/assets/imgs/global-bg.webp')] bg-cover bg-fixed bg-center bg-no-repeat">
143145
<ToastInfo v-if="useRuntimeConfig().public.infoBanner.active" modalId="info-toast" infoMsg="Hello"/>
144146
<NuxtLoadingIndicator/>
145147
<NuxtPage/>

assets/imgs/global-bg.webp

316 KB
Loading

assets/styles/main.css

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,11 @@
33
@tailwind utilities;
44

55
@layer base {
6-
:root {
7-
--background: 0 0% 100%;
8-
--foreground: 222.2 84% 4.9%;
9-
10-
--muted: 210 40% 96.1%;
11-
--muted-foreground: 215.4 16.3% 46.9%;
12-
13-
--popover: 0 0% 100%;
14-
--popover-foreground: 222.2 84% 4.9%;
15-
16-
--card: 0 0% 100%;
17-
--card-foreground: 222.2 84% 4.9%;
18-
19-
--border: 214.3 31.8% 91.4%;
20-
--input: 214.3 31.8% 91.4%;
21-
22-
--primary: 222.2 47.4% 11.2%;
23-
--primary-foreground: 210 40% 98%;
24-
25-
--secondary: 210 40% 96.1%;
26-
--secondary-foreground: 222.2 47.4% 11.2%;
27-
28-
--accent: 210 40% 96.1%;
29-
--accent-foreground: 222.2 47.4% 11.2%;
30-
31-
--destructive: 0 84.2% 60.2%;
32-
--destructive-foreground: 210 40% 98%;
33-
34-
--ring: 222.2 84% 4.9%;
35-
36-
--radius: 0.5rem;
6+
html {
7+
scroll-behavior: smooth;
378
}
389

39-
.dark {
10+
:root {
4011
--background: 222.2 84% 4.9%;
4112
--foreground: 210 40% 98%;
4213

@@ -65,6 +36,20 @@
6536
--destructive-foreground: 210 40% 98%;
6637

6738
--ring: 212.7 26.8% 83.9%;
39+
40+
--radius: 0.5rem;
41+
42+
--vis-tooltip-background-color: none !important;
43+
--vis-tooltip-border-color: none !important;
44+
--vis-tooltip-text-color: none !important;
45+
--vis-tooltip-shadow-color: none !important;
46+
--vis-tooltip-backdrop-filter: none !important;
47+
--vis-tooltip-padding: none !important;
48+
49+
--vis-primary-color: var(--primary);
50+
/* change to any hsl value you want */
51+
--vis-secondary-color: 160 81% 40%;
52+
--vis-text-color: var(--muted-foreground);
6853
}
6954
}
7055

components/badge/dataclass.vue

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

components/badge/resource_license.vue

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

components/badge/resource_permission.vue

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

components/badge/resource_status.vue

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

components/badge/resource_type.vue

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

components/badge/stats.vue

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

components/card/Labels.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ function getLabels(): v2KeyValue[] | undefined {
2121
<div class="-m-1.5 overflow-x-auto">
2222
<div class="p-1.5 min-w-full inline-block align-middle">
2323
<div class="overflow-hidden">
24-
<table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
24+
<table class="min-w-full divide-y divide-gray-500">
2525
<thead>
2626
<tr>
27-
<th scope="col" class="px-6 py-3 text-start text-sm font-medium text-gray-500 uppercase">Key</th>
28-
<th scope="col" class="px-6 py-3 text-start text-sm font-medium text-gray-500 uppercase">Value</th>
29-
<th scope="col" class="px-6 py-3 text-start text-sm font-medium text-gray-500 uppercase">Static
27+
<th scope="col" class="px-6 py-3 text-start text-sm font-medium text-gray-400 uppercase">Key</th>
28+
<th scope="col" class="px-6 py-3 text-start text-sm font-medium text-gray-400 uppercase">Value</th>
29+
<th scope="col" class="px-6 py-3 text-start text-sm font-medium text-gray-400 uppercase">Static
3030
</th>
3131
</tr>
3232
</thead>
33-
<tbody class="divide-y divide-gray-200 dark:divide-gray-700">
34-
<tr v-for="label in getLabels()" class="hover:bg-gray-100 dark:hover:bg-gray-700">
35-
<td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-gray-200">
33+
<tbody class="divide-y divide-gray-500">
34+
<tr v-for="label in getLabels()" class="hover:bg-gray-700">
35+
<td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-300">
3636
{{ label.key }}
3737
</td>
38-
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-200">
38+
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-300">
3939
<div v-html="prettyDisplayJson(label.value)" />
4040
</td>
4141
<td class="px-6 py-4 whitespace-nowrap text-center text-sm font-medium">

0 commit comments

Comments
 (0)