From 2c4d8ee8e2413c4903d1ded6650613b06d3337ee Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Mon, 18 Jul 2022 14:52:59 +0200
Subject: [PATCH] chore(gui-v2): remove duplicate color transitions
---
packages/nc-gui-v2/app.vue | 4 +--
.../nc-gui-v2/components/general/Share.vue | 2 +-
.../nc-gui-v2/components/general/Social.vue | 2 +-
packages/nc-gui-v2/nuxt.config.ts | 3 ++-
packages/nc-gui-v2/pages/projects/index.vue | 4 +--
.../nc-gui-v2/pages/projects/index/list.vue | 2 +-
packages/nc-gui-v2/pages/signin.vue | 25 ++++---------------
packages/nc-gui-v2/pages/signup.vue | 11 +++-----
packages/nc-gui-v2/windi.config.ts | 4 +--
9 files changed, 18 insertions(+), 39 deletions(-)
diff --git a/packages/nc-gui-v2/app.vue b/packages/nc-gui-v2/app.vue
index 8317c25d91..32ef22c7a2 100644
--- a/packages/nc-gui-v2/app.vue
+++ b/packages/nc-gui-v2/app.vue
@@ -66,7 +66,7 @@ const signOut = () => {
class="group hover:(bg-gray-200) dark:(hover:bg-gray-600) flex items-center p-2 no-underline"
to="/user/settings"
>
-
+
{{ email }}
@@ -77,7 +77,7 @@ const signOut = () => {
class="group flex flex-row cursor-pointer hover:bg-gray-200 dark:(hover:bg-gray-600) flex items-center p-2"
@click="signOut"
>
-
+
{{ $t('general.signOut') }}
diff --git a/packages/nc-gui-v2/components/general/Share.vue b/packages/nc-gui-v2/components/general/Share.vue
index ca6303138c..a48cd29a38 100644
--- a/packages/nc-gui-v2/components/general/Share.vue
+++ b/packages/nc-gui-v2/components/general/Share.vue
@@ -292,6 +292,6 @@ const openUrl = (url: string) => {
}
a {
- @apply cursor-pointer text-3xl rounded-full p-2 bg-gray-100 shadow-md hover:(shadow-lg bg-gray-200) color-transition;
+ @apply cursor-pointer text-3xl rounded-full p-2 bg-gray-100 shadow-md hover:(shadow-lg bg-gray-200);
}
diff --git a/packages/nc-gui-v2/components/general/Social.vue b/packages/nc-gui-v2/components/general/Social.vue
index 3cf23a1f6b..509e723a98 100644
--- a/packages/nc-gui-v2/components/general/Social.vue
+++ b/packages/nc-gui-v2/components/general/Social.vue
@@ -46,7 +46,7 @@ const isZhLang = $computed(() => locale.value.startsWith('zh'))
diff --git a/packages/nc-gui-v2/pages/signup.vue b/packages/nc-gui-v2/pages/signup.vue
index 3c01eee925..21477202de 100644
--- a/packages/nc-gui-v2/pages/signup.vue
+++ b/packages/nc-gui-v2/pages/signup.vue
@@ -71,12 +71,7 @@ const resetError = () => {
-
-
-
+
{{ $t('general.signUp') }}
@@ -128,9 +123,9 @@ const resetError = () => {
:class="[
!valid
? '!opacity-50 !cursor-default'
- : 'shadow-md hover:(text-primary bg-primary/10 dark:text-white dark:!bg-primary/50)',
+ : 'text-white bg-primary hover:(text-primary !bg-primary/75) dark:(!bg-secondary/75 hover:!bg-secondary/50)',
]"
- class="ml-1 border-1 border-solid border-gray-300 color-transition rounded-lg p-4 bg-gray-100/50"
+ class="ml-1 border-1 border-solid border-gray-300 rounded-lg p-4 bg-gray-100/50"
type="submit"
>
{{ $t('general.signUp') }}
diff --git a/packages/nc-gui-v2/windi.config.ts b/packages/nc-gui-v2/windi.config.ts
index 6c901809c4..c04b40c111 100644
--- a/packages/nc-gui-v2/windi.config.ts
+++ b/packages/nc-gui-v2/windi.config.ts
@@ -15,12 +15,10 @@ import colors, { themeColors } from './utils/colorsUtils'
export default defineConfig({
extract: {
- include: ['**/*.{vue,html,jsx,tsx}'],
+ include: ['**/*.{vue,html,jsx,tsx,css}'],
exclude: ['node_modules', '.git'],
},
- attributify: true,
-
darkMode: 'class',
plugins: [