From 3cb27d9821a9586e78ea11b81cdcbc057d6fca8c Mon Sep 17 00:00:00 2001 From: aarizona Date: Wed, 28 Aug 2024 17:02:51 +0300 Subject: [PATCH] sidebar test --- front/components.d.ts | 7 +++++++ front/package-lock.json | 20 ++++++++++++++++++++ front/package.json | 2 ++ front/src/assets/main.scss | 3 +++ front/src/assets/nav.scss | 14 ++++++++++++++ front/src/assets/sidebar.scss | 13 ++----------- front/src/components/Promo/main.vue | 7 +------ front/src/components/nav.vue | 14 ++++++++------ 8 files changed, 57 insertions(+), 23 deletions(-) diff --git a/front/components.d.ts b/front/components.d.ts index 04e6807..a924cd3 100644 --- a/front/components.d.ts +++ b/front/components.d.ts @@ -13,12 +13,19 @@ declare module 'vue' { Gallery: typeof import('./src/components/Promo/gallery.vue')['default'] Game: typeof import('./src/components/Game.vue')['default'] Home: typeof import('./src/components/Home.vue')['default'] + IIconMdiHomeOutline: typeof import('~icons/ic/on-mdi-home-outline')['default'] + IIconParkSolidLeftC: typeof import('~icons/icon-park-solid/left-c')['default'] + 'IMdi:arrowLeft': typeof import('~icons/mdi/arrow-left')['default'] + 'IMdi:arrowRight': typeof import('~icons/mdi/arrow-right')['default'] + 'IMdi:vectorArrangeBelow': typeof import('~icons/mdi/vector-arrange-below')['default'] + 'IMdi:video3d': typeof import('~icons/mdi/video3d')['default'] IMdiArrowRight: typeof import('~icons/mdi/arrow-right')['default'] IMdiChevronLeft: typeof import('~icons/mdi/chevron-left')['default'] IMdiClose: typeof import('~icons/mdi/close')['default'] IMdiFile: typeof import('~icons/mdi/file')['default'] IMdiHexagonOutline: typeof import('~icons/mdi/hexagon-outline')['default'] IMdiHome: typeof import('~icons/mdi/home')['default'] + IMdiHomeOutline: typeof import('~icons/mdi/home-outline')['default'] IMdiMonitorScreenshot: typeof import('~icons/mdi/monitor-screenshot')['default'] IMdiPagePreviousOutline: typeof import('~icons/mdi/page-previous-outline')['default'] IMdiShop: typeof import('~icons/mdi/shop')['default'] diff --git a/front/package-lock.json b/front/package-lock.json index c0865e1..a345444 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -9,6 +9,8 @@ "version": "0.0.0", "dependencies": { "@fireworks-js/vue": "^2.10.7", + "@iconify-json/icon-park": "^1.1.14", + "@iconify-json/icon-park-solid": "^1.1.15", "@iconify/vue": "^4.1.2", "@monogrid/gainmap-js": "^3.0.5", "@tresjs/cientos": "^3.9.0", @@ -436,6 +438,24 @@ "vue": ">=3.0.0" } }, + "node_modules/@iconify-json/icon-park": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/@iconify-json/icon-park/-/icon-park-1.1.14.tgz", + "integrity": "sha512-D/Tyww0fPhEwLqeQuzKMxE4HKjWsCG8TPRZsUIgjGh1qBOI3Ad9G5y0mQi4mLBtHrdCPdfbCz2oZJHxPoLyScA==", + "license": "Apache-2.0", + "dependencies": { + "@iconify/types": "*" + } + }, + "node_modules/@iconify-json/icon-park-solid": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/@iconify-json/icon-park-solid/-/icon-park-solid-1.1.15.tgz", + "integrity": "sha512-fFuDj5H8+x/V2hzknhpBifFBIOVP/sm2ElGQ0M1W4d0EQ5f7Pss1v7tfmDSQR2F6eISKDjuA2yyT7fF/C366Hw==", + "license": "Apache-2.0", + "dependencies": { + "@iconify/types": "*" + } + }, "node_modules/@iconify-json/mdi": { "version": "1.1.66", "resolved": "https://registry.npmjs.org/@iconify-json/mdi/-/mdi-1.1.66.tgz", diff --git a/front/package.json b/front/package.json index 8afe8ba..3fb5838 100644 --- a/front/package.json +++ b/front/package.json @@ -11,6 +11,8 @@ }, "dependencies": { "@fireworks-js/vue": "^2.10.7", + "@iconify-json/icon-park": "^1.1.14", + "@iconify-json/icon-park-solid": "^1.1.15", "@iconify/vue": "^4.1.2", "@monogrid/gainmap-js": "^3.0.5", "@tresjs/cientos": "^3.9.0", diff --git a/front/src/assets/main.scss b/front/src/assets/main.scss index f898e81..3650a32 100644 --- a/front/src/assets/main.scss +++ b/front/src/assets/main.scss @@ -1,6 +1,9 @@ @import 'grid.scss'; @import 'fonts.scss'; +body { + font-family: 'Montserrat'; +} a[href] { color: #048280; diff --git a/front/src/assets/nav.scss b/front/src/assets/nav.scss index 163f610..ab356fb 100644 --- a/front/src/assets/nav.scss +++ b/front/src/assets/nav.scss @@ -49,5 +49,19 @@ $white: #fff; &-content { flex-grow: 1; + text-align: right; + font-size: 1.125rem; + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: flex-end; + + .nav-icon { + margin: 0 0.25rem; + + font-size: 1.25em; + width: 1.25em; + height: 1.25em; + } } } \ No newline at end of file diff --git a/front/src/assets/sidebar.scss b/front/src/assets/sidebar.scss index 3090ed7..36d7757 100644 --- a/front/src/assets/sidebar.scss +++ b/front/src/assets/sidebar.scss @@ -6,7 +6,7 @@ $primary: #E75B12; .homelink { position: absolute; right: 2rem; - top: 4rem; + top: 2rem; transition: right 300ms linear; @@ -16,19 +16,11 @@ $primary: #E75B12; } a { - background-color: $bg; color: $textColor; line-height: 1; - font-size: 3rem; - height: 7rem; + font-size: 2.5rem; display: flex; align-items: center; - border-radius: 1rem; - opacity: 0.97; - - svg { - transition: all 400ms linear; - } } &.open { @@ -72,7 +64,6 @@ $primary: #E75B12; padding: 1.5rem; color: $textColor; - font-family: 'Montserrat'; } &-list {} diff --git a/front/src/components/Promo/main.vue b/front/src/components/Promo/main.vue index 7bfb0fb..ca85c4f 100644 --- a/front/src/components/Promo/main.vue +++ b/front/src/components/Promo/main.vue @@ -84,14 +84,9 @@ const sidebarFunc = () => {
- +
-
- - - -
diff --git a/front/src/components/nav.vue b/front/src/components/nav.vue index 27bbb11..69d930a 100644 --- a/front/src/components/nav.vue +++ b/front/src/components/nav.vue @@ -14,28 +14,30 @@ const page = useItem()
- + - + - +
- + - +
- + Нажмите на + + вверху экрана, чтобы узнать подробнее про объекты на глэмпинге
\ No newline at end of file