diff --git a/src/app/_modules/pages/menu/item/pages-menu-item.component.ts b/src/app/_modules/pages/menu/item/pages-menu-item.component.ts
index 5e23e6e..e2f6a48 100644
--- a/src/app/_modules/pages/menu/item/pages-menu-item.component.ts
+++ b/src/app/_modules/pages/menu/item/pages-menu-item.component.ts
@@ -85,9 +85,9 @@ export class PagesMenuItemComponent {
toggle(event){
this.pagesService.menuSelectedLink = this.selected ? null : this.item.link
this.open = event;
- if(event){
- this.findChildren()
- }
+ // if(event){
+ // this.findChildren()
+ // }
}
select(){
@@ -100,6 +100,7 @@ export class PagesMenuItemComponent {
}
ngOnInit(){
+ this.findChildren()
this.open = this.current || this.parent || this.selected
}
diff --git a/src/gbu/component/layout/grid/grid.component.html b/src/gbu/component/layout/grid/grid.component.html
index a5bbf47..3878da6 100644
--- a/src/gbu/component/layout/grid/grid.component.html
+++ b/src/gbu/component/layout/grid/grid.component.html
@@ -14,7 +14,8 @@
{{publications.name}}
- 
+
+ {{page.date}}
{{page.name}}
diff --git a/src/gbu/component/layout/grid/grid.component.ts b/src/gbu/component/layout/grid/grid.component.ts
index c203dcb..befff10 100644
--- a/src/gbu/component/layout/grid/grid.component.ts
+++ b/src/gbu/component/layout/grid/grid.component.ts
@@ -66,7 +66,8 @@ export class GridComponent {
publication => ({
name: publication.name,
img: publication.posters.data[0]?publication.posters.data[0].links.thumb:null,
- link: publication.link
+ link: publication.link,
+ date: publication.publishDateRus
})
);
}
diff --git a/src/gbu/component/layout/jumbotron/jumbotron.component.html b/src/gbu/component/layout/jumbotron/jumbotron.component.html
index 7c72393..8bfc1a0 100644
--- a/src/gbu/component/layout/jumbotron/jumbotron.component.html
+++ b/src/gbu/component/layout/jumbotron/jumbotron.component.html
@@ -32,26 +32,31 @@
diff --git a/src/gbu/component/layout/jumbotron/jumbotron.component.ts b/src/gbu/component/layout/jumbotron/jumbotron.component.ts
index 1f9a79e..78cda77 100644
--- a/src/gbu/component/layout/jumbotron/jumbotron.component.ts
+++ b/src/gbu/component/layout/jumbotron/jumbotron.component.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
import { PagesService } from '@app/_services/pages.service';
import { Subscription } from 'rxjs';
import { AuthenticationService } from '@app/_services';
+import { Router } from '@angular/router';
@Component({
selector: 'jumbotron',
@@ -18,6 +19,7 @@ export class JumbotronComponent {
constructor(
private pagesService: PagesService,
public authService: AuthenticationService,
+ private router: Router
){}
ngOnInit(){
diff --git a/src/gbu/component/layout/right-content/right-content.component.html b/src/gbu/component/layout/right-content/right-content.component.html
index ec225bf..163fd74 100644
--- a/src/gbu/component/layout/right-content/right-content.component.html
+++ b/src/gbu/component/layout/right-content/right-content.component.html
@@ -2,22 +2,22 @@
Электронное обращение
-
+
Прием показаний и оплата электроэнергии
-
+
Прием показаний приборов учета воды
-
+
Получить и оплатить ЕПД
-
+
-
+
diff --git a/src/gbu/css/_buttons.scss b/src/gbu/css/_buttons.scss
index 5eadfe0..8c2aff6 100644
--- a/src/gbu/css/_buttons.scss
+++ b/src/gbu/css/_buttons.scss
@@ -1,20 +1,22 @@
button, .btn, a.btn {
display: inline-flex;
- padding: 8px 24px;
+ padding: 7px 24px 8px;
justify-content: center;
align-items: center;
gap: 10px;
cursor: pointer;
- border-radius: 12px;
+ border-radius: 4px;
border: 1px solid var(--prime);
background:var(--prime);
color: #FFF;
- font-family: PT Sans Narrow;
- font-size: 24px;
+ color: var(--Black-FFFFFF, #FFF);
+ font-family: Golos;
+ font-size: 14px;
font-style: normal;
- font-weight: 700;
- line-height: 32px; /* 133.333% */
- letter-spacing: 0.24px;
+ font-weight: 400;
+ line-height: 21px; /* 150% */
+ letter-spacing: 0.42px;
+ text-transform: uppercase;
&:hover{
border: 1px solid var(--prime-hov);
diff --git a/src/gbu/css/_forms.scss b/src/gbu/css/_forms.scss
index ef5c565..16ceefa 100644
--- a/src/gbu/css/_forms.scss
+++ b/src/gbu/css/_forms.scss
@@ -2,7 +2,7 @@ input, select, textarea {
width: 100%;
height: 40px;
padding: 8px 16px;
- border-radius: 12px;
+ border-radius: 4px;
border: solid 1px var(--second-dis);
font-family: "PT Sans";
font-size: 20px;
diff --git a/src/gbu/css/_grid.scss b/src/gbu/css/_grid.scss
index 986ead7..d5c8bb5 100644
--- a/src/gbu/css/_grid.scss
+++ b/src/gbu/css/_grid.scss
@@ -71,16 +71,30 @@ jumbotron{
margin-bottom: 24px;
border-radius: 4px;
overflow: hidden;
- img{
+ cursor: pointer;
+ .root-menu-img{
width: 50%;
height: 100%;
- object-fit: cover;
background-color: var(--light);
+ overflow: hidden;
+ img{
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ transition: transform 0.5s;
+ }
}
- div{
+ .root-menu-name{
padding: 16px;
color: #fff;
}
+
+ &:hover{
+
+ img{
+ transform: scale(1.25);
+ }
+ }
}
.root-menu-item:first-child{
display: flex;
@@ -89,10 +103,9 @@ jumbotron{
height: 100%;
align-items: center;
margin-bottom: 0;
- img{
+ .root-menu-img{
height: 532px;
width: 100%;
- object-fit: cover;
}
}
@@ -122,6 +135,7 @@ jumbotron{
+
.content-sapce{
flex-grow: 1;
.content-grid{
@@ -151,9 +165,14 @@ jumbotron{
padding: 24px;
gap:16px;
border-radius: 4px;
+ border: 1px solid transparent;
span{
text-align: center;
}
+ &:hover{
+
+ border: 1px solid var(--prime);
+ }
}
img{
width: 100%;
@@ -167,6 +186,14 @@ jumbotron{
}
}
+.this-root-page .main-content{
+ background-color: transparent !important;
+ .main-news{
+ margin: 0 !important;
+ }
+}
+
+
@media screen and (min-width: 1330px){
@@ -223,21 +250,31 @@ pages-menu-item{
}
.main-news-item-card{
- width: 308px;
+ width: 250px;
flex-grow: 1;
display: flex;
flex-direction: column;
background-color: #fff;
- border-radius: 4px;
overflow: hidden;
+ border-radius: 4px;
img {
width: 100%;
height: 308px;
object-fit: cover;
+
+ }
+ span{
+ margin: 16px 16px 0;
+ color: #969595;
}
h4{
margin: 16px;
}
+ &:hover{
+ h4{
+ color: var(--prime);
+ }
+ }
}
}
}
diff --git a/src/gbu/css/_main-menu.scss b/src/gbu/css/_main-menu.scss
index ee1c074..7d49219 100644
--- a/src/gbu/css/_main-menu.scss
+++ b/src/gbu/css/_main-menu.scss
@@ -103,6 +103,7 @@ header{
a{
color: #000;
margin-top: 0;
+
}
&.parent,&.current{
padding-bottom: 10px;
@@ -112,6 +113,11 @@ header{
}
border-bottom: 4px solid var(--prime);
}
+ &:hover{
+ a{
+ color: var(--prime);
+ }
+ }
}
pages-menu{
@@ -148,7 +154,7 @@ header{
.header.layout-corral{
pages-menu.lvl-0{
>pages-menu-item:hover{
- pages-menu.selected{
+ pages-menu{
display: flex;
};
}
diff --git a/src/gbu/css/_pages-section.scss b/src/gbu/css/_pages-section.scss
index b220b27..d8a1633 100644
--- a/src/gbu/css/_pages-section.scss
+++ b/src/gbu/css/_pages-section.scss
@@ -586,6 +586,12 @@ publications-list{
publications-list-item {
display: block;
background-color: #FFF;
+ padding-top: 32px;
+ &:last-child{
+ .publication-content{
+ border-bottom-color: transparent;
+ }
+ }
.publication-content{
width: 100%;
@@ -594,6 +600,8 @@ publications-list{
position: relative;
min-height: 232px;
border-bottom: solid 1px #E5E5E5;
+
+
gellery{
display: block;
order: 0;
@@ -614,6 +622,9 @@ publications-list{
border-radius: 0;
}
}
+ .gellery-fullscreen{
+ display: none;
+ }
}
.date{
margin-left: 232px;
@@ -779,6 +790,27 @@ video-section{
}
+contact-section{
+
+ .contact{
+ display: flex;
+ flex-direction: column;
+ gap: 24px;
+ }
+ h2{
+
+ font-family: "PT Serif";
+ font-size: 24px;
+ font-style: normal;
+ font-weight: 400;
+ line-height: 30px;
+ margin: 0;
+ }
+ p{
+ margin-top: -16px;
+ }
+}
+
.pagination {
diff --git a/src/gbu/css/_registry.scss b/src/gbu/css/_registry.scss
index ab2608c..2602368 100644
--- a/src/gbu/css/_registry.scss
+++ b/src/gbu/css/_registry.scss
@@ -47,17 +47,16 @@ registry-page{
registry-category {
display: block;
.bar{
- background-color: var(--light);
- border-top: 1px solid var(--second-dis);
- border-bottom: 1px solid var(--second-dis);
+ background-color: var(--second);
+
.name{
- color: var(--dark);
+ color: #fff;
}
- .menu{
- svg{
- color: var(--second);
- }
+
+ svg{
+ color: #fff;
}
+
}
}
@@ -82,12 +81,11 @@ registry-page{
height: 40px;
padding: 8px 52px 8px 16px;
border: 1px solid (--second-dis);
- border-radius: 12px;
background: #ffffff url('~src/assets/images/icons/search_24dp.svg') calc(100% - 12px) 50% no-repeat;
}
}
.advanced {
- margin-left: 24px;
+ display: none;
}
}
}
@@ -102,7 +100,7 @@ registry-category{
display: flex;
flex-direction: row;
align-items: center;
- padding: 12px 24px;
+ padding: 12px 16px;
cursor: pointer;
.name {
margin-right: auto;
@@ -145,7 +143,7 @@ registry-entry {
}
.main {
.name {
- margin-right: 24px;
+ margin-right: 8px;
a{
display: inline-flex;
align-items: flex-start;
@@ -195,7 +193,6 @@ registry-entry {
&.row {
display: flex;
flex-direction: row;
- align-items: center;
}
}
diff --git a/src/vniigaz-v2/css/_main-menu.scss b/src/vniigaz-v2/css/_main-menu.scss
index 3ee9d30..ac2ac4f 100644
--- a/src/vniigaz-v2/css/_main-menu.scss
+++ b/src/vniigaz-v2/css/_main-menu.scss
@@ -265,6 +265,7 @@ slider-menu{
}
}
right-content{
+
drop-down{
display: none;
}
@@ -318,6 +319,9 @@ right-content{
background-color: #EDEDED;
}
}
+ pages-menu:not(.open){
+ display: none;
+ }
}
@@ -355,6 +359,9 @@ right-content{
background-color: #EDEDED;
}
}
+ pages-menu:not(.open){
+ display: none;
+ }
}
- 
+ 
+ 
+