diff --git a/angular.json b/angular.json index 4b40b10..2da9089 100644 --- a/angular.json +++ b/angular.json @@ -344,14 +344,14 @@ "replace": "src/app/_modules/layout/header/header.component.ts", "with": "src/gbu/component/layout/header/header.component.ts" }, - { - "replace": "src/app/_modules/layout/footer/footer.component.ts", - "with": "src/gbu/component/layout/footer/footer.component.ts" - }, { "replace": "src/app/_modules/layout/jumbotron/jumbotron.component.ts", "with": "src/gbu/component/layout/jumbotron/jumbotron.component.ts" }, + { + "replace": "src/app/_modules/layout/right-content/right-content.component.ts", + "with": "src/gbu/component/layout/right-content/right-content.component.ts" + }, { "replace": "src/app/_modules/pages/menu/slider-menu/slider-menu.component.ts", "with": "src/gbu/component/pages/menu/slider-menu/slider-menu.component.ts" @@ -403,14 +403,14 @@ "replace": "src/app/_modules/layout/header/header.component.ts", "with": "src/gbu/component/layout/header/header.component.ts" }, - { - "replace": "src/app/_modules/layout/footer/footer.component.ts", - "with": "src/gbu/component/layout/footer/footer.component.ts" - }, { "replace": "src/app/_modules/layout/jumbotron/jumbotron.component.ts", "with": "src/gbu/component/layout/jumbotron/jumbotron.component.ts" }, + { + "replace": "src/app/_modules/layout/right-content/right-content.component.ts", + "with": "src/gbu/component/layout/right-content/right-content.component.ts" + }, { "replace": "src/app/_modules/pages/menu/slider-menu/slider-menu.component.ts", "with": "src/gbu/component/pages/menu/slider-menu/slider-menu.component.ts" diff --git a/src/app/_modules/publications/list/item/publications-list-item.component.html b/src/app/_modules/publications/list/item/publications-list-item.component.html index 28a7cc7..a156503 100644 --- a/src/app/_modules/publications/list/item/publications-list-item.component.html +++ b/src/app/_modules/publications/list/item/publications-list-item.component.html @@ -8,7 +8,7 @@ -
+
{{publication.publishedAt | date : 'dd.MM.yy'}}
diff --git a/src/app/_modules/registries/registry/entries/entry/registry-entry.component.html b/src/app/_modules/registries/registry/entries/entry/registry-entry.component.html index cdf95e9..af966e6 100644 --- a/src/app/_modules/registries/registry/entries/entry/registry-entry.component.html +++ b/src/app/_modules/registries/registry/entries/entry/registry-entry.component.html @@ -36,4 +36,4 @@
-
{{entry|json}}
\ No newline at end of file + \ No newline at end of file diff --git a/src/gbu/component/layout/footer/footer.component.scss b/src/gbu/component/layout/footer/footer.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/gbu/component/layout/footer/footer.component.ts b/src/gbu/component/layout/footer/footer.component.ts deleted file mode 100644 index 1b7eb58..0000000 --- a/src/gbu/component/layout/footer/footer.component.ts +++ /dev/null @@ -1,36 +0,0 @@ -import {Component} from '@angular/core'; -import {AuthenticationService} from "@app/_services"; -import {PagesService} from "@app/_services/pages.service"; - -@Component({ - selector: 'footer', - templateUrl: 'footer.component.html', - styleUrls: ['footer.component.scss'] -}) -export class FooterComponent { - - public year = new Date().getFullYear(); - - constructor( - public authService: AuthenticationService, - public pagesService: PagesService) { - } - - get isLoggedIn() { - return this.authService.isLoggedIn; - } - - ngOnInit() { - } - - login() { - this.authService.popup('login'); - } - - get isRusPage(){ - return this.pagesService.rootPage.slug ==="" - } - - - -} diff --git a/src/gbu/component/layout/grid/grid.component.html b/src/gbu/component/layout/grid/grid.component.html index 91ef665..63649b8 100644 --- a/src/gbu/component/layout/grid/grid.component.html +++ b/src/gbu/component/layout/grid/grid.component.html @@ -6,14 +6,14 @@
- +
-
+
diff --git a/src/gbu/component/layout/header/header.component.html b/src/gbu/component/layout/header/header.component.html index 0f90f9f..5fecbb8 100644 --- a/src/gbu/component/layout/header/header.component.html +++ b/src/gbu/component/layout/header/header.component.html @@ -8,18 +8,38 @@ Поиск -
+
Вход
-
-
- +
+
+ +
+ Государственное бюджетное
учреждение города Москвы
+ «Жилищник Таганского района» +
-
- +
+
+ + пн-чт: 8:00–17:00, пт: 8:00–15:45; перерыв на обед: 12:00–12:45 +
+
+ + 109147, г. Москва, Воронцовская ул., д. 21б +
+
+ + + gbu-taganka@mail.ru + + + 8 (495) 230-57-87 + +
diff --git a/src/gbu/component/layout/header/header.component.ts b/src/gbu/component/layout/header/header.component.ts index 629d38e..5f38f58 100644 --- a/src/gbu/component/layout/header/header.component.ts +++ b/src/gbu/component/layout/header/header.component.ts @@ -1,6 +1,7 @@ import {Component} from '@angular/core'; import {Router} from "@angular/router"; import {PagesService} from "@app/_services/pages.service"; +import { AuthenticationService } from '@app/_services'; @Component({ selector: 'header', @@ -11,7 +12,8 @@ export class HeaderComponent { constructor( private router: Router, - public pagesService: PagesService + public pagesService: PagesService, + private authService: AuthenticationService ) { } // ngOnInit(){ @@ -35,4 +37,9 @@ export class HeaderComponent { openMobileMenu(){ this.router.navigate([{outlets: {slider: 'pages-menu'}}], {skipLocationChange: true}).then(); } + + login() { + this.authService.popup('login'); + } + } \ No newline at end of file diff --git a/src/gbu/component/layout/jumbotron/jumbotron.component.html b/src/gbu/component/layout/jumbotron/jumbotron.component.html index 7499e5a..aa9133b 100644 --- a/src/gbu/component/layout/jumbotron/jumbotron.component.html +++ b/src/gbu/component/layout/jumbotron/jumbotron.component.html @@ -1,16 +1,17 @@ -
+
- -
-

{{name}}

- -

- Учреждено в 1998 -

+ +
+
+ + {{parent.name}} + + +
+
{{currentPage.name}}
- +

{{name}}

+
diff --git a/src/gbu/component/layout/jumbotron/jumbotron.component.ts b/src/gbu/component/layout/jumbotron/jumbotron.component.ts index 254feb0..542d33d 100644 --- a/src/gbu/component/layout/jumbotron/jumbotron.component.ts +++ b/src/gbu/component/layout/jumbotron/jumbotron.component.ts @@ -45,13 +45,7 @@ export class JumbotronComponent { if(this.currentPage){ name = this.currentPage?.h1 || this.currentPage?.name; let parents = this.currentPage?.parents?.data - if(parents){ - if (parents[1]?.type.name=='nav-page'){ - if (parents[2]) name = parents[2].h1|| parents[2].name - }else{ - if (parents[1]) name = parents[1].h1|| parents[1].name - } - } + if (parents[1]) name = parents[1].h1|| parents[1].name } return name } @@ -104,4 +98,8 @@ export class JumbotronComponent { return this.currentPage?.link === '/' } + get parents() { + return this.currentPage?.parents?.data; + } + } diff --git a/src/gbu/component/layout/right-content/right-content.component.html b/src/gbu/component/layout/right-content/right-content.component.html new file mode 100644 index 0000000..aecaea6 --- /dev/null +++ b/src/gbu/component/layout/right-content/right-content.component.html @@ -0,0 +1,19 @@ + + + Электронное обращение + + + + Прием показаний и оплата электроэнергии + + + + Прием показаний приборов учета воды + + + + Получить и оплатить ЕПД + + + + \ No newline at end of file diff --git a/src/gbu/component/layout/footer/footer.component.html b/src/gbu/component/layout/right-content/right-content.component.scss similarity index 100% rename from src/gbu/component/layout/footer/footer.component.html rename to src/gbu/component/layout/right-content/right-content.component.scss diff --git a/src/gbu/component/layout/right-content/right-content.component.ts b/src/gbu/component/layout/right-content/right-content.component.ts new file mode 100644 index 0000000..08e8a65 --- /dev/null +++ b/src/gbu/component/layout/right-content/right-content.component.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + + +@Component({ + selector: 'right-content', + templateUrl: './right-content.component.html', + styleUrls: ['./right-content.component.scss'] +}) +export class RightContentComponent { + + +} diff --git a/src/gbu/css/_basics.scss b/src/gbu/css/_basics.scss index c715379..fe12362 100644 --- a/src/gbu/css/_basics.scss +++ b/src/gbu/css/_basics.scss @@ -10,6 +10,7 @@ line-height: 24px; } + // li { // list-style-image: url("~src/assets/images/icons/add_24dp.svg"); // } @@ -215,50 +216,53 @@ body { } p { - font-family: PT Sans; - font-size: 20px; + color: #000; + font-family: Golos; + font-size: 16px; font-style: normal; font-weight: 400; - line-height: 32px; - margin: 0; + line-height: 24px; +} + +strong{ + font-weight: 600; } h1{ color: var(--white); - font-family: PT Sans Narrow; + font-family: "PT Serif"; font-size: 76px; font-style: normal; - font-weight: 700; + font-weight: 400; line-height: 76px; /* 100% */ letter-spacing: 0.76px; } h2 { color: var(--second-act); - font-family: PT Sans Narrow; + font-family: "PT Serif"; font-size: 50px; font-style: normal; - font-weight: 700; + font-weight: 400; line-height: 60px; /* 120% */ letter-spacing: 0.5px; margin:0; } h3 { - color: var(--second-act); - font-family: PT Sans Narrow; - font-size: 36px; + font-family: "PT Serif"; + font-size: 24px; font-style: normal; - font-weight: 700; - line-height: 44px; /* 120% */ - letter-spacing: 0.36px; - margin:0; + font-weight: 400; + line-height: 30px; + margin-top: 16px; + margin-bottom: 0px; } h4 { color: var(--second-act); - font-family: PT Sans Narrow; + font-family:"PT Serif"; font-size: 24px; font-style: normal; - font-weight: 700; + font-weight: 400; line-height: 32px; /* 133.333% */ letter-spacing: 0.24px; margin:0; diff --git a/src/gbu/css/_grid.scss b/src/gbu/css/_grid.scss index c2410cc..9dbab64 100644 --- a/src/gbu/css/_grid.scss +++ b/src/gbu/css/_grid.scss @@ -19,84 +19,38 @@ jumbotron{ - .jumbotron-bg{ - height: 400px; - background-size: cover; - background-position: center; - max-height: 150vw; - .jumbotron-content{ - height: 100%; + margin-block: 40px; + .jumbotron-content{ + flex-direction: column; + header-user-bar{ + position: absolute; + align-self: flex-end; + } + .breadcrumbs{ display: flex; - flex-direction: column; - justify-content: center; - align-items: flex-start; - position: relative; - min-height: 100px; - .user-bar{ - justify-content: flex-end; - } - header-user-bar{ - bottom: 24px; - right: 40px; - position: absolute; - } - .jumbotron-content-center{ - display: flex; - flex-direction: column; - max-width: 100%; - h1{ - margin: 0; - padding: $ps 0; - max-width: 100%; - } - } - } - &.rootpage-jumbotron{ - .jumbotron-content{ - header-user-bar{ - bottom: 40px !important; - } - .jumbotron-content-center{ - align-self: center; - align-items: center; - max-width: 100%; - width: 768px; - - h1{ - font-size: 80px; - line-height: 95px; - } - h4{ - text-decoration: underline; - font-size: 25px; - font-weight: 400; - font-family: PT Sans; - margin-top: 16px; - a{ - color: #fff; - text-decoration: underline; - } - } - } - } - - - } - } - .jumbotron-edit-field{ - height: 60px; - background-color: var(--white); - border-bottom: 1px solid var(--second-dis); - .jumbotron-edit-field-row{ - div{ + gap:8px; + color: #969595; + div a{ display: flex; align-items: center; - gap: $pxs; + gap:8px; } - display: flex; - justify-content: flex-end; + } + h1{ + color:#000; + font-family: "PT Serif"; + font-size: 44px; + font-style: normal; + font-weight: 400; + line-height: 55px; + margin-block: 8px 24px; + } + img{ + height: 180px; + object-fit: cover; } } + } @@ -120,45 +74,44 @@ jumbotron{ left-content{ display: none; } - - right-content{ - flex-shrink: 0; - pages-menu.current{ - pages-menu-item>.item{ - display: flex; - } - } - } - .main-content{ - max-width: 100%; - width: $page-width; - } - - } -} - -.this-root-page{ - .content-sapce{ .content-grid{ - justify-content: center; - right-content{ - display: none; + width: 1280px; + gap:32px; + } + + right-content{ + width: 272px; + display: flex; + flex-direction: column; + gap: 24px; + a{ + display: flex; + flex-direction: column; + align-items: center; + background-color: #fff; + padding: 24px; + gap:16px; + span{ + text-align: center; } - }; + } + img{ + width: 100%; + border-radius: 4px; + } + } + .main-content{ + width: 990px; + } + } } + + @media screen and (min-width: 1330px){ - .this-root-page{ - .content-sapce{ - .content-grid{ - .main-content{ - margin-left: 150px; - } - }; - } - } + } footer{ diff --git a/src/gbu/css/_main-menu.scss b/src/gbu/css/_main-menu.scss index 1710099..7258cbf 100644 --- a/src/gbu/css/_main-menu.scss +++ b/src/gbu/css/_main-menu.scss @@ -28,6 +28,7 @@ header{ align-items: end; color: #FFF; gap: 8px; + cursor: pointer; }; locale{ img{ @@ -43,16 +44,131 @@ header{ } } - .header-top-menu-contact{ + .header-contact{ display: flex; - height: 96px; + justify-content: space-between; + height: 128px; + padding-inline: 48px; background-color: var(--light); + .header-contact-left{ + display: flex; + justify-content: flex-start; + align-items: center; + gap: 8px; + + img{ + width: 91px; + height: 96px; + } + div{ + width: 280px; + span{ + color: #6A6868; + } + } + }; + .header-contact-right{ + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; + gap: 8px; + color: #6A6868; + div{ + display: inline-flex; + align-items: center; + gap: 8px; + ico{ + margin-left: 16px; + } + } + } } + + pages-menu.lvl-0{ + flex-direction: row; + width: 100%; + padding-inline: 48px; + background-color: #FFF; + position: relative; + >pages-menu-item{ + .item{ + padding: 14px 24px; + drop-down{ + display: none; + } + a{ + color: #000; + margin-top: 0; + } + &.parent,&.current{ + padding-bottom: 10px; + a{ + color: var(--prime); + margin-top: 0; + } + border-bottom: 4px solid var(--prime); + } + + } + pages-menu{ + display: none; + } + + pages-menu{ + position: absolute; + background-color:#FFF; + top: 52px; + border-top: 2px solid var(--light); + z-index:1; + padding: 14px 0; + .item{ + padding: 4px 24px; + border-bottom: none !important; + } + + }; + + } + } + - pages-menu{ - display: block - } }; + +} + + +@media (hover: hover) and (pointer: fine) { + /* has mouse */ + + header{ + .header.layout-corral{ + pages-menu.lvl-0{ + >pages-menu-item:hover{ + pages-menu.selected{ + display: flex; + }; + } + } + }; + } +} + +@media (hover: none) and (pointer: coarse) { + /* fore tuchscreen */ + header{ + .header.layout-corral{ + pages-menu.lvl-0{ + >pages-menu-item{ + pages-menu{ + &.selected{ + display: flex; + } + }; + } + } + }; + } } @@ -184,108 +300,9 @@ slider-menu{ } } right-content{ - drop-down{ - display: none; - } - pages-menu{ - padding-inline-start: 0; - } - .item{ - min-height: 0; - padding: 10px 20px; - border-radius: 8px; - } - - .item.lvl-0{ - padding: 0; - >a{ - display: none; - } - &.nav+pages-menu{ - pages-menu.lvl-2{ - width: 400px; - margin-inline-start: 40px; - border-radius: 8px; - background: #FFF; - box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.27); - padding: 20px; - pages-menu{ - padding: 0; - } - } - .item{ - a{ - color: var(--second); - &:hover{ - color: var(--prime-act); - } - } - &.lvl-1{display: none;} - &.lvl-2{ - a{ - font-family: "PT Sans Narrow"; - font-size: 24px; - font-weight: 700; - line-height: 32px; - letter-spacing: 0.24px; - } - &.current>a,&.parent>a{ - color: var(--prime); - } - } - &.current:not(.lvl-2){ - background-color: #EDEDED; - } - } - } - - &:not(.nav)+pages-menu{ - width: 360px; - margin-inline-start: 40px; - border-radius: 8px; - background: #FFF; - box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.27); - padding: 20px; - pages-menu{ - padding: 0; - } - .item{ - a{ - color: var(--second); - &:hover{ - color: var(--prime-act); - } - } - &.lvl-1{ - a{ - font-family: "PT Sans Narrow"; - font-size: 24px; - font-weight: 700; - line-height: 32px; - letter-spacing: 0.24px; - } - &.current>a,&.parent>a{ - color: var(--prime); - } - } - &.current:not(.lvl-1){ - background-color: #EDEDED; - } - } - } - - - - &+pages-menu{ - &:not(.parent,.current){ - display: none; - } - - } - - } + } diff --git a/src/gbu/css/_pages-section.scss b/src/gbu/css/_pages-section.scss index c365032..e0f04a6 100644 --- a/src/gbu/css/_pages-section.scss +++ b/src/gbu/css/_pages-section.scss @@ -1,7 +1,9 @@ page-sections{ display: flex; flex-direction: column; - gap:24px; + background-color: #FFF; + padding: 32px; + .section{ display: flex; flex-direction: column; @@ -19,6 +21,7 @@ page-sections{ .menu .block .up{ display: none; } + h3{margin-top: 0;} } page-section:nth-last-child(2){ .menu .block .down{ @@ -29,41 +32,17 @@ page-sections{ html-section { text-align: justify; - text-indent: 30px; ul{ - padding: 0; - margin-bottom: 32px; - >li{ - list-style: none; - line-height: 32px; - text-indent: -32px; - padding-inline-start: 32px; - &::before{ - display: inline-block; - content: ""; - width: 16px; - height: 2px; - background-color: var(--prime); - margin-bottom: 5px; - margin-inline-end: 16px; - } + + li{ + padding-inline-start: 12px; } - *+li{ - margin-top: 24px; + li+li{ + margin-top: 8px; } } ol{ - padding: 0; - >li{ - line-height: 32px; - margin-inline-start: 24px; - margin-bottom: 32px; - text-indent: 0; - padding-inline-start: 8px; - } - } - ul+*{ - margin-bottom: 20px; + } } @@ -440,6 +419,7 @@ cards-section-items{ images-section{ display: block; + margin-block: 32px; .mobile{ display: none; @@ -463,7 +443,7 @@ images-section{ gap: 8px; img{ - border-radius: 12px; + } &.tiles{ @@ -603,57 +583,73 @@ publications-list{ gap: 8px; } - .items { - margin: 24px 0; - } publications-list-item { display: block; - padding: 24px 0; - border-top: 1px solid var(--second-dis); - &:last-child{ - border-bottom: 1px solid var(--second-dis); - } - - .not-published{ - opacity: 0.5; - } - h3{ - font-size: 32px; - line-height: 38px; - } - - .date{ - color: var(--second); - margin-bottom: 16px; - } - - - .excerpt{ - margin-top: $p; - font-family: PT Sans; - font-size: 20px; - font-style: normal; - font-weight: 400; - line-height: 32px; - text-align: justify; - text-indent: 30px; - white-space: pre-wrap; - } - .name{ - margin-bottom: 24px; - } - - .publication-read-more{ - margin-top: 24px; - } - - .content{ - margin-top: $p; + background-color: #FFF; + padding: 32px 32px 0 32px; + .publication-content{ + width: 100%; display: flex; flex-direction: column; - gap: $p; - }; + position: relative; + min-height: 232px; + border-bottom: solid 1px #E5E5E5; + gellery{ + display: block; + order: 0; + position: absolute; + left: 0; + top: 0; + width: 200px; + height: 200px; + overflow: hidden; + .poster{ + width: 200px; + height: 200px; + img{ + border: none; + width: 100%; + height: 100%; + object-fit: cover; + border-radius: 0; + } + } + } + .date{ + margin-left: 232px; + display: block; + order: 1; + color: #6A6868; + font-family: Golos; + font-size: 14px; + font-style: normal; + font-weight: 400; + line-height: 21px; + margin-bottom: 16px; + } + .name h3{ + margin: 0 0 8px 232px; + display: block; + order: 1; + color: #000; + font-family: "PT Serif"; + font-size: 24px; + font-style: normal; + font-weight: 400; + line-height: 30px; + cursor: pointer; + } + .excerpt{ + margin-left: 232px; + display: block; + order: 1; + margin-bottom: 32px; + } + .publication-read-more{ + display: none; + } + } } @@ -677,7 +673,6 @@ publication-page { flex-direction: column; gap: $p; text-align: justify; - text-indent: 30px; }; .publication-page-back { @@ -687,65 +682,68 @@ publication-page { margin-top: 24px; } -} -gellery{ - .poster{ - height: 468px; - max-width: calc( 100vw - 80px); - max-height: calc( (100vw - 80px ) * 0.7 ); - margin-bottom: 8px; - overflow: hidden; - cursor: pointer; - display: flex; - justify-content: center; - >img{ - height: 100%; - border: 1px solid var(--second-dis); - background-color: var(--second-dis); - border-radius: 12px; - } - } - .posters{ - display: flex; - flex-wrap: wrap; - align-content: flex-start; - gap: 8px; - justify-content: center; - .item{ - width: 72px; - height: 52px; - border: 1px solid var(--prime); + gellery{ + .poster{ + height: 468px; + max-width: calc( 100vw - 80px); + max-height: calc( (100vw - 80px ) * 0.7 ); + margin-bottom: 8px; + overflow: hidden; cursor: pointer; - :hover{ - border-color: var(--prime-act); + display: flex; + justify-content: flex-start; + >img{ + height: 100%; + border: 1px solid var(--second-dis); + background-color: var(--second-dis); } - img{ - object-fit: cover; - object-position: 50% 20%; + } + .posters{ + display: flex; + flex-wrap: wrap; + align-content: flex-start; + gap: 8px; + justify-content: flex-start; + .item{ + width: 72px; + height: 52px; + border: 1px solid var(--prime); + cursor: pointer; + :hover{ + border-color: var(--prime-act); + } + img{ + object-fit: cover; + object-position: 50% 20%; + width: 100%; + height: 100%; + } + } + } + .gellery-fullscreen{ + position: fixed; + width: 100vw; + height: 100vh; + z-index: 1000; + top:0; + left: 0; + background-color: gray; + swiper-gellery{ width: 100%; height: 100%; } } - } - .gellery-fullscreen{ - position: fixed; - width: 100vw; - height: 100vh; - z-index: 1000; - top:0; - left: 0; - background-color: gray; - swiper-gellery{ - width: 100%; - height: 100%; - } + } } + + + video-section{ cursor: pointer; .video-box{ @@ -786,29 +784,34 @@ video-section{ flex-wrap: wrap; gap: 12px; button { - background-color: transparent; - min-width: 24px; - height: 24px; - border-radius: 4px; - font-weight: 700; - font-size: 0.875rem; - line-height: 18px; - border: 1px solid var(--second); - text-align: center; - padding: 1px 6px; - color: var(--dark); - &.active { - border-color: var(--prime); + &:not(.next, .count){ + display: flex; + padding: 1px 0px 2px 0px; + flex-direction: column; + justify-content: center; + align-items: center; + width: 24px; + height: 24px; + border-radius: 12px; + border: 1px solid var(--prime); + background: #FFF; color: var(--prime); - } - &.next { - margin-right: 20px; - border-color: transparent; - font-family: PT Sans; - font-size: 16px; + text-align: center; + font-family: Golos; + font-size: 14px; font-style: normal; font-weight: 400; - line-height: 24px; + line-height: 21px; + &.active { + color: #FFF; + border-color: var(--prime); + background-color: var(--prime); + } + } + + + &.next { + display: none; } } .dots { diff --git a/src/gbu/css/_registry.scss b/src/gbu/css/_registry.scss index e52f298..5e91c1d 100644 --- a/src/gbu/css/_registry.scss +++ b/src/gbu/css/_registry.scss @@ -1,8 +1,21 @@ + +registry-page{ + page-sections{ + padding: 0; + >*{ + margin: 32px; + } + } +} + .registry { + background-color: #ffffff; + padding: 32px; .filters{ display: flex; gap:24px; align-items: flex-end; + background-color: #ffffff; } .bar { @@ -83,6 +96,7 @@ registry-entries { display: block; padding-bottom: 24px; + background-color: #ffffff; } registry-category{ .bar { @@ -125,7 +139,7 @@ registry-category{ registry-entry { display: block; - padding: 16px 24px; + padding: 16px 0; border-bottom: #E8E8E8 solid 1px; &:first-child { border-top: #E8E8E8 solid 1px; @@ -133,6 +147,12 @@ registry-entry { .main { .name { margin-right: 24px; + a{ + display: inline-flex; + align-items: flex-start; + gap: 16px; + color: #000; + } } .menu-entry{ display: inline-flex; diff --git a/src/gbu/images/acreditation.png b/src/gbu/images/acreditation.png deleted file mode 100644 index aaeba8e..0000000 Binary files a/src/gbu/images/acreditation.png and /dev/null differ diff --git a/src/gbu/images/adv_00.png b/src/gbu/images/adv_00.png new file mode 100644 index 0000000..3e2d938 Binary files /dev/null and b/src/gbu/images/adv_00.png differ diff --git a/src/gbu/images/adv_01.png b/src/gbu/images/adv_01.png new file mode 100644 index 0000000..91f0d17 Binary files /dev/null and b/src/gbu/images/adv_01.png differ diff --git a/src/gbu/images/build.png b/src/gbu/images/build.png deleted file mode 100644 index c19ce74..0000000 Binary files a/src/gbu/images/build.png and /dev/null differ diff --git a/src/gbu/images/favicon.png b/src/gbu/images/favicon.png deleted file mode 100644 index ba0c959..0000000 Binary files a/src/gbu/images/favicon.png and /dev/null differ diff --git a/src/gbu/images/ico/get_n_pay_48.svg b/src/gbu/images/ico/get_n_pay_48.svg new file mode 100644 index 0000000..e8285a2 --- /dev/null +++ b/src/gbu/images/ico/get_n_pay_48.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/gbu/images/ico/lightbulb_48.svg b/src/gbu/images/ico/lightbulb_48.svg new file mode 100644 index 0000000..40847f5 --- /dev/null +++ b/src/gbu/images/ico/lightbulb_48.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/gbu/images/ico/location_24.svg b/src/gbu/images/ico/location_24.svg new file mode 100644 index 0000000..97d29c9 --- /dev/null +++ b/src/gbu/images/ico/location_24.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/gbu/images/ico/mail_24.svg b/src/gbu/images/ico/mail_24.svg new file mode 100644 index 0000000..f8bed91 --- /dev/null +++ b/src/gbu/images/ico/mail_24.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/gbu/images/ico/phone_24.svg b/src/gbu/images/ico/phone_24.svg new file mode 100644 index 0000000..3b203c2 --- /dev/null +++ b/src/gbu/images/ico/phone_24.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/gbu/images/ico/telegram_24.svg b/src/gbu/images/ico/telegram_24.svg new file mode 100644 index 0000000..bc01864 --- /dev/null +++ b/src/gbu/images/ico/telegram_24.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/gbu/images/ico/watch_24.svg b/src/gbu/images/ico/watch_24.svg new file mode 100644 index 0000000..cddf2a9 --- /dev/null +++ b/src/gbu/images/ico/watch_24.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/gbu/images/ico/water_48.svg b/src/gbu/images/ico/water_48.svg new file mode 100644 index 0000000..3aac868 --- /dev/null +++ b/src/gbu/images/ico/water_48.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/gbu/images/ico/web_req_48.svg b/src/gbu/images/ico/web_req_48.svg new file mode 100644 index 0000000..c3b7445 --- /dev/null +++ b/src/gbu/images/ico/web_req_48.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/gbu/images/igc.png b/src/gbu/images/igc.png deleted file mode 100644 index d79eb57..0000000 Binary files a/src/gbu/images/igc.png and /dev/null differ diff --git a/src/gbu/images/portfolio_bg.png b/src/gbu/images/portfolio_bg.png deleted file mode 100644 index 26a1377..0000000 Binary files a/src/gbu/images/portfolio_bg.png and /dev/null differ