Skip to content

Commit

Permalink
CSS tidy
Browse files Browse the repository at this point in the history
consolidate our style sheets
resolve style conflicts
use primevue defaults where possible
make semi-responsive
  • Loading branch information
TimCsaky committed Nov 20, 2023
1 parent 45a0aa0 commit 1b226da
Show file tree
Hide file tree
Showing 22 changed files with 565 additions and 705 deletions.
14 changes: 7 additions & 7 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"pinia-plugin-persistedstate": "^3.2.0",
"primeflex": "^3.3.1",
"primeicons": "^6.0.1",
"primevue": "~3.34.1",
"primevue": "^3.40.1",
"qrcode.vue": "^3.4.1",
"vee-validate": "^4.11.8",
"vue": "^3.3.7",
Expand Down
35 changes: 24 additions & 11 deletions frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,28 @@ onErrorCaptured((e: Error) => {
</script>

<template>
<ConfirmDialog />
<ProgressLoader v-if="getIsLoading" />
<Toast />
<AppLayout>
<template #nav>
<Navbar />
</template>
<template #main>
<RouterView v-if="ready" />
</template>
</AppLayout>
<div class="container">
<ConfirmDialog />
<ProgressLoader v-if="getIsLoading" />
<Toast />

<AppLayout>
<template #nav>
<Navbar />
</template>
<template #main>
<RouterView v-if="ready" />
</template>
</AppLayout>
</div>
</template>

<style scoped>
.container {
display: flex;
align-items: center;
justify-content: center;
min-height: 100vh;
width: 100%;
}
</style>
86 changes: 0 additions & 86 deletions frontend/src/assets/base.css

This file was deleted.

Loading

0 comments on commit 1b226da

Please sign in to comment.