Skip to content

Commit

Permalink
style: update vuetify & use newly fixed .fill-height class (#1854)
Browse files Browse the repository at this point in the history
  • Loading branch information
ThibaultNocchi authored and ferferga committed Feb 28, 2023
1 parent f019e0c commit a7b2818
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 18 deletions.
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"vue": "3.2.39",
"vue-i18n": "9.2.2",
"vue-router": "4.1.5",
"vuetify": "3.1.1"
"vuetify": "3.1.2"
},
"devDependencies": {
"@iconify/json": "2.1.104",
Expand Down
4 changes: 0 additions & 4 deletions frontend/src/assets/styles/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,3 @@
.overflow-hidden {
overflow: hidden;
}

.full-height {
height: 100vh;
}
1 change: 1 addition & 0 deletions frontend/src/components/RouterViewTransition.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<!-- This div is required because <transition> requires a single children node -->
<div
:key="getKey(route)"
class="h-100"
:class="
isRoot
? 'router-view-root-transition-wrapper'
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/layouts/server.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<v-main>
<v-main class="h-100">
<router-view-transition />
</v-main>
<v-footer app color="transparent">
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/server/add.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<v-container class="full-height d-flex" fluid>
<v-row align="center" justify="center">
<v-container class="fill-height" fluid>
<v-row justify="center">
<v-col sm="6" md="6" lg="5">
<h1 class="text-h4 mb-6 text-center">
{{ $t('login.addServer') }}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/server/login.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<v-container class="full-height d-flex" fluid>
<v-row align="center" justify="center">
<v-container class="fill-height" fluid>
<v-row justify="center">
<v-col
v-if="isEmpty(currentUser) && !loginAsOther && publicUsers.length > 0"
sm="10"
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/server/select.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<v-container class="full-height d-flex" fluid>
<v-row align="center" justify="center">
<v-container class="fill-height" fluid>
<v-row justify="center">
<v-col sm="6" md="6" lg="5">
<h1 class="text-h4 mb-6 text-center">
{{ $t('login.selectServer') }}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/wizard.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<v-container class="full-height d-flex" fluid>
<v-row align="center" justify="center">
<v-container class="fill-height" fluid>
<v-row justify="center">
<v-col cols="12" sm="12" md="12" xl="8">
<h1 class="text-h4 mb-6 text-center">{{ heading }}</h1>
<!-- TODO: Wait for Vuetify 3.1 -->
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

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

0 comments on commit a7b2818

Please sign in to comment.