conflicts
This commit is contained in:
parent
61b9133049
commit
6eeff429e7
@ -1,6 +1,6 @@
|
|||||||
@import "@nuxt/ui";
|
@import "@nuxt/ui";
|
||||||
@import "tailwindcss";
|
@import "tailwindcss";
|
||||||
@import '@iconscout/unicons/css/line.css';
|
/* @import '@iconscout/unicons/css/line.css'; */
|
||||||
|
|
||||||
@theme {
|
@theme {
|
||||||
/* fonts */
|
/* fonts */
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
src="/icons/Account.svg"
|
src="/icons/Account.svg"
|
||||||
alt="Account"
|
alt="Account"
|
||||||
/>
|
/>
|
||||||
|
<i class="uil uil-user h-8 w-8 text-text-light cursor-pointer"></i>
|
||||||
<img
|
<img
|
||||||
class="h-8 w-8 cursor-pointer"
|
class="h-8 w-8 cursor-pointer"
|
||||||
src="/icons/Cart.svg"
|
src="/icons/Cart.svg"
|
||||||
@ -87,7 +88,7 @@
|
|||||||
src="/icons/Account.svg"
|
src="/icons/Account.svg"
|
||||||
alt="Account"
|
alt="Account"
|
||||||
/> -->
|
/> -->
|
||||||
<!-- <UIcon class="uil uil-user h-8 w-8 cursor-pointer"></UIcon> -->
|
<i class="uil uil-user h-8 w-8 cursor-pointer"></i>
|
||||||
<img
|
<img
|
||||||
class="h-8 w-8 cursor-pointer"
|
class="h-8 w-8 cursor-pointer"
|
||||||
src="/icons/Menu.svg"
|
src="/icons/Menu.svg"
|
||||||
|
@ -10,12 +10,11 @@
|
|||||||
"postinstall": "nuxt prepare"
|
"postinstall": "nuxt prepare"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@iconscout/unicons": "^4.2.0",
|
|
||||||
"@nuxt/eslint": "^1.4.1",
|
"@nuxt/eslint": "^1.4.1",
|
||||||
"@nuxt/ui": "^3.1.2",
|
"@nuxt/ui": "^3.1.3",
|
||||||
"@nuxtjs/i18n": "^9.5.4",
|
"@nuxtjs/i18n": "^9.5.4",
|
||||||
"@pinia/nuxt": "^0.11.0",
|
"@pinia/nuxt": "^0.11.0",
|
||||||
"@tailwindcss/vite": "^4.1.7",
|
"@tailwindcss/vite": "^4.1.8",
|
||||||
"nuxt": "^3.17.4",
|
"nuxt": "^3.17.4",
|
||||||
"pocketbase": "^0.26.0",
|
"pocketbase": "^0.26.0",
|
||||||
"tailwindcss": "^4.1.7",
|
"tailwindcss": "^4.1.7",
|
||||||
@ -23,8 +22,6 @@
|
|||||||
"vue-router": "^4.5.1"
|
"vue-router": "^4.5.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@nuxtjs/tailwindcss": "^6.14.0",
|
"@nuxtjs/tailwindcss": "^6.14.0"
|
||||||
"prettier": "^3.5.3",
|
|
||||||
"prettier-plugin-tailwindcss": "^0.6.11"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
4915
pnpm-lock.yaml
generated
4915
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user