Andrey
/
object-type-constructor-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

master
Boris Voropaev 2023-09-06 17:33:50 +03:00
parent f855ba69e4
commit affdc6500d
18 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/_modules/auth/login/login.component.html
View File

@ -24,7 +24,7 @@
</div>
</div>
<div class="footer">
<button type="button" class="btn secondary" (click)="signup()">Зарегистрироваться</button>
<!-- <button type="button" class="btn secondary" (click)="signup()">Зарегистрироваться</button> -->
<button [disabled]="loading" type="submit" class="btn">Войти</button>
</div>
</form>

2
src/app/_modules/form-fields/types/document/form-field-document.component.scss
View File

@ -55,7 +55,7 @@
.values {
.item {
background: transparent url('~src/assets/images/icons/document_pdf_60dp.svg') 0 0 no-repeat;
background: transparent url('~src/assets/images/icons/document/document_pdf_60dp.svg') 0 0 no-repeat;
min-height: 60px;
padding-left: 72px;
font-size: 20px;

2
src/app/_modules/layout/footer/footer.component.scss
View File

@ -1,5 +1,5 @@
.footer {
margin-top: 120px;
width: 100%;
padding: 40px 100px;
background-color: var(--blue-3);

2
src/app/_modules/pages/menu/pages-menu.component.html
View File

@ -1,2 +1,2 @@
<pages-menu-item (click)="close()" (onSelected)="itemSelect($event)"
<pages-menu-item (click)="close()" (onSelected)="itemSelect($event)" (mouseleave)="leave()"
[class.hidden]="hidden" [item]="item" *ngFor="let item of visibleItems"></pages-menu-item>

7
src/app/_modules/pages/menu/pages-menu.component.ts
View File

@ -22,8 +22,11 @@ export class PagesMenuComponent {
close() {
this.hidden = true;
setTimeout(() => {this.hidden = false;}, 1);
this.hidden = !this.hidden;
// setTimeout(() => {this.hidden = false;}, 100);
}
leave(){
this.hidden = false;
}
itemSelect(event:any){

6
src/app/_modules/pages/page/page.component.scss
View File

@ -1,8 +1,11 @@
.content {
background-color: #F6F6F6;
padding-bottom: 120px;
.row {
display: block;
width: 100%;
border-bottom: 1px solid #C0C0C0;
background-color: #FFF;
.page-header {
display: flex;
flex-direction: column;
@ -31,7 +34,7 @@
font-size: 76px;
font-style: normal;
font-weight: 700;
line-height: 60px; /* 100% */
line-height:100%;
letter-spacing: 0.76px;
color: white;
}
@ -62,6 +65,7 @@
display: flex;
justify-content: end;
padding: 16px 0;
}
@media screen and (max-width: 1264px) {

8
src/app/_modules/pages/sections/add/add-section.component.scss
View File

@ -17,7 +17,7 @@
display: inline-block;
width: 24px;
height: 24px;
background: var(--white) url("~src/assets/images/icons/add_cirle_24dp.svg") no-repeat center;
background: url("~src/assets/images/icons/add_cirle_24dp.svg") no-repeat center;
content: '';
z-index: 0;
bottom: -2px;
@ -29,7 +29,7 @@
background-image: url("~src/assets/images/icons/add_cirle_active_24dp.svg");
}
&:after{
background-image: url("~src/assets/images/icons//arrow_drop_down_active_24dp.svg");
background-image: url("~src/assets/images/icons/arrow_drop_down_active_24dp.svg");
};
color: var(--blue-3);
}
@ -39,7 +39,7 @@
}
&:after{
transform: rotate(180deg);
background-image: url("~src/assets/images/icons//arrow_drop_down_active_24dp.svg");
background-image: url("~src/assets/images/icons/arrow_drop_down_active_24dp.svg");
};
color: var(--blue-3);
}
@ -47,7 +47,7 @@
display: inline-block;
width: 24px;
height: 24px;
background: var(--white) url("~src/assets/images/icons/arrow_drop_down_24dp.svg") no-repeat center;
background: url("~src/assets/images/icons/arrow_drop_down_24dp.svg") no-repeat center;
content: '';
z-index: 0;
bottom: -2px;

5
src/app/_modules/pages/sections/types/basic/document/document-section.component.scss
View File

@ -1,9 +1,12 @@
:host {
display: block;
background: url('~src/assets/images/icons/document_pdf_60dp.svg') top left no-repeat;
background: url('~src/assets/images/icons/document/document_pdf_60dp.svg') top left no-repeat;
padding-left: 62px;
min-height: 60px;
}
a{
font-size: 20px;
}
.description{
color: #6C6C6C;
}

5
src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html
View File

@ -10,7 +10,10 @@
<page-menu [editMode]="editMode" [section]="member" [modelId]="modelId" [modelType]="modelType"></page-menu>
<ng-template ngFor let-group [ngForOf]="member.groups.data">
<div class="image">
<a [href]="getLink(group)" target="_blank"><img [src]="getImg(group)" /></a>
<a [href]="getLink(group)" target="_blank" *ngIf="getLink(group)">
<img [src]="getImg(group)" />
</a>
<img [src]="getImg(group)" *ngIf="!getLink(group)"/>
</div>
</ng-template>
</div>

7
src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss
View File

@ -36,13 +36,18 @@
}
.image {
img {
img{
width: 273px;
object-fit: cover;
height: 204px;
border-radius: 12px;
border: 1px solid rgba(45, 45, 45, 0.27);
}
a {
img {
border: 2px solid var(--blue-4);
cursor: pointer;
}
}
}
.name {

2
src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss
View File

@ -19,7 +19,7 @@
}
.doc{
display: block;
background: url('~src/assets/images/icons/document_pdf_60dp.svg') top left no-repeat;
background: url('~src/assets/images/icons/document/document_pdf_60dp.svg') top left no-repeat;
padding-left: 62px;
min-height: 60px;
}

2
src/app/_modules/pages/sidebars/item/page-sidebar.component.scss
View File

@ -33,7 +33,7 @@
height: 20px;
margin-right: 8px;
flex-shrink: 0;
background: transparent url("~src/assets/images/icons/document_20dp.svg") center no-repeat;
background: transparent url("~src/assets/images/icons/document/document_20dp.svg") center no-repeat;
content: '';
}
}

2
src/assets/css/basics.scss
View File

@ -97,7 +97,7 @@ a {
height: 20px;
margin-right: 8px;
flex-shrink: 0;
background: transparent url('~src/assets/images/icons/document_20.svg') 50% 50% no-repeat;
background: transparent url('~src/assets/images/icons/document/document_20.svg') 50% 50% no-repeat;
content: '';
}
}

