From a8e0538e302018c46891bfa0817935261ebcdb8b Mon Sep 17 00:00:00 2001 From: Nikita Kruglickiy Date: Tue, 23 Apr 2024 22:17:54 +0300 Subject: [PATCH] Camera test --- .../gradle/wrapper/gradle-wrapper.properties | 3 +- assets/styles.scss | 4 ++ layouts/default.vue | 4 +- nuxt.config.ts | 3 + pages/index.vue | 10 +-- pages/nadar.vue | 42 +++--------- pages/profile.vue | 68 +++++++++++-------- 7 files changed, 63 insertions(+), 71 deletions(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 8838ba9..98deb16 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ +#Tue Apr 23 20:50:32 MSK 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/assets/styles.scss b/assets/styles.scss index 09eb1fc..6e54706 100644 --- a/assets/styles.scss +++ b/assets/styles.scss @@ -5,6 +5,10 @@ -moz-osx-font-smoothing: grayscale; } +:root:root { + --van-duration-base: 0.1s; +} + body, html { margin: 0; background-color: #f7f8fa; diff --git a/layouts/default.vue b/layouts/default.vue index 5ed91ab..60ed9af 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -2,8 +2,6 @@
- +
- \ No newline at end of file diff --git a/nuxt.config.ts b/nuxt.config.ts index c86275d..edbc880 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -3,5 +3,8 @@ export default defineNuxtConfig({ ssr: false, devtools: { enabled: true }, css: ['@/assets/styles.scss'], + app: { + pageTransition: { name: 'van-fade', mode: 'out-in' }, + }, modules: ['@vant/nuxt'], }) diff --git a/pages/index.vue b/pages/index.vue index ec963f7..bdf3e9e 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,8 +1,10 @@ diff --git a/pages/profile.vue b/pages/profile.vue index 2220ff4..cbf7b7a 100644 --- a/pages/profile.vue +++ b/pages/profile.vue @@ -1,36 +1,39 @@