From 24a869fd297d58c24bc5c9a68a893189c6d0806d Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Wed, 6 Dec 2023 16:36:32 +0300 Subject: [PATCH] bug fix --- .../user-bar/header-user-bar.component.html | 2 +- .../user-bar/header-user-bar.component.scss | 65 ------------- .../basic/cards/cards-section.component.html | 9 +- .../persons/cards-item-persons.component.ts | 2 +- .../widjet/drop-down/drop-down.component.html | 2 +- .../widjet/drop-down/drop-down.component.scss | 3 +- .../layout/header/header.component.html | 2 +- src/vniigaz-v2/css/_basics.scss | 35 +------ src/vniigaz-v2/css/_main-menu.scss | 43 +++++---- src/vniigaz-v2/css/_page-top-panel.scss | 72 ++++++++++++++- src/vniigaz-v2/css/_pages-section.scss | 91 ++++++++++++++----- 11 files changed, 177 insertions(+), 149 deletions(-) diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html index 31427cb..1bc49cc 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html @@ -1,4 +1,4 @@ -
+
{{user.initials}} diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss b/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss index 2a5ed6c..e69de29 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss @@ -1,65 +0,0 @@ -.user { - - position: relative; - display: flex; - padding: 11px; - height: 64px; - justify-content: center; - background-color: #fff; - border-radius: 32px; - border: 1px solid var(--second-dis); - - .avatar { - width: 38px; - height: 38px; - color: var(--prime); - border: 1px solid var(--prime); - background: #fff; - border-radius: 100%; - display: flex; - justify-content: center; - align-items: center; - cursor: pointer; - overflow: hidden; - .initials { - } - img { - display: block; - width: 100%; - height: 100%; - object-fit: cover; - } - } - - .name{ - margin: 8px 4px 0 12px; - color: var(--second-act); - white-space: nowrap; - - } - - - - - drop-down { - - margin-top: 6px; - - } - - -} -@media screen and (max-width: 1330px) { - .user { - .avatar { - background-color: var(--white); - margin-right: 18px; - } - .name{ - display: none; - } - } - -} - - diff --git a/src/app/_modules/pages/sections/types/basic/cards/cards-section.component.html b/src/app/_modules/pages/sections/types/basic/cards/cards-section.component.html index 177f51c..ee04202 100644 --- a/src/app/_modules/pages/sections/types/basic/cards/cards-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/cards/cards-section.component.html @@ -1,4 +1,7 @@ -
- -
+ +
+ Группа изображений + +
+ diff --git a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.ts b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.ts index b904841..5afcbec 100644 --- a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.ts +++ b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.ts @@ -33,7 +33,7 @@ export class CardsItemPersonsComponent { } get textOnly(){ - return this.html.replace(/<[^>]*>?/gm, '').replace(/\s/g, "").replace(/\ /gm,''); + return this.html?.replace(/<[^>]*>?/gm, '').replace(/\s/g, "").replace(/\ /gm,''); } ngOnInit() { diff --git a/src/app/_modules/widjet/drop-down/drop-down.component.html b/src/app/_modules/widjet/drop-down/drop-down.component.html index 2ee4d7d..430b8d8 100644 --- a/src/app/_modules/widjet/drop-down/drop-down.component.html +++ b/src/app/_modules/widjet/drop-down/drop-down.component.html @@ -1,3 +1,3 @@ -
+
diff --git a/src/app/_modules/widjet/drop-down/drop-down.component.scss b/src/app/_modules/widjet/drop-down/drop-down.component.scss index f76c23b..6cf782f 100644 --- a/src/app/_modules/widjet/drop-down/drop-down.component.scss +++ b/src/app/_modules/widjet/drop-down/drop-down.component.scss @@ -7,4 +7,5 @@ position: relative; align-items: flex-start; display: inline-flex; -} \ No newline at end of file +} + diff --git a/src/vniigaz-v2/component/layout/header/header.component.html b/src/vniigaz-v2/component/layout/header/header.component.html index 6a6bbef..ad02a34 100644 --- a/src/vniigaz-v2/component/layout/header/header.component.html +++ b/src/vniigaz-v2/component/layout/header/header.component.html @@ -8,7 +8,7 @@ -
+
АИС СЦ ВНИИГАЗ
diff --git a/src/vniigaz-v2/css/_basics.scss b/src/vniigaz-v2/css/_basics.scss index e8ac6ca..08577f5 100644 --- a/src/vniigaz-v2/css/_basics.scss +++ b/src/vniigaz-v2/css/_basics.scss @@ -43,22 +43,7 @@ $pxxs:4px; -.menu { - display: flex; - .block { - a{ - height: 24px; - } - background: #fff; - border: 1px solid var(--second-dis); - border-radius: $pxs; - padding: $pxs $ps; - display: flex; - margin-bottom: $ps; - margin-top: $ps; - column-gap: $ps; - } -} + .size-little { * { @@ -260,7 +245,7 @@ h4 { font-size: 24px; font-style: normal; font-weight: 700; - line-height: 44px; /* 133.333% */ + line-height: 32px; /* 133.333% */ letter-spacing: 0.24px; margin:0; } @@ -321,21 +306,7 @@ span.link { .op-63{ opacity: 0.63; } -html-section ul{ - padding: 0; - >li{ - list-style: none; - &::before{ - display: inline-block; - content: ""; - width: 16px; - height: 2px; - background-color: var(--prime); - margin-bottom: 5px; - margin-right: 16px; - } - } -} + header{ .locale{ diff --git a/src/vniigaz-v2/css/_main-menu.scss b/src/vniigaz-v2/css/_main-menu.scss index 1cf8778..6ea192b 100644 --- a/src/vniigaz-v2/css/_main-menu.scss +++ b/src/vniigaz-v2/css/_main-menu.scss @@ -56,18 +56,32 @@ header{ } .item.nav + pages-menu.selected.lvl-1{ - position: absolute; - left:0px; - top:100px; - display: flex; - background-color: var(--white); - width: 100%; - justify-content: center; - padding-bottom: 36px; - z-index: 1; - + position: absolute; + left:0px; + top:100px; + display: flex; + background-color: var(--white); + width: 100%; + justify-content: center; + padding-bottom: 36px; + z-index: 1; } - + } + } + .header-right{ + gap: $p; + .locales-btn{ + drop-down { + .on{ + svg{ + color:var(--dark) + } + } + } + cursor: pointer; + display: inline-flex; + align-items: center; + gap: $pxxs; } } }; @@ -84,21 +98,14 @@ a.logo{ - - @media screen and (max-width: 1330px){ .header{ pages-menu, >a.vnii{ display: none !important; } } - } - - - - @media screen and (min-width: 1330px){ .header{ .burger{ diff --git a/src/vniigaz-v2/css/_page-top-panel.scss b/src/vniigaz-v2/css/_page-top-panel.scss index 139597f..15bc859 100644 --- a/src/vniigaz-v2/css/_page-top-panel.scss +++ b/src/vniigaz-v2/css/_page-top-panel.scss @@ -1,2 +1,72 @@ +header-user-bar{ + .user { - + position: relative; + display: flex; + padding: 11px; + height: 64px; + justify-content: center; + background-color: #fff; + border-radius: 32px; + border: 1px solid var(--second-dis); + + .avatar { + width: 38px; + height: 38px; + color: var(--prime); + border: 1px solid var(--prime); + background: #fff; + border-radius: 100%; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + overflow: hidden; + .initials { + } + img { + display: block; + width: 100%; + height: 100%; + object-fit: cover; + } + } + + .name{ + margin: 8px 4px 0 12px; + color: var(--second-act); + white-space: nowrap; + + } + + + .dropdown{ + right: 16px; + top: 48px; + } + + drop-down { + display: flex; + margin-top: 10px; + .on{ + svg{ + color:var(--dark) + } + } + } + + + } + @media screen and (max-width: 1330px) { + .user { + .avatar { + background-color: var(--white); + margin-right: 18px; + } + .name{ + display: none; + } + } + + } +} diff --git a/src/vniigaz-v2/css/_pages-section.scss b/src/vniigaz-v2/css/_pages-section.scss index 682a676..cce91c6 100644 --- a/src/vniigaz-v2/css/_pages-section.scss +++ b/src/vniigaz-v2/css/_pages-section.scss @@ -17,18 +17,42 @@ page-sections{ } } +html-section ul{ + padding: 0; + >li{ + list-style: none; + line-height: 32px; + text-indent: -32px; + padding-left: 32px; + &::before{ + display: inline-block; + content: ""; + width: 16px; + height: 2px; + background-color: var(--prime); + margin-bottom: 5px; + margin-right: 16px; + } + &+li{ + margin-top: 24px; + } + } +} add-section{ .add{ position: relative; + margin: 24px 0; + ico{ + margin-right: $pxs; + } .toggle{ position:inherit; display: flex; - gap:8px; align-items: center; - padding-bottom: 8px; drop-down{ - margin-top: 4px; + margin-top: $pxxs; + margin-left: $pxxs; } &.active{ @@ -42,6 +66,45 @@ add-section{ top:32px; } } + +} + +.menu { + display: flex; + .block { + a{ + height: 24px; + } + background: #fff; + border: 1px solid var(--second-dis); + border-radius: $pxs; + padding: $pxs $ps; + display: flex; + margin-bottom: $p; + column-gap: $ps; + } +} + +cards-section{ + .cards-add{ + display: flex; + align-items: center; + justify-content: space-between; + padding: 12px 16px; + border-top: 1px solid var(--second-dis); + border-bottom: 1px solid var(--second-dis); + ico{ + cursor: pointer; + svg{ + color: var(--prime) !important; + } + &:hover{ + svg{ + color: var(--prime-act) !important; + } + } + } + } } @@ -195,28 +258,6 @@ images-section{ } } - .carousel { - width: 100%; - display: flex; - align-items: center; - justify-content:center; - gap: 24px; - .prev, .next { - cursor: pointer; - z-index: 1; - &.prev{ - left:0; - } - &.next{ - right:0; - } - } - .center { - display: block; - width: 100%; - aspect-ratio: 16 / 9; - } - } .swiper-box{ width: 100%;