2
src/assets/css/documents-lists.scss
View File

@ -1,5 +1,5 @@
.documents.list.default {
background: transparent url('~src/assets/images/icons/document_pdf_60dp.svg') 0 0 no-repeat;
background: transparent url('~src/assets/images/icons/document/document_pdf_60dp.svg') 0 0 no-repeat;
min-height: 60px;
padding-left: 72px;
font-size: 20px;

16
src/assets/css/main-menu.scss
View File

@ -121,9 +121,11 @@
}
}
}
.grid-menu>pages-menu>pages-menu-item>a.active:not(:hover)>span {
.grid-menu>pages-menu>pages-menu-item>a.active:not(:hover)>span,
.grid-menu>pages-menu>pages-menu-item.hidden>a.active>span {
padding-top: 2px;
border-bottom: 2px solid var(--blue-1) ;
color: var(--blue-1);
}
// level 1
@ -147,7 +149,7 @@
text-align: center;
padding: 0 20px;
margin: 0 -4px;
&:hover {
&:hover:not(.hidden) {
background-color: #004077;
a{
color: #FFF;
@ -166,11 +168,11 @@
line-height: 32px;
&:hover {
text-decoration: none;
color: white;
background: #004077;
}
// &:hover {
// text-decoration: none;
// color: white;
// background: #004077;
// }
}
&>:hover {

0
src/assets/images/icons/document_20.svg → src/assets/images/icons/document/document_20.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 486 B

After

Width:  |  Height:  |  Size: 486 B

0
src/assets/images/icons/document_20dp.svg → src/assets/images/icons/document/document_20dp.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 611 B

0
src/assets/images/icons/document_pdf_60dp.svg → src/assets/images/icons/document/document_pdf_60dp.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB