Merge remote-tracking branch 'origin/develop' into ERVU-119

This commit is contained in:
m.epshtein 2024-09-03 12:17:39 +03:00
commit a56ec06247
2 changed files with 724 additions and 819 deletions

File diff suppressed because it is too large Load diff

View file

@ -69,11 +69,9 @@ body.webbpm.ervu_lkrp_ul {
.webbpm.ervu_lkrp_ul a {
color: var(--color-link);
text-decoration: none;
&:hover,
&:focus,
&:active {
color: var(--color-link-hover);
}
}
.webbpm.ervu_lkrp_ul a:is(:hover, :focus, :active) {
color: var(--color-link-hover);
}
.webbpm.ervu_lkrp_ul .header {
@ -81,96 +79,89 @@ body.webbpm.ervu_lkrp_ul {
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';
margin-left: calc(62px + 16px);
}
.header-menu-left {
font-family: 'InterL';
margin-left: 24px;
}
}
.header-menu {
margin-right: var(--w-screen);
.logout.show {
max-width: max-content;
}
.user-info {
flex-direction: row;
align-items: center;
color: var(--white);
height: 24px;
padding: 0;
border: 0;
outline: none;
cursor: pointer;
&.dropdown-toggle::before {
display: inline-block;
content: "";
width: 24px;
height: 24px;
margin-right: 8px;
background-image: url(../img/svg/user-wt.svg);
}
&.dropdown-toggle::after {
width: 24px;
height: 24px;
border: 0;
background-image: url(../img/svg/arrow-down-wt.svg);
}
}
.dropdown-menu.show {
top: var(--h-header) !important;
padding: 8px 0;
border-radius: 4px;
background-color: var(--white);
box-shadow: 0 6px 16px 0 rgba(230, 230, 230, 0.11), 0 1px 4px 0 #f3f3f3;
.user-department {
color: var(--color-text-primary);
font-family: 'InterB';
padding: 8px 16px;
}
& > 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;
}
&.exit::before {
background-image: url(../img/svg/exit.svg);
}
&.data::before {
background-image: url(../img/svg/data.svg);
}
}
}
}
}
.webbpm.ervu_lkrp_ul .header .header-logo {
margin-left: var(--w-screen);
}
.webbpm.ervu_lkrp_ul .header .header-logo a {
color: var(--white);
}
.webbpm.ervu_lkrp_ul .header .header-logo .logo a {
width: 62px;
height: 40px;
background: url(../img/svg/logo.svg) no-repeat 0 50%;
}
.webbpm.ervu_lkrp_ul .header .header-logo .main-page {
font-family: 'InterSB';
margin-left: calc(62px + 16px);
}
.webbpm.ervu_lkrp_ul .header .header-logo .header-menu-left {
font-family: 'InterL';
margin-left: 24px;
}
.webbpm.ervu_lkrp_ul .header .header-menu {
margin-right: var(--w-screen);
}
.webbpm.ervu_lkrp_ul .header .header-menu .logout.show {
max-width: max-content;
}
.webbpm.ervu_lkrp_ul .header .header-menu .user-info {
flex-direction: row;
align-items: center;
color: var(--white);
height: 24px;
padding: 0;
border: 0;
outline: none;
cursor: pointer;
}
.webbpm.ervu_lkrp_ul .header .header-menu .user-info.dropdown-toggle::before {
display: inline-block;
content: "";
width: 24px;
height: 24px;
margin-right: 8px;
background-image: url(../img/svg/user-wt.svg);
}
.webbpm.ervu_lkrp_ul .header .header-menu .user-info.dropdown-toggle::after {
width: 24px;
height: 24px;
border: 0;
background-image: url(../img/svg/arrow-down-wt.svg);
}
.webbpm.ervu_lkrp_ul .header .header-menu .dropdown-menu.show {
top: var(--h-header) !important;
padding: 8px 0;
border-radius: 4px;
background-color: var(--white);
box-shadow: 0 6px 16px 0 rgba(230, 230, 230, 0.11), 0 1px 4px 0 #f3f3f3;
}
.webbpm.ervu_lkrp_ul .header .header-menu .dropdown-menu.show .user-department {
color: var(--color-text-primary);
font-family: 'InterB';
padding: 8px 16px;
}
.webbpm.ervu_lkrp_ul .header .header-menu .dropdown-menu.show > :is(button, a) {
position: relative;
display: flex;
color: var(--color-text-primary);
padding: 8px 16px 8px calc(16px + 32px);
}
.webbpm.ervu_lkrp_ul .header .header-menu .dropdown-menu.show > :is(button, a):is(:hover, :focus, :active) {
color: var(--color-link-hover);
}
.webbpm.ervu_lkrp_ul .header .header-menu .dropdown-menu.show > :is(button, a)::before {
content: "";
position: absolute;
left: 16px;
width: 24px;
height: 24px;
}
.webbpm.ervu_lkrp_ul .header .header-menu .dropdown-menu.show > :is(button, a).exit::before {
background-image: url(../img/svg/exit.svg);
}
.webbpm.ervu_lkrp_ul .header .header-menu .dropdown-menu.show > :is(button, a).data::before {
background-image: url(../img/svg/data.svg);
}
.webbpm.ervu_lkrp_ul footer {
@ -182,11 +173,10 @@ body.webbpm.ervu_lkrp_ul {
.webbpm.ervu_lkrp_ul .container {
padding-top: var(--h-header);
bottom: var(--h-footer);
.container-inside {
font-family: 'Inter';
padding: var(--indent-huge) var(--w-screen);
}
}
.webbpm.ervu_lkrp_ul .container-inside {
font-family: 'Inter';
padding: var(--indent-huge) var(--w-screen);
}
/*@media ((max-width: 780px) or ((orientation: landscape) and (max-device-width : 1024px))) {*/
@ -215,20 +205,18 @@ body.webbpm.ervu_lkrp_ul {
--indent-small: 16px;
}
.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 .header .header-logo .main-page {
display: none;
}
.webbpm.ervu_lkrp_ul .header .header-logo .header-menu-left {
margin-left: 40px;
}
.webbpm.ervu_lkrp_ul .header .header-logo .header-menu-left a {
white-space: nowrap;
text-overflow: ellipsis;
max-width: 85px;
overflow: hidden;
}
}
/*----------------- Login ---------------- */
@ -242,76 +230,72 @@ body.webbpm.ervu_lkrp_ul {
border-radius: 8px;
background-color: var(--white);
box-shadow: var(--bg-shadow);
}
h1, h2 {
color: var(--color-form);
font-family: 'InterB';
font-size: var(--size-text-subtitle);
text-align: left;
margin-bottom: 0;
}
.logo {
position: relative;
display: flex;
justify-content: center;
height: 76px;
padding: 0 0 0 128px;
margin-bottom: 32px;
&::after {
position: absolute;
content: "";
left: 0;
width: 112px;
height: 72px;
background-image: url(../img/svg/form-logo.svg);
}
}
.row {
position: relative;
margin-bottom: 0;
& + .row {
margin-top: 20px;
}
}
input {
height: 56px;
padding-top: 20px;
padding-left: 16px;
border: 0;
border-radius: 8px;
background-color: var(--bg-light);
&[type="password"] {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
& ~ .input-group-append > .input-group-text {
border: 0;
background-color: var(--bg-light);
}
}
& + label {
position: absolute;
top: 16px;
left: 16px;
pointer-events: none;
transition: all 200ms;
}
&:focus + label,
&:not(:placeholder-shown) + label {
top: 4px;
font-size: var(--indent-extra-mini);
z-index: 20;
}
}
.msg-text {
margin-top: 12px;
}
.btn-box {
margin-top: 32px;
}
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) :is(h1, h2) {
color: var(--color-form);
font-family: 'InterB';
font-size: var(--size-text-subtitle);
text-align: left;
margin-bottom: 0;
}
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) .logo {
position: relative;
display: flex;
justify-content: center;
height: 76px;
padding: 0 0 0 128px;
margin-bottom: 32px;
}
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) .logo::after {
position: absolute;
content: "";
left: 0;
width: 112px;
height: 72px;
background-image: url(../img/svg/form-logo.svg);
}
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) .row {
position: relative;
margin-bottom: 0;
}
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) .row + .row {
margin-top: 20px;
}
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) input {
height: 56px;
padding-top: 20px;
padding-left: 16px;
border: 0;
border-radius: 8px;
background-color: var(--bg-light);
}
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) input[type="password"] {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) input[type="password"] ~ .input-group-append > .input-group-text {
border: 0;
background-color: var(--bg-light);
}
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) input + label {
position: absolute;
top: 16px;
left: 16px;
pointer-events: none;
transition: all 200ms;
}
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) input:focus + label,
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) input:not(:placeholder-shown) + label {
top: 4px;
font-size: var(--indent-extra-mini);
z-index: 20;
}
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) .msg-text {
margin-top: 12px;
}
.webbpm.ervu_lkrp_ul :is(.form-signin, .form-signup, .confirm) .btn-box {
margin-top: 32px;
}
.webbpm.ervu_lkrp_ul .form-signin .row.registration > * + *,