From 2885b933ea52db5b0b9081754ac2ea01d21a1a99 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Fri, 8 Sep 2023 13:33:49 +0300 Subject: [PATCH] iOS bug fix --- package-lock.json | 27 ++++------ .../layout/footer/footer.component.html | 2 +- .../layout/header/header.component.html | 9 ++-- .../layout/header/header.component.scss | 50 +++++++++++-------- .../images/images-section.component.scss | 4 +- .../item/member-section-item.component.scss | 2 +- 6 files changed, 48 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9898f48..c1c8ba5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14938,8 +14938,7 @@ "version": "15.2.9", "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.2.9.tgz", "integrity": "sha512-nOXUGqKkAEMlCcrhkDwWDzcVdKNH7MNRUXfNzsFc9zdeR/5p3qt6SVMN7OOE3NREyI7P6nzARc3S+6QDBjf3Jg==", - "dev": true, - "requires": {} + "dev": true }, "@nodelib/fs.scandir": { "version": "2.1.5", @@ -15573,8 +15572,7 @@ "version": "1.9.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", - "dev": true, - "requires": {} + "dev": true }, "adjust-sourcemap-loader": { "version": "4.0.0", @@ -17636,8 +17634,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true, - "requires": {} + "dev": true }, "ieee754": { "version": "1.2.1", @@ -18334,8 +18331,7 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz", "integrity": "sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ==", - "dev": true, - "requires": {} + "dev": true }, "karma-source-map-support": { "version": "1.4.0", @@ -19701,8 +19697,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true, - "requires": {} + "dev": true }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -20910,8 +20905,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "json-schema-traverse": { "version": "0.4.1", @@ -21301,8 +21295,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "json-schema-traverse": { "version": "0.4.1", @@ -21390,8 +21383,7 @@ "version": "8.12.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", - "dev": true, - "requires": {} + "dev": true } } }, @@ -21545,8 +21537,7 @@ "version": "8.11.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz", "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==", - "dev": true, - "requires": {} + "dev": true }, "y18n": { "version": "5.0.8", diff --git a/src/app/_modules/layout/footer/footer.component.html b/src/app/_modules/layout/footer/footer.component.html index d2484c7..f31a04b 100644 --- a/src/app/_modules/layout/footer/footer.component.html +++ b/src/app/_modules/layout/footer/footer.component.html @@ -47,7 +47,7 @@ Новости
- Вход для зарегистрированных пользователей + Вход в личный кабинет
diff --git a/src/app/_modules/layout/header/header.component.html b/src/app/_modules/layout/header/header.component.html index c00094d..eda5644 100644 --- a/src/app/_modules/layout/header/header.component.html +++ b/src/app/_modules/layout/header/header.component.html @@ -24,9 +24,12 @@
- - - АИС СЦ ВНИИГАЗ +
+ + + АИС СЦ ВНИИГАЗ + 2 +
diff --git a/src/app/_modules/layout/header/header.component.scss b/src/app/_modules/layout/header/header.component.scss index f7b7e92..1b617d4 100644 --- a/src/app/_modules/layout/header/header.component.scss +++ b/src/app/_modules/layout/header/header.component.scss @@ -52,33 +52,41 @@ position:fixed; top:0; padding: 0; - width: 100dvw; - height: 100dvh; + width: 100vw; + height: 100vh; background-color:rgba(45, 45, 45, 0.63); z-index:100; overflow-y: scroll; - .grid-menu{ - display: block; - background: var(--blue-3); - color: white; - width: 480px; - min-height: 100dvh; - padding: 32px 40px; - button.close{ - width: 24px; - height: 24px; - padding: 0; - border: none; - border-radius: 0; - background: transparent url('~src/assets/images/icons/close_white_24dp.svg') no-repeat center; - } - .ais{ + .bottom{ + overflow-y: scroll; + height: 100%; + .grid-menu{ + overflow-y: scroll; + .left-block{ + + } display: block; - margin-top: 20px; - padding-top: 20px; - border-top: 1px solid rgba(255, 255, 255, 0.63); + background: var(--blue-3); + color: white; + width: 480px; + padding: 32px 40px; + button.close{ + width: 24px; + height: 24px; + padding: 0; + border: none; + border-radius: 0; + background: transparent url('~src/assets/images/icons/close_white_24dp.svg') no-repeat center; + } + .ais{ + display: block; + margin-top: 20px; + padding-top: 20px; + border-top: 1px solid rgba(255, 255, 255, 0.63); + } } } + } } diff --git a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss index baf57ef..6231e34 100644 --- a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss @@ -4,8 +4,8 @@ display: block; width: 663px; height: 468px; - max-width: 80dvw; - max-height: 49dvw; + max-width: 80vw; + max-height: 49vw; margin-bottom: 8px; border-radius: 12px; border: 1px solid rgba(45, 45, 45, 0.27); diff --git a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss index 8362c50..0cd390f 100644 --- a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss +++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss @@ -38,7 +38,7 @@ z-index: 200; left: 0; background-color: rgba(45, 45, 45, 0.63); - width: 100dvw; + width: 100vw; height: 100vh; object-fit: contain; cursor: pointer;