diff --git a/.gitignore b/.gitignore index ebccbc9..ee1c646 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,7 @@ config/config.json *.sln >>>>>>> frontend frontend/dist1/ +rendering/global +rendering/global/5c2f8896a2b7169d4e253944f3b733e2.png +rendering/global/81df1ac4d303319a79db19f45c5c475c.png +rendering/global/d24b3e361c4fc6263e0276f52ada9694.png diff --git a/frontend/package.json b/frontend/package.json index bd84a31..3619b11 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -54,6 +54,7 @@ "vue-matomo": "^3.14.0-0", "vue-router": "^2.7.0", "vue-router-sitemap": "^0.0.4", + "vue-swatches": "^2.1.0", "vuedraggable": "^2.24.3", "vuejs-paginator": "^2.0.2", "vuetify": "^2.3.8", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index f23ac84..3f1d2cc 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -753,6 +753,7 @@ blockquote { Inventory Transactions Friends + Character Notifications Admin Panel Upgrade diff --git a/frontend/src/components/routes/Character.vue b/frontend/src/components/routes/Character.vue index 9334a7a..c864275 100644 --- a/frontend/src/components/routes/Character.vue +++ b/frontend/src/components/routes/Character.vue @@ -11,6 +11,30 @@ margin-top: 0.5rem; word-break: break-all; } +.zoom_sp { + transition: transform .2s; +} +.zoom_sp:hover { + transform: scale(1.2); + cursor: hand; +} + +.wrapper { + +} + +.wrapper > div { + border: 1px solid #000000; + border-radius: 0px; + padding: 1px; + height: 32px; + width: 32px; +} +.wrapper { + display: grid; + grid-template-columns: repeat(15, 1fr); + grid-gap: 12px; +} diff --git a/frontend/src/components/routes/Marketplace.vue b/frontend/src/components/routes/Marketplace.vue index ba54fcf..c889db0 100644 --- a/frontend/src/components/routes/Marketplace.vue +++ b/frontend/src/components/routes/Marketplace.vue @@ -65,7 +65,7 @@
- + diff --git a/frontend/src/components/routes/MarketplaceCreate.vue b/frontend/src/components/routes/MarketplaceCreate.vue index 23829a7..e46a9db 100644 --- a/frontend/src/components/routes/MarketplaceCreate.vue +++ b/frontend/src/components/routes/MarketplaceCreate.vue @@ -1,61 +1,111 @@