jumbotron & greed

master
Boris Voropaev 2023-11-30 10:57:18 +03:00
parent c4b348f4a5
commit c29f58e014
9 changed files with 31 additions and 25 deletions

View File

@ -1,8 +0,0 @@
:host(pages-menu){
display:flex;
flex-direction: column;
padding-left: 0;
}
pages-menu{
padding-left: 24px;
}

View File

@ -7,9 +7,6 @@
</div>
<div class="form" *ngIf="!sent">
<object-form [formGroup]="formGroup" [type]="objectType?.name" target="object"></object-form>
<!-- <span style="white-space: pre-wrap;">
{{formGroup|json}}
</span> -->
<div class="row">
<button [disabled]="loading" class="btn">Отправить</button>
</div>

View File

@ -21,7 +21,7 @@
<img src="assets/images/icons/zen_black_28x28.svg" alt="">
</a>
</div>
<locale></locale>
<!-- <locale></locale> -->
</div>
<div class="menu">
<div>

View File

@ -2,7 +2,6 @@
<div class="jumbotron-content layout-corral">
<header-user-bar></header-user-bar>
<h1 [ngStyle]="h1Style">{{name}}</h1>
<div></div>
</div>
</div>
<div class="space jumbotron-edit-field" *ngIf="editable">

View File

@ -59,7 +59,7 @@ export class JumbotronComponent {
}
get bgStyle(){
let height = 50;
let height = 150;
let pictURL:string;
if (this.contentPage){
height = 150;
@ -77,7 +77,8 @@ export class JumbotronComponent {
color: this.contentPage?.picture?'var(--white)':'var(--second-act)',
'align-self': this.mainPage?'center':'left',
'text-align': this.mainPage?'center':'left',
'width': this.mainPage?'900px':'100%'
'width': this.mainPage?'900px':null,
'border-bottom':this.mainPage?null:'12px solid #2EB2E8'
}
}

View File

@ -1,8 +1,8 @@
.dropdown {
position: absolute;
width: 250px;
left: 48px;
top: 32px;
right: 24px;
top: 62px;
z-index: 10;
z-index: 1000;

View File

@ -28,17 +28,20 @@ jumbotron{
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
justify-content: center;
align-items: flex-start;
position: relative;
.user-bar{
justify-content: flex-end;
}
header-user-bar{
margin-top: $pl;
align-self: flex-end;
top: $pl;
right: 40px;
position: absolute;
}
h1{
margin-top: calc( 0px - $pl );
width: 100%;
margin: 0;
padding: $ps 0;
}
}
}
@ -65,6 +68,8 @@ jumbotron{
.content-grid{
display: flex;
justify-content: center;
margin: 40px 0 120px;
left-content{
display: none;
}

View File

@ -1,3 +1,14 @@
pages-menu{
display:flex;
flex-direction: column;
padding-left: 0;
}
pages-menu{
padding-left: 24px;
}
header{
background-color: var(--white);
@ -53,6 +64,7 @@ header{
width: 100%;
justify-content: center;
padding-bottom: 36px;
z-index: 1;
}
@ -134,10 +146,12 @@ slider-menu{
}
}
right-content{
padding-top: 40px;
drop-down{
display: none;
}
pages-menu{
padding-left: 0;
}
.item{
min-height: 0;
padding: 10px 20px;

View File

@ -1,6 +1,4 @@
page-sections{
margin-top: 40px;
margin-bottom: 120px;
display: flex;
flex-direction: column;
gap:24px;