From 0d194f8a6a38c5491d2ee39d0eddc3f6415503f6 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Tue, 25 Jun 2024 13:03:18 +0300 Subject: [PATCH 1/5] fl merge --- .../src/resources/css/components-lkrp.css | 97 ++++++++++++++++++- frontend/src/resources/css/inbox-lkrp.css | 4 +- frontend/src/resources/img/svg/win-error.svg | 4 + .../src/resources/img/svg/win-success.svg | 4 + 4 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 frontend/src/resources/img/svg/win-error.svg create mode 100644 frontend/src/resources/img/svg/win-success.svg diff --git a/frontend/src/resources/css/components-lkrp.css b/frontend/src/resources/css/components-lkrp.css index 60cf3eb9..7ff3527d 100644 --- a/frontend/src/resources/css/components-lkrp.css +++ b/frontend/src/resources/css/components-lkrp.css @@ -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 { @@ -598,6 +621,15 @@ .modal-dialog { width: calc(100vw - 1rem); + + .horizontal-container { + flex-wrap: wrap !important; + + button-component:not(.info):not(.link), .btn { + width: 100%; + padding: 0; + } + } } } } @@ -635,6 +667,7 @@ } } */ + .webbpm.ervu_lkrp_ul .modal.show { display: flex !important; @@ -692,6 +725,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 +823,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*/ diff --git a/frontend/src/resources/css/inbox-lkrp.css b/frontend/src/resources/css/inbox-lkrp.css index 1f4ea148..2e3140f5 100644 --- a/frontend/src/resources/css/inbox-lkrp.css +++ b/frontend/src/resources/css/inbox-lkrp.css @@ -197,8 +197,8 @@ body { .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%; diff --git a/frontend/src/resources/img/svg/win-error.svg b/frontend/src/resources/img/svg/win-error.svg new file mode 100644 index 00000000..d2c4746f --- /dev/null +++ b/frontend/src/resources/img/svg/win-error.svg @@ -0,0 +1,4 @@ + + + + diff --git a/frontend/src/resources/img/svg/win-success.svg b/frontend/src/resources/img/svg/win-success.svg new file mode 100644 index 00000000..08e946ac --- /dev/null +++ b/frontend/src/resources/img/svg/win-success.svg @@ -0,0 +1,4 @@ + + + + From 001c58410ca561fbaa79560ea788b596672dc966 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Tue, 25 Jun 2024 17:19:45 +0300 Subject: [PATCH 2/5] scroll-dialog update --- .../src/resources/css/components-lkrp.css | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/frontend/src/resources/css/components-lkrp.css b/frontend/src/resources/css/components-lkrp.css index 7ff3527d..494b029d 100644 --- a/frontend/src/resources/css/components-lkrp.css +++ b/frontend/src/resources/css/components-lkrp.css @@ -634,39 +634,22 @@ } } -/* -.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; From 00f5a06d70addef71ff95626806b868c54096a88 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Wed, 26 Jun 2024 11:17:28 +0300 Subject: [PATCH 3/5] okved hover --- frontend/src/resources/css/components-lkrp.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/resources/css/components-lkrp.css b/frontend/src/resources/css/components-lkrp.css index 494b029d..36e6034f 100644 --- a/frontend/src/resources/css/components-lkrp.css +++ b/frontend/src/resources/css/components-lkrp.css @@ -518,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))) {*/ From a543b4a364f7f0326f3bd30704e72aeb6911d28b Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Fri, 28 Jun 2024 11:20:47 +0300 Subject: [PATCH 4/5] SUPPORT-8382 --- frontend/src/resources/css/inbox-lkrp.css | 20 ++++++++++++++----- .../template/app/component/app_header.html | 3 ++- .../template/app/component/log_out.html | 3 ++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/frontend/src/resources/css/inbox-lkrp.css b/frontend/src/resources/css/inbox-lkrp.css index 2e3140f5..5b01207d 100644 --- a/frontend/src/resources/css/inbox-lkrp.css +++ b/frontend/src/resources/css/inbox-lkrp.css @@ -67,6 +67,7 @@ body { } .webbpm.ervu_lkrp_ul .header { + font-family: 'Inter'; min-height: var(--h-header); border: 0; background-color: var(--color-bg-main); @@ -86,7 +87,9 @@ body { color: var(--white); font-family: 'Inter'; } - } + } + .header-menu-left { + } } .header-menu { margin-right: var(--w-screen); @@ -141,11 +144,18 @@ body { left: 16px; width: 24px; height: 24px; - background-image: url(../img/svg/exit.svg); - } + } + &.exit::before { + background-image: url(../img/svg/exit.svg); + } } - } - } + & > a { + &.data::before { + background-image: url(../img/svg/data.svg); + } + } + } + } } .webbpm.ervu_lkrp_ul footer { diff --git a/frontend/src/resources/template/app/component/app_header.html b/frontend/src/resources/template/app/component/app_header.html index 4a109d49..1f88b295 100644 --- a/frontend/src/resources/template/app/component/app_header.html +++ b/frontend/src/resources/template/app/component/app_header.html @@ -1,7 +1,8 @@