diff --git a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/default/cards-item-default.component.html b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/default/cards-item-default.component.html index d878380..4df043b 100644 --- a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/default/cards-item-default.component.html +++ b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/default/cards-item-default.component.html @@ -1,4 +1,4 @@ -
+
{{header}}
{{subheader}}
{{text}}
diff --git a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/default/cards-item-default.component.ts b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/default/cards-item-default.component.ts index 6c8b7e8..e1cc5c0 100644 --- a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/default/cards-item-default.component.ts +++ b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/default/cards-item-default.component.ts @@ -1,5 +1,6 @@ import { Component, Input } from '@angular/core'; import {ObjectsService} from "@app/_services"; +import { Router } from '@angular/router'; @Component({ selector: 'cards-item-default', @@ -8,7 +9,10 @@ import {ObjectsService} from "@app/_services"; }) export class CardsItemDefaultComponent { - constructor(private objectsService: ObjectsService) {} + constructor( + private objectsService: ObjectsService, + private router: Router + ) {} @Input() card:any; @@ -42,6 +46,10 @@ export class CardsItemDefaultComponent { return this.objectsService.getValue(this.card, 'link'); } + navigate(){ + console.log(this.link) + if(this.link) this.router.navigate([this.link]).then() + } } diff --git a/src/nir/component/layout/jumbotron/jumbotron.component.html b/src/nir/component/layout/jumbotron/jumbotron.component.html index 72d5757..de022a5 100644 --- a/src/nir/component/layout/jumbotron/jumbotron.component.html +++ b/src/nir/component/layout/jumbotron/jumbotron.component.html @@ -1,4 +1,4 @@ -
+
@@ -13,6 +13,6 @@
-

{{name}}

+

{{name}}

diff --git a/src/nir/component/layout/jumbotron/jumbotron.component.ts b/src/nir/component/layout/jumbotron/jumbotron.component.ts index 2d54366..3879cd0 100644 --- a/src/nir/component/layout/jumbotron/jumbotron.component.ts +++ b/src/nir/component/layout/jumbotron/jumbotron.component.ts @@ -71,6 +71,10 @@ export class JumbotronComponent { return !this.pagesService.currentPage?.parents.data.length && this.pagesService.currentPage } + get lavle(){ + return this.pagesService.currentPage?.parents.data.length + } + get since(){ return this.currentPage?.link === '/' } diff --git a/src/nir/css/_admin.scss b/src/nir/css/_admin.scss index 07b902f..2872ba2 100644 --- a/src/nir/css/_admin.scss +++ b/src/nir/css/_admin.scss @@ -4,6 +4,7 @@ font-style: normal; font-weight: 400; line-height: 24px; + max-width: 1020px; h2{ color: var(--second-act); margin-bottom: 48px; @@ -313,4 +314,4 @@ users-list{ } } -} \ No newline at end of file +} diff --git a/src/nir/css/_basics.scss b/src/nir/css/_basics.scss index e13966c..0bf5e6f 100644 --- a/src/nir/css/_basics.scss +++ b/src/nir/css/_basics.scss @@ -241,24 +241,21 @@ h2 { line-height: 125%; /* 50px */ } h3 { - color: var(--second-act); - font-family: PT Sans Narrow; - font-size: 36px; + color: var(--bk66); + font-family: PT Serif; + font-size: 40px; font-style: normal; - font-weight: 700; - line-height: 44px; /* 120% */ - letter-spacing: 0.36px; - margin:0; + font-weight: 400; + line-height: 125%; } h4 { - color: var(--second-act); - font-family: PT Sans Narrow; - font-size: 24px; + color: var(--bk44); + font-family: PT Sans; + font-size: 16px; font-style: normal; font-weight: 700; - line-height: 32px; /* 133.333% */ - letter-spacing: 0.24px; - margin:0; + line-height: 24px; + margin-top: -24px; } a { diff --git a/src/nir/css/_pages-section.scss b/src/nir/css/_pages-section.scss index 176f544..d20995e 100644 --- a/src/nir/css/_pages-section.scss +++ b/src/nir/css/_pages-section.scss @@ -45,7 +45,7 @@ page-sections{ } } -add-section, page-menu{ +add-section, page-menu, images-section{ display: block; width: 720px; max-width: 100%; @@ -164,7 +164,8 @@ images-section{ gap: 8px; img{ - border-radius: 12px; + border-radius: 8px; + border: 1px solid var(--bk22); } &.tiles{ @@ -437,11 +438,16 @@ video-section{ max-height: 52vw; position: relative; z-index: 0; + border-radius: 16px; + box-shadow: 0px 0px 8px 0px rgba(29, 29, 31, 0.03), 0px 2px 16px 0px rgba(29, 29, 31, 0.03), 0px 2px 32px 0px rgba(29, 29, 31, 0.06); + overflow: hidden; + border: 1px solid var(--bk22); .poster{ object-fit: cover; - width: 100%; - height: 100%; + width: 102%; + height: 102%; + margin: -2px; } .icon{ position: absolute; @@ -452,14 +458,24 @@ video-section{ margin: auto; } iframe{ - width: 100%; - height: 100%; + width: 102%; + height: 102%; + margin: -2px; background-color: black; } } } +maps-section{ + iframe{ + border-radius: 16px; + border: 1px solid var(--bk22); + overflow: hidden; + } + +} + .pagination {