Skip to content

Commit 5da5097

Browse files
MarcelGeoMarcelGeo
committed
Clanup: bubble class
Added: experimental components to vuetify 3.3.1 (labs)
1 parent 525e4ca commit 5da5097

File tree

11 files changed

+218
-222
lines changed

11 files changed

+218
-222
lines changed

‎web-app/packages/app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@
4141
"vue-router": "^4.1.6",
4242
"vue-tabler-icons": "~2.20.0",
4343
"vue-tel-input": "~4.4.2",
44-
"vuetify": "^3.3.0"
44+
"vuetify": "^3.3.1"
4545
}
4646
}

‎web-app/packages/app/src/plugins/vuetify/vuetify.ts

+8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
import { useI18n } from 'vue-i18n'
66
import { createVuetify } from 'vuetify'
77
import { createVueI18nAdapter } from 'vuetify/locale/adapters/vue-i18n'
8+
import * as components from 'vuetify/components'
9+
import * as directives from 'vuetify/directives'
10+
import * as labsComponents from 'vuetify/labs/components'
811

912
import i18n from '@/plugins/i18n/i18n'
1013
// TODO: saas overrides should be integrated differently,
@@ -21,6 +24,11 @@ const colors = {
2124
}
2225

2326
export default createVuetify({
27+
components: {
28+
...components,
29+
...labsComponents
30+
},
31+
directives,
2432
locale: {
2533
adapter: createVueI18nAdapter({ i18n, useI18n })
2634
},

‎web-app/packages/lib/src/common/components/FullStorageWarningTemplate.vue

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
66

77
<template>
88
<v-card
9-
class="bubble mt-3"
9+
class="mt-3"
1010
style="background-color: #fce8e6; color: rgba(0, 0, 0, 0.87)"
1111
variant="outlined"
1212
>
13-
<span>
14-
<b>Your storage is almost full ({{ usage }}%).</b> Soon you will not be
15-
able to sync your projects.
16-
<slot name="buttons"></slot>
17-
</span>
13+
<v-card-text
14+
><span>
15+
<b>Your storage is almost full ({{ usage }}%).</b> Soon you will not be
16+
able to sync your projects. <slot name="buttons"></slot> </span
17+
></v-card-text>
1818
</v-card>
1919
</template>
2020

‎web-app/packages/lib/src/common/components/WarningMessageTemplate.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
66

77
<template>
88
<v-card
9-
class="bubble mt-3"
9+
class="mt-3"
1010
style="background-color: #ffc863; color: rgba(0, 0, 0, 0.87); padding: 10px"
1111
variant="outlined"
1212
>
13-
<slot name="message"></slot>
13+
<v-card-tex><slot name="message"></slot></v-card-tex>
1414
</v-card>
1515
</template>
1616

‎web-app/packages/lib/src/modules/dashboard/components/DashboardAccessRequestsRow.vue

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
1212
namespaceAccessRequests.length > 0
1313
"
1414
>
15-
<v-card class="bubble mt-3">
16-
<h3>Project access requests</h3>
15+
<v-card variant="tonal" class="mt-3">
16+
<v-card-title><h3>Project access requests</h3></v-card-title>
1717
<v-card-text>
1818
<slot name="table" :namespace="currentNamespace"></slot>
1919
</v-card-text>
@@ -54,5 +54,4 @@ export default defineComponent({
5454
</script>
5555

5656
<style scoped lang="scss">
57-
@import 'src/sass/dashboard';
5857
</style>

‎web-app/packages/lib/src/modules/dashboard/components/DashboardProjectsRow.vue

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
77
<template>
88
<v-row>
99
<v-col class="pa-0">
10-
<v-card class="bubble mt-3" variant="outlined" color="white">
11-
<h3>Recent active projects</h3>
10+
<v-card class="mt-3" variant="outlined" color="white">
11+
<v-card-title><h3>Recent active projects</h3></v-card-title>
1212
<v-card-text style="padding-left: 0">
1313
<slot name="projects"></slot>
1414
</v-card-text>
@@ -26,5 +26,4 @@ export default defineComponent({
2626
</script>
2727

2828
<style scoped lang="scss">
29-
@import 'src/sass/dashboard';
3029
</style>

‎web-app/packages/lib/src/modules/dashboard/views/DashboardViewTemplate.vue

+57-55
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
1414
<v-container>
1515
<slot name="usageInfo" />
1616
<v-row v-if="projectsCount === 0 && canCreateProject">
17-
<v-card variant="outlined" class="bubble mt-3">
17+
<v-card variant="outlined" class="mt-3">
1818
<h3>Welcome {{ loggedUser.username }}, are you ready to start?</h3>
1919
<p>
2020
First create new project, add people to it or explore public
@@ -27,57 +27,60 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
2727
</v-row>
2828
<v-row>
2929
<v-col class="pa-0">
30-
<v-card class="bubble mt-3" variant="outlined">
31-
<h3>Download Mergin Maps Input app</h3>
32-
<p>
33-
Capture geo-info easily through your mobile/tablet with the
34-
Mergin Maps Input app. Designed to be compatible with all mobile
35-
devices - even those with small screens.
36-
</p>
37-
<v-row>
38-
<v-col cols="7" md="3" sm="3">
39-
<div class="store-button">
40-
<a
41-
href="https://play.google.com/store/apps/details?id=uk.co.lutraconsulting&utm_source=mergin-website&utm_medium=banner&utm_campaign=input"
42-
target="_blank"
43-
>
44-
<img
45-
alt="Get it on Google Play"
46-
src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
47-
height="70px"
48-
/>
49-
</a>
50-
</div>
51-
</v-col>
52-
<v-col cols="7" md="3" sm="3">
53-
<div class="store-button app-store-button">
54-
<a
55-
href="https://apps.apple.com/us/app/input/id1478603559?ls=1&utm_source=mergin-website&utm_medium=banner&utm_campaign=input"
56-
target="_blank"
57-
>
58-
<img
59-
alt="Get it on Apple store"
60-
src="@/assets/App_Store.svg"
61-
height="48px"
62-
/>
63-
</a>
64-
</div>
65-
</v-col>
66-
<v-col cols="7" md="3" sm="3">
67-
<div class="store-button huawei-store-button">
68-
<a
69-
href="https://appgallery.huawei.com/app/C104422773"
70-
target="_blank"
71-
>
72-
<img
73-
alt="Explore it on AppGallery"
74-
src="@/assets/huawei.svg"
75-
height="48px"
76-
/>
77-
</a>
78-
</div>
79-
</v-col>
80-
</v-row>
30+
<v-card class="mt-3" variant="tonal">
31+
<v-card-title
32+
><h3>Download Mergin Maps Input app</h3></v-card-title
33+
>
34+
<v-card-text
35+
><p>
36+
Capture geo-info easily through your mobile/tablet with the
37+
Mergin Maps Input app. Designed to be compatible with all
38+
mobile devices - even those with small screens.
39+
</p>
40+
<v-row>
41+
<v-col cols="7" md="3" sm="3">
42+
<div class="store-button">
43+
<a
44+
href="https://play.google.com/store/apps/details?id=uk.co.lutraconsulting&utm_source=mergin-website&utm_medium=banner&utm_campaign=input"
45+
target="_blank"
46+
>
47+
<img
48+
alt="Get it on Google Play"
49+
src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
50+
height="70"
51+
/>
52+
</a>
53+
</div>
54+
</v-col>
55+
<v-col cols="7" md="3" sm="3">
56+
<div class="store-button app-store-button">
57+
<a
58+
href="https://apps.apple.com/us/app/input/id1478603559?ls=1&utm_source=mergin-website&utm_medium=banner&utm_campaign=input"
59+
target="_blank"
60+
>
61+
<img
62+
alt="Get it on Apple store"
63+
src="@/assets/App_Store.svg"
64+
height="48"
65+
/>
66+
</a>
67+
</div>
68+
</v-col>
69+
<v-col cols="7" md="3" sm="3">
70+
<div class="store-button huawei-store-button">
71+
<a
72+
href="https://appgallery.huawei.com/app/C104422773"
73+
target="_blank"
74+
>
75+
<img
76+
alt="Explore it on AppGallery"
77+
src="@/assets/huawei.svg"
78+
height="48"
79+
/>
80+
</a>
81+
</div>
82+
</v-col> </v-row
83+
></v-card-text>
8184
</v-card>
8285
</v-col>
8386
</v-row>
@@ -137,8 +140,6 @@ export default defineComponent({
137140
</script>
138141

139142
<style scoped lang="scss">
140-
@import 'src/sass/dashboard';
141-
142143
.v-navigation-drawer {
143144
-webkit-overflow-scrolling: touch;
144145
display: -webkit-box;
@@ -178,7 +179,8 @@ export default defineComponent({
178179

179180
@media only screen and (max-width: 599px) {
180181
.store-button {
181-
text-align: left;
182+
text-align: right;
183+
182184
}
183185

184186
.app-store-button {

0 commit comments

Comments
 (0)