master
Boris Voropaev 2024-01-25 15:25:31 +03:00
parent 5e28df51c0
commit f603f7d86e
13 changed files with 110 additions and 51 deletions

View File

@ -1,6 +1,6 @@
<div class="card-slide">
<div class="card-slide" (click)="navigate()">
<div *ngIf="header" class="card-header">{{header}}</div>
<div *ngIf="subheader" class="card-subheader">{{subheader}}</div>
<div *ngIf="text" class="card-text">{{text}}</div>
<img *ngIf="image" [src]="image" class="card-image">
<img [src]="image" class="card-image" *ngIf="isImage">
</div>

View File

@ -1,5 +1,6 @@
import { Component, Input } from '@angular/core';
import {ObjectsService} from "@app/_services";
import { Router } from '@angular/router';
@Component({
@ -9,7 +10,7 @@ import {ObjectsService} from "@app/_services";
})
export class CardsItemSlidesComponent {
constructor(private objectsService: ObjectsService) {}
constructor(private objectsService: ObjectsService, private router: Router) {}
@Input() card:any;
@ -26,10 +27,17 @@ export class CardsItemSlidesComponent {
get image() {
return this.objectsService.getValue(this.card, 'image')?.links?.full+'?width=500';
}
get isImage(){
return this.objectsService.getValue(this.card, 'image')
}
get link() {
return this.objectsService.getValue(this.card, 'link');
}
navigate(){
this.router.navigate([this.link]).then()
}
}

View File

@ -1,5 +1,5 @@
<div class="contact">
<h2 [innerText]="name"></h2>
<h2 [innerText]="name" *ngIf="name"></h2>
<h2 *ngIf="legalAddress">Юридический адрес</h2>
<p *ngIf="legalAddress" class="legal-address" [innerText]="legalAddress"></p>
<h2 *ngIf="locationAddress">Фактический адрес</h2>

View File

@ -87,6 +87,7 @@ jumbotron{
width: 411px;
height: 100%;
align-items: center;
margin-bottom: 0;
img{
height: 532px;
width: 100%;

View File

@ -1,17 +1,17 @@
<div class="jumbotron-bg space" [ngStyle]="bgStyle" *ngIf="lavle<2">
<div class="jumbotron-content">
<div class="jumbotron-edit-field" *ngIf="editable" dir="ltr">
<div class="jumbotron-edit-field-row">
<div class="switch-host" (click)="toggleEditMode()">
Режим редактирования
<switch [val]="editMode"></switch>
</div>
</div>
</div>
</div>
</div>
<div class="jumbotron-edit-field" *ngIf="editable" dir="ltr">
<div class="jumbotron-edit-field-row">
<div class="switch-host" (click)="toggleEditMode()">
Режим редактирования
<switch [val]="editMode"></switch>
</div>
</div>
</div>
<div class="jumbotron-content-center">
<h1 *ngIf="!isRootPage && lavle==1">{{name}}</h1>
</div>

View File

@ -5,6 +5,7 @@
font-weight: 400;
line-height: 24px;
max-width: 1020px;
margin-inline: auto;
h2{
color: var(--second-act);
margin-bottom: 48px;

View File

@ -241,12 +241,12 @@ h2 {
line-height: 125%; /* 50px */
}
h3 {
color: var(--bk66);
font-family: PT Serif;
font-size: 40px;
color: var(--bk44);
font-family: "PT Serif";
font-size: 32px;
font-style: normal;
font-weight: 400;
line-height: 125%;
line-height: 125%; /* 40px */
}
h4 {
color: var(--bk44);
@ -255,7 +255,6 @@ h4 {
font-style: normal;
font-weight: 700;
line-height: 24px;
margin-top: -24px;
}
a {

View File

@ -28,21 +28,7 @@ jumbotron{
align-items: center;
position: relative;
background: linear-gradient(to top, var(--bg), transparent);
.jumbotron-edit-field{
height: 60px;
width: 100%;
max-width: 720px;
padding-inline: 24px;
.jumbotron-edit-field-row{
div{
display: flex;
align-items: center;
gap: $pxs;
}
display: flex;
justify-content: flex-end;
}
}
}
@ -53,6 +39,23 @@ jumbotron{
margin: 0;
}
}
.jumbotron-edit-field{
width: 100%;
padding-inline: 24px;
margin-top: 8px;
.jumbotron-edit-field-row{
max-width: 720px;
margin-inline: auto;
div{
display: flex;
align-items: center;
gap: $pxs;
}
display: flex;
justify-content: flex-end;
}
}
}

View File

@ -25,7 +25,7 @@ header, slider-menu{
}
padding: 4px 0 0 0;
border-bottom: solid 4px transparent;
&.current{
&.current, &.parent{
border-color: var(--prime);
}
}
@ -45,12 +45,21 @@ header{
display: flex;
justify-content: center;
align-items: center;
height: 100%;
pages-menu{
display: flex;
flex-direction: row;
gap: 16px;
margin: 0 60px;
align-items: center;
height: 100%;
margin: 0 40px;
pages-menu-item{
padding-inline: 8px;
height: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
&:not(.lvl-0){
display: none;
}
@ -66,6 +75,8 @@ header{
display: flex;
align-items: center;
gap: 8px;
height: 100%;
padding: 8px;
color: var(--black);
font-family: PT Sans;
font-size: 16px;
@ -79,13 +90,15 @@ header{
.header-logo{
cursor: pointer;
padding: 8px;
}
.burger:hover, .header-logo:hover, .header-login:hover ico, .item:hover{
.burger:hover, .header-logo:hover, .header-login:hover, pages-menu-item:hover{
background-color: var(--bk4);
}
.burger:active, .header-logo:active, .header-login:active ico, .item:active{
.burger:active, .header-logo:active, .header-login:active, pages-menu-item:active{
background-color: var(--bk8);
}
}

View File

@ -5,7 +5,7 @@ header-user-bar{
position: relative;
display: flex;
justify-content: center;
background-color: #fff;
background-color: var(--bg-lt);
.avatar {
width: 38px;

View File

@ -1,16 +1,16 @@
page-sections{
display: flex;
flex-direction: column;
gap:24px;
.section{
display: flex;
flex-direction: column;
}
h2{
margin-bottom: 8px;
margin-bottom: -24px;
}
h4 {
margin-bottom: -16px;
margin-top: -40px;
margin-bottom: -24px;
}
p+p{
padding-top: 16px;
@ -34,6 +34,14 @@ page-sections{
page-section{
display: block;
max-width: 100%;
.section{
>div{
>*{
margin-block: 24px;
}
}
}
}
>div{
width: 100%;
@ -54,6 +62,7 @@ add-section, page-menu, images-section{
html-section {
margin-block: -18px;
ul{
padding: 0;
margin-bottom: 0;
@ -139,6 +148,25 @@ add-section, publications-list{
}
}
.contact {
h2 {
color: var(--bk44);
font-family: "PT Sans";
font-size: 18px;
font-style: normal;
font-weight: 400;
line-height: 27px;
margin-bottom: 0;
}
p{
margin-top: 0;
}
}
images-section{
display: block;
@ -229,6 +257,9 @@ images-section{
background-color: grey;
}
@media screen and (max-width: 700px){
.carousel {
@ -431,6 +462,7 @@ gellery{
video-section{
display: block;
cursor: pointer;
.video-box{
max-width: 720px;
@ -527,7 +559,7 @@ maps-section{
cards-section{
display: block;
width: 100%;
max-width: 1100px;
width: 1100px;
.cards-add{
direction: ltr;
display: flex;
@ -560,6 +592,7 @@ cards-section{
flex-wrap: wrap;
justify-content: center;
gap: 40px;
width: 100%;
cards-section-item{
flex-basis: 340px;
flex-shrink: 1;
@ -762,6 +795,10 @@ cards-section{
@media screen and (max-width: 1200px) {
cards-section{
width: 100%;
}
.cards-section-slides.items{
margin-left: 0;
}

View File

@ -1,12 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" id="ico">
<g clip-path="url(#clip0_1780_1747)">
<mask id="path-1-inside-1_1780_1747" fill="white">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.73834 7.32943C8.87281 7.71026 8.7905 8.13843 8.50492 8.42402L5.97283 10.9561C7.56763 13.962 10.038 16.4324 13.0439 18.0272L15.576 15.4951C15.8616 15.2095 16.2897 15.1272 16.6706 15.2617C18.0248 15.7398 19.482 16 21 16C21.5401 16 22 16.423 22 16.9631V21.0246C22 21.5568 21.5831 21.9985 21.051 21.9999L21 22C17.5688 22 14.3501 21.0905 11.5717 19.4994C8.63145 17.8156 6.18438 15.3686 4.50061 12.4283C2.90951 9.64994 2 6.43118 2 3L2.00007 2.94904C2.00146 2.41688 2.44319 2 2.97535 2H7.03693C7.57702 2 8 2.45991 8 3C8 4.51796 8.26017 5.97516 8.73834 7.32943Z"/>
</mask>
<path d="M8.50492 8.42402L7.0907 7.0098L8.50492 8.42402ZM8.73834 7.32943L10.6242 6.66354L10.6242 6.66354L8.73834 7.32943ZM5.97283 10.9561L4.55862 9.54189L3.51314 10.5874L4.20609 11.8934L5.97283 10.9561ZM13.0439 18.0272L12.1066 19.7939L13.4126 20.4869L14.4581 19.4414L13.0439 18.0272ZM16.6706 15.2617L17.3365 13.3758H17.3365L16.6706 15.2617ZM21.051 21.9999L21.0536 23.9999L21.0562 23.9999L21.051 21.9999ZM21 22V24L21.0026 24L21 22ZM11.5717 19.4994L12.5656 17.7638L11.5717 19.4994ZM4.50061 12.4283L6.23617 11.4344L4.50061 12.4283ZM2 3L0 2.99738V3H2ZM2.00007 2.94904L7.20024e-05 2.94379L6.85453e-05 2.94642L2.00007 2.94904ZM9.91913 9.83823C10.7901 8.96726 10.9954 7.71482 10.6242 6.66354L6.85245 7.99531C6.7502 7.70571 6.7909 7.3096 7.0907 7.0098L9.91913 9.83823ZM7.38704 12.3703L9.91913 9.83823L7.0907 7.0098L4.55862 9.54189L7.38704 12.3703ZM13.9812 16.2604C11.3284 14.853 9.14701 12.6716 7.73957 10.0188L4.20609 11.8934C5.98825 15.2525 8.74747 18.0118 12.1066 19.7939L13.9812 16.2604ZM14.1618 14.0809L11.6297 16.613L14.4581 19.4414L16.9902 16.9093L14.1618 14.0809ZM17.3365 13.3758C16.2852 13.0046 15.0327 13.2099 14.1618 14.0809L16.9902 16.9093C16.6904 17.2091 16.2943 17.2498 16.0047 17.1475L17.3365 13.3758ZM21 14C19.712 14 18.4798 13.7795 17.3365 13.3758L16.0047 17.1475C17.5699 17.7002 19.2521 18 21 18V14ZM24 16.9631C24 15.2218 22.5455 14 21 14V18C20.5346 18 20 17.6241 20 16.9631H24ZM24 21.0246V16.9631H20V21.0246H24ZM21.0562 23.9999C22.7545 23.9955 24 22.5946 24 21.0246H20C20 20.519 20.4117 20.0016 21.0457 19.9999L21.0562 23.9999ZM21.0026 24L21.0536 23.9999L21.0483 19.9999L20.9974 20L21.0026 24ZM10.5778 21.235C13.6507 22.9947 17.211 24 21 24V20C17.9266 20 15.0494 19.1862 12.5656 17.7638L10.5778 21.235ZM2.76505 13.4222C4.62566 16.6712 7.32875 19.3743 10.5778 21.235L12.5656 17.7638C9.93414 16.2569 7.7431 14.0659 6.23617 11.4344L2.76505 13.4222ZM0 3C0 6.78901 1.00528 10.3493 2.76505 13.4222L6.23617 11.4344C4.81375 8.95059 4 6.07335 4 3H0ZM6.85453e-05 2.94642L1.66893e-06 2.99738L4 3.00262L4.00007 2.95167L6.85453e-05 2.94642ZM2.97535 0C1.40541 0 0.00453222 1.24548 7.37906e-05 2.94379L4.00006 2.95429C3.9984 3.58829 3.48098 4 2.97535 4V0ZM7.03693 0H2.97535V4H7.03693V0ZM10 3C10 1.45446 8.77816 0 7.03693 0V4C6.37587 4 6 3.46537 6 3H10ZM10.6242 6.66354C10.2205 5.52018 10 4.288 10 3H6C6 4.74792 6.2998 6.43013 6.85245 7.99531L10.6242 6.66354Z" fill="currentColor" mask="url(#path-1-inside-1_1780_1747)"/>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" id="ico">
<g clip-path="url(#clip0_2070_27)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4561 20.4434C13.0348 20.261 12.6215 20.0638 12.2168 19.8524C11.9992 19.7388 11.7842 19.6211 11.5717 19.4994C8.63145 17.8156 6.18438 15.3686 4.50061 12.4283C4.37895 12.2159 4.26127 12.0009 4.14769 11.7834C3.93627 11.3786 3.73902 10.9652 3.55658 10.5439C2.55508 8.23138 2 5.68052 2 3L2.00007 2.94904C2.00146 2.41688 2.44319 2 2.97535 2H7.03693C7.57702 2 8 2.45991 8 3C8 4.51796 8.26017 5.97516 8.73834 7.32943C8.87281 7.71026 8.7905 8.13843 8.50492 8.42402L5.97283 10.9561C7.56763 13.962 10.038 16.4324 13.0439 18.0272L15.576 15.4951C15.8616 15.2095 16.2897 15.1272 16.6706 15.2617C18.0248 15.7398 19.482 16 21 16C21.5401 16 22 16.423 22 16.9631V21.0246C22 21.5568 21.5831 21.9985 21.051 21.9999L21 22C18.3195 22 15.7686 21.4449 13.4561 20.4434ZM20 19.9711C18.2445 19.8695 16.5621 19.5018 14.9913 18.9082L16.5661 17.3333C17.6637 17.6725 18.8139 17.8889 20 17.9671V19.9711ZM4.02887 4C4.13053 5.75554 4.49816 7.43792 5.0918 9.0087L6.66665 7.43385C6.32749 6.33634 6.1111 5.18612 6.03288 4H4.02887Z" fill="currentColor"/>
</g>
<defs>
<clipPath id="clip0_1780_1747">
<clipPath id="clip0_2070_27">
<rect width="24" height="24" fill="white"/>
</clipPath>
</defs>

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -2,7 +2,7 @@
<html id="html">
<head>
<base href="/" />
<title>ЧУ СЦ ВНИИГАЗ-Сертификат</title>
<title>НИР</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, shrink-to-fit=no" />
<link rel="icon" type="image/x-icon" href="/assets/images/favicon.png" />
</head>