Merge branch 'master' of 10.10.31.70:/ervu-lkrp-ul
This commit is contained in:
Булат Хайруллин
commit
83705611a0
7 changed files with 164 additions and 42 deletions
|
|
@ -3,6 +3,10 @@
|
|||
display: flex;
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul hbox.align-center > .horizontal-container {
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul .error {
|
||||
position: relative;
|
||||
display: block;
|
||||
|
|
@ -161,7 +165,7 @@
|
|||
&:not(:disabled):not(.disabled):hover,
|
||||
&:not(:disabled):not(.disabled):active,
|
||||
&:not(:disabled):not(.disabled):focus {
|
||||
color: var(--color-link-hover);
|
||||
color: var(--color-link-hover) !important;
|
||||
}
|
||||
&::before {
|
||||
background-image: url(../img/svg/data.svg);
|
||||
|
|
@ -222,6 +226,22 @@
|
|||
}
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul .loader-group {
|
||||
.loader {
|
||||
font-size: 5px;
|
||||
left: 14px;
|
||||
top: 10px;
|
||||
width: 6px;
|
||||
height: 6px;
|
||||
padding: 0;
|
||||
border-radius: 10px;
|
||||
}
|
||||
.mute {
|
||||
color: var(--color-light);
|
||||
margin-left: 40px;
|
||||
}
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul .link .btn {
|
||||
color: var(--color-link);
|
||||
padding: 0;
|
||||
|
|
@ -230,7 +250,7 @@
|
|||
&:not(:disabled):not(.disabled):hover,
|
||||
&:not(:disabled):not(.disabled):active,
|
||||
&:not(:disabled):not(.disabled):focus {
|
||||
color: var(--color-link-hover);
|
||||
color: var(--color-link-hover) !important;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -298,6 +318,9 @@
|
|||
margin-top: 16px;
|
||||
border-top: 1px solid var(--border-light);
|
||||
}
|
||||
.warning-group ~ *:not([hidden]) {
|
||||
margin-top: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul .filter-block {
|
||||
|
|
@ -495,6 +518,10 @@
|
|||
border: 0;
|
||||
background-color: transparent;
|
||||
}
|
||||
.ag-row.ag-row-hover,
|
||||
.ag-row.ag-row-hover .ag-cell {
|
||||
color: var(--color-text-primary);
|
||||
}
|
||||
}
|
||||
|
||||
/*@media ((max-width: 780px) or ((orientation: landscape) and (max-device-width : 1024px))) {*/
|
||||
|
|
@ -598,43 +625,36 @@
|
|||
|
||||
.modal-dialog {
|
||||
width: calc(100vw - 1rem);
|
||||
|
||||
.horizontal-container {
|
||||
flex-wrap: wrap !important;
|
||||
|
||||
button-component:not(.info):not(.link), .btn {
|
||||
width: 100%;
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
.webbpm.ervu_lkrp_ul .modal-dialog {
|
||||
.webbpm.ervu_lkrp_ul .scroll-dialog .modal-dialog {
|
||||
display: flex;
|
||||
}
|
||||
height: min-content;
|
||||
max-height: calc(100vh - 1.75rem* 2);
|
||||
|
||||
.webbpm.ervu_lkrp_ul .modal.show .modal-content {
|
||||
padding: 0;
|
||||
box-shadow: none;
|
||||
background-color: transparent;
|
||||
|
||||
.modal-header {
|
||||
padding: var(--indent-medium) var(--indent-medium) 16px;
|
||||
border-radius: 4px 4px 0 0;
|
||||
background-color: var(--white);
|
||||
}
|
||||
.modal-body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-y: hidden;
|
||||
|
||||
flex-grow: 0;
|
||||
max-height: max-content;
|
||||
padding: 0 var(--indent-medium) var(--indent-medium);
|
||||
border-radius: 0 0 4px 4px;
|
||||
background-color: var(--white);
|
||||
|
||||
.scroll-block {
|
||||
overflow-y: auto;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
.webbpm.ervu_lkrp_ul .modal.show {
|
||||
display: flex !important;
|
||||
|
||||
|
|
@ -692,6 +712,49 @@
|
|||
margin-top: 8px;
|
||||
}
|
||||
}
|
||||
hyper-link.btn {
|
||||
padding: 0;
|
||||
margin: var(--indent-small) 0 0;
|
||||
background: transparent !important;
|
||||
|
||||
.hyper-link {
|
||||
padding: 13px 38px;
|
||||
border: 1px solid var(--color-link);
|
||||
border-radius: 4px;
|
||||
|
||||
&:hover {
|
||||
border-color: var(--color-link-hover);
|
||||
}
|
||||
}
|
||||
&.btn-main .hyper-link {
|
||||
background: var(--color-link) !important;
|
||||
|
||||
&:hover {
|
||||
background-color: var(--color-link-hover) !important;
|
||||
}
|
||||
a {
|
||||
color: var(--white);
|
||||
}
|
||||
}
|
||||
& + button-component {
|
||||
padding-left: 10px;
|
||||
}
|
||||
}
|
||||
.field-email {
|
||||
margin-top: 16px;
|
||||
|
||||
.form-group {
|
||||
margin-bottom: 0;
|
||||
|
||||
div:last-child {
|
||||
width: 100%;
|
||||
padding: 16px;
|
||||
border-radius: 4px;
|
||||
border: 1px solid var(--border-light);
|
||||
background-color: var(--bg-light);
|
||||
}
|
||||
}
|
||||
}
|
||||
.warning-message {
|
||||
display: block;
|
||||
font-size: var(--size-text-secondary);
|
||||
|
|
@ -747,6 +810,23 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
.webbpm.ervu_lkrp_ul [class*="win-"] .modal-content {
|
||||
&::before {
|
||||
content: "";
|
||||
position: relative;
|
||||
width: 64px;
|
||||
height: 64px;
|
||||
left: calc(50% - 64px / 2);
|
||||
margin-bottom: 24px;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
}
|
||||
.webbpm.ervu_lkrp_ul .win-error .modal-content::before {
|
||||
background-image: url(../img/svg/win-error.svg);
|
||||
}
|
||||
.webbpm.ervu_lkrp_ul .win-success .modal-content::before {
|
||||
background-image: url(../img/svg/win-success.svg);
|
||||
}
|
||||
|
||||
|
||||
/* temp fix + add flex-wrap*/
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
@font-face {
|
||||
font-family: 'InterL';
|
||||
src: url('../fonts/Inter-Light.otf');
|
||||
font-weight: 400;
|
||||
font-style: normal;
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Inter';
|
||||
src: url('../fonts/Inter-Regular.otf');
|
||||
|
|
@ -67,26 +73,29 @@ body {
|
|||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul .header {
|
||||
font-family: 'Inter';
|
||||
min-height: var(--h-header);
|
||||
border: 0;
|
||||
background-color: var(--color-bg-main);
|
||||
|
||||
.header-logo {
|
||||
margin-left: var(--w-screen);
|
||||
|
||||
a {
|
||||
color: var(--white);
|
||||
}
|
||||
.logo a {
|
||||
width: 62px;
|
||||
height: 40px;
|
||||
background: url(../img/svg/logo.svg) no-repeat 0 50%;
|
||||
}
|
||||
.main-page {
|
||||
font-family: 'InterSB';
|
||||
font-family: 'InterSB';
|
||||
margin-left: calc(62px + 16px);
|
||||
a {
|
||||
color: var(--white);
|
||||
font-family: 'Inter';
|
||||
}
|
||||
}
|
||||
}
|
||||
.header-menu-left {
|
||||
font-family: 'InterL';
|
||||
margin-left: 24px;
|
||||
}
|
||||
}
|
||||
.header-menu {
|
||||
margin-right: var(--w-screen);
|
||||
|
|
@ -131,21 +140,33 @@ body {
|
|||
font-family: 'InterB';
|
||||
padding: 8px 16px;
|
||||
}
|
||||
& > button {
|
||||
& > button, & > a {
|
||||
position: relative;
|
||||
display: flex;
|
||||
color: var(--color-text-primary);
|
||||
padding: 8px 16px 8px calc(16px + 32px);
|
||||
|
||||
&:hover,
|
||||
&:focus,
|
||||
&:active {
|
||||
color: var(--color-link-hover);
|
||||
}
|
||||
&::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
left: 16px;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url(../img/svg/exit.svg);
|
||||
}
|
||||
}
|
||||
&.exit::before {
|
||||
background-image: url(../img/svg/exit.svg);
|
||||
}
|
||||
&.data::before {
|
||||
background-image: url(../img/svg/data.svg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul footer {
|
||||
|
|
@ -190,15 +211,26 @@ body {
|
|||
--indent-small: 16px;
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul .header .main-page {
|
||||
display: none;
|
||||
}
|
||||
.webbpm.ervu_lkrp_ul .header .header-logo {
|
||||
.main-page {
|
||||
display: none;
|
||||
}
|
||||
.header-menu-left {
|
||||
margin-left: 40px;
|
||||
a {
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
max-width: 85px;
|
||||
overflow: hidden;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul .loader {
|
||||
font-size: 15px;
|
||||
left: calc(50% - 50px);
|
||||
top: calc(50% - 50px);
|
||||
left: calc(50% - 50px);
|
||||
top: calc(50% - 50px);
|
||||
width: 0.8em;
|
||||
height: 0.8em;
|
||||
border-radius: 50%;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 3.5H17C17.2761 3.5 17.5 3.72386 17.5 4V20C17.5 20.2761 17.2761 20.5 17 20.5H7C6.72386 20.5 6.5 20.2761 6.5 20V12.75H10.442L8.7148 14.4772L9.77546 15.5379L12.7807 12.5327C13.0736 12.2398 13.0736 11.7649 12.7807 11.472L9.77545 8.4668L8.71479 9.52746L10.4373 11.25H6.5V4C6.5 3.72386 6.72386 3.5 7 3.5ZM5 11.25V4C5 2.89543 5.89543 2 7 2H17C18.1046 2 19 2.89543 19 4V20C19 21.1046 18.1046 22 17 22H7C5.89543 22 5 21.1046 5 20V12.75H3V11.25H5Z" fill="#C64E1B"/>
|
||||
<path d="M4 12C4 12.2652 4.10536 12.5196 4.29289 12.7071C4.48043 12.8946 4.73478 13 5 13H12.59L10.29 15.29C10.1963 15.383 10.1219 15.4936 10.0711 15.6154C10.0203 15.7373 9.9942 15.868 9.9942 16C9.9942 16.132 10.0203 16.2627 10.0711 16.3846C10.1219 16.5064 10.1963 16.617 10.29 16.71C10.383 16.8037 10.4936 16.8781 10.6154 16.9289C10.7373 16.9797 10.868 17.0058 11 17.0058C11.132 17.0058 11.2627 16.9797 11.3846 16.9289C11.5064 16.8781 11.617 16.8037 11.71 16.71L15.71 12.71C15.801 12.6149 15.8724 12.5028 15.92 12.38C16.02 12.1365 16.02 11.8635 15.92 11.62C15.8724 11.4972 15.801 11.3851 15.71 11.29L11.71 7.29C11.6168 7.19676 11.5061 7.1228 11.3842 7.07234C11.2624 7.02188 11.1319 6.99591 11 6.99591C10.8681 6.99591 10.7376 7.02188 10.6158 7.07234C10.4939 7.1228 10.3832 7.19676 10.29 7.29C10.1968 7.38324 10.1228 7.49393 10.0723 7.61575C10.0219 7.73757 9.99591 7.86814 9.99591 8C9.99591 8.13186 10.0219 8.26243 10.0723 8.38425C10.1228 8.50607 10.1968 8.61676 10.29 8.71L12.59 11H5C4.73478 11 4.48043 11.1054 4.29289 11.2929C4.10536 11.4804 4 11.7348 4 12ZM17 2H7C6.20435 2 5.44129 2.31607 4.87868 2.87868C4.31607 3.44129 4 4.20435 4 5V8C4 8.26522 4.10536 8.51957 4.29289 8.70711C4.48043 8.89464 4.73478 9 5 9C5.26522 9 5.51957 8.89464 5.70711 8.70711C5.89464 8.51957 6 8.26522 6 8V5C6 4.73478 6.10536 4.48043 6.29289 4.29289C6.48043 4.10536 6.73478 4 7 4H17C17.2652 4 17.5196 4.10536 17.7071 4.29289C17.8946 4.48043 18 4.73478 18 5V19C18 19.2652 17.8946 19.5196 17.7071 19.7071C17.5196 19.8946 17.2652 20 17 20H7C6.73478 20 6.48043 19.8946 6.29289 19.7071C6.10536 19.5196 6 19.2652 6 19V16C6 15.7348 5.89464 15.4804 5.70711 15.2929C5.51957 15.1054 5.26522 15 5 15C4.73478 15 4.48043 15.1054 4.29289 15.2929C4.10536 15.4804 4 15.7348 4 16V19C4 19.7956 4.31607 20.5587 4.87868 21.1213C5.44129 21.6839 6.20435 22 7 22H17C17.7956 22 18.5587 21.6839 19.1213 21.1213C19.6839 20.5587 20 19.7956 20 19V5C20 4.20435 19.6839 3.44129 19.1213 2.87868C18.5587 2.31607 17.7956 2 17 2Z" fill="#C64E1B"/>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 611 B After Width: | Height: | Size: 2 KiB |
4
frontend/src/resources/img/svg/win-error.svg
Normal file
4
frontend/src/resources/img/svg/win-error.svg
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M32 4C16.4 4 4 16.4 4 32C4 47.6 16.4 60 32 60C47.6 60 60 47.6 60 32C60 16.4 47.6 4 32 4ZM32 56C18.8 56 8 45.2 8 32C8 18.8 18.8 8 32 8C45.2 8 56 18.8 56 32C56 45.2 45.2 56 32 56Z" fill="#C64E1B"/>
|
||||
<path d="M44.4002 44.4002C43.5166 45.2839 42.0839 45.2839 41.2002 44.4002L34.8287 38.0287C33.2666 36.4666 30.7339 36.4666 29.1718 38.0287L22.8002 44.4002C21.9166 45.2839 20.4839 45.2839 19.6002 44.4002V44.4002C18.7166 43.5166 18.7166 42.0839 19.6002 41.2002L25.9718 34.8287C27.5339 33.2666 27.5339 30.7339 25.9718 29.1718L19.6002 22.8002C18.7166 21.9166 18.7166 20.4839 19.6002 19.6002V19.6002C20.4839 18.7166 21.9166 18.7166 22.8002 19.6002L29.1718 25.9718C30.7339 27.5339 33.2666 27.5339 34.8287 25.9718L41.2002 19.6002C42.0839 18.7166 43.5166 18.7166 44.4002 19.6002V19.6002C45.2839 20.4839 45.2839 21.9166 44.4002 22.8002L38.0287 29.1718C36.4666 30.7339 36.4666 33.2666 38.0287 34.8287L44.4002 41.2002C45.2839 42.0839 45.2839 43.5166 44.4002 44.4002V44.4002Z" fill="#C64E1B"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
4
frontend/src/resources/img/svg/win-success.svg
Normal file
4
frontend/src/resources/img/svg/win-success.svg
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M40.8807 12.0547C36.5831 10.1398 31.7816 9.66544 27.1923 10.7023C22.6031 11.7392 18.472 14.2318 15.4151 17.8083C12.3582 21.3849 10.5393 25.8538 10.2298 30.5485C9.9202 35.2432 11.1365 39.9123 13.6973 43.8592C16.2581 47.8062 20.0261 50.8197 24.4395 52.4502C28.8529 54.0807 33.675 54.2409 38.1869 52.9069C42.6987 51.5729 46.6585 48.8161 49.4756 45.0478C52.2927 41.2795 53.8162 36.7015 53.8188 31.9965V29.7676C53.8188 28.4288 54.9042 27.3434 56.2431 27.3434C57.582 27.3434 58.6673 28.4288 58.6673 29.7676V31.9979C58.664 37.7484 56.802 43.3451 53.3589 47.9508C49.9158 52.5566 45.0761 55.9259 39.5616 57.5564C34.0471 59.1868 28.1533 58.991 22.7592 56.9982C17.3651 55.0054 12.7597 51.3222 9.62988 46.4982C6.50003 41.6741 5.01343 35.9675 5.39179 30.2295C5.77015 24.4915 7.9932 19.0295 11.7294 14.6582C15.4656 10.2868 20.5147 7.24033 26.1238 5.97304C31.7329 4.70574 37.6014 5.28554 42.854 7.62598C44.077 8.1709 44.6266 9.60406 44.0817 10.827C43.5368 12.05 42.1036 12.5996 40.8807 12.0547Z" fill="#C64E1B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M57.9555 10.8899C58.9027 11.8361 58.9034 13.371 57.9572 14.3182L33.7148 38.5849C33.2602 39.0399 32.6435 39.2957 32.0003 39.2958C31.3572 39.296 30.7403 39.0406 30.2855 38.5858L23.0128 31.313C22.0661 30.3663 22.0661 28.8314 23.0128 27.8846C23.9595 26.9379 25.4945 26.9379 26.4412 27.8846L31.9988 33.4423L54.5271 10.8916C55.4733 9.94437 57.0083 9.9436 57.9555 10.8899Z" fill="#C64E1B"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
|
|
@ -1,7 +1,8 @@
|
|||
<nav class="header" *ngIf="currentSession | async as session" id="webbpm-header">
|
||||
<div class="header-logo">
|
||||
<div class="logo"><a routerLink="/"></a></div>
|
||||
<div class="main-page"><a routerLink="/">Главная</a></div>
|
||||
<div class="main-page"><a routerLink="/">Главная</a></div>
|
||||
<div class="header-menu-left"><a routerLink="/filesentlog">Журнал взаимодействий</a></div>
|
||||
</div>
|
||||
<div class="header-menu">
|
||||
<!--
|
||||
|
|
|
|||
|
|
@ -6,5 +6,6 @@
|
|||
</div>
|
||||
-->
|
||||
<div class="user-department">{{getOrgUnitName()}}</div>
|
||||
<button ngbDropdownItem *ngIf="isLogoutButtonVisible()" (click)="logout()">Выйти</button>
|
||||
<a routerLink="/mydata" class="data">Данные организации</a>
|
||||
<button ngbDropdownItem class="exit" *ngIf="isLogoutButtonVisible()" (click)="logout()">Выйти</button>
|
||||
</div>
|
||||
Loading…
Add table
Add a link
Reference in a new issue