From 19dbe9cbdc521ab9a5fe5d2b17b3bc4478998b50 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 24 Jun 2024 12:13:30 +0300 Subject: [PATCH 1/7] filter --- .../src/resources/css/components-lkrp.css | 25 +++++++++++++++++-- frontend/src/resources/css/inbox-lkrp.css | 3 ++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/frontend/src/resources/css/components-lkrp.css b/frontend/src/resources/css/components-lkrp.css index e55d82b2..15bff586 100644 --- a/frontend/src/resources/css/components-lkrp.css +++ b/frontend/src/resources/css/components-lkrp.css @@ -301,6 +301,21 @@ } } +.webbpm.ervu_lkrp_ul .filter-block { + color: var(--color-light); + font-size: var(--size-text-secondary); + + .link .btn { + color: var(--color-light) !important; + text-decoration: underline; + margin-top: -2px; + + &:hover { + text-decoration: none; + } + } +} + .webbpm.ervu_lkrp_ul :is(.fieldset, .warning-group) hbox:not(.subtitle) > .horizontal-container { flex-wrap: wrap; } @@ -375,6 +390,10 @@ border-width: 1px 0 0; } +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-cell-focus:not(.ag-cell-range-selected):focus-within { + border-color: var(--color-link); +} + .webbpm.ervu_lkrp_ul .okved-list { height: auto; @@ -574,7 +593,6 @@ } hyper-link { padding-top: 0; - margin-top: 8px; border: 0; .link { @@ -582,7 +600,10 @@ padding-left: 0; background: none; } - } + } + & > div > * + *:not([hidden]) { + margin-top: 8px; + } } .warning-message { display: block; diff --git a/frontend/src/resources/css/inbox-lkrp.css b/frontend/src/resources/css/inbox-lkrp.css index 2721297e..1f4ea148 100644 --- a/frontend/src/resources/css/inbox-lkrp.css +++ b/frontend/src/resources/css/inbox-lkrp.css @@ -35,6 +35,7 @@ body { --color-link: #c64e1b; --color-link-hover: #fa773f; --color-bg-main: #223d36; + --color-light: #868b87; --bg-light: #fafafa; --bg-warn: #ffdcc6; --border-light: #d2d2d2; @@ -197,7 +198,7 @@ body { .webbpm.ervu_lkrp_ul .loader { font-size: 15px; left: calc(50% - 50px); - top: (50% - 50px); + top: calc(50% - 50px); width: 0.8em; height: 0.8em; border-radius: 50%; From 5da78f5dc3872126a1fa075572ec0f00cdd51c60 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 24 Jun 2024 12:25:23 +0300 Subject: [PATCH 2/7] modal btn-main --- frontend/src/resources/css/components-lkrp.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/resources/css/components-lkrp.css b/frontend/src/resources/css/components-lkrp.css index 15bff586..e9240a14 100644 --- a/frontend/src/resources/css/components-lkrp.css +++ b/frontend/src/resources/css/components-lkrp.css @@ -201,8 +201,8 @@ } } -.webbpm.ervu_lkrp_ul :is(.warning-group, .modal.show) button-component:not(.info):not(.link), -.webbpm.ervu_lkrp_ul .warning-group static-route-navigation-button:not(.info):not(.link) { +.webbpm.ervu_lkrp_ul :is(.warning-group, .modal.show) button-component:not(.info):not(.link):not(.btn-main), +.webbpm.ervu_lkrp_ul .warning-group static-route-navigation-button:not(.info):not(.link):not(.btn-main) { padding-top: 0 !important; margin-top: 16px; border-top: 0 !important; @@ -378,6 +378,7 @@ .webbpm.ervu_lkrp_ul ag-grid-angular .ag-row.ag-row-hover, .webbpm.ervu_lkrp_ul ag-grid-angular .ag-row.ag-row-hover .ag-cell { color: var(--color-link); + border-radius: 0; background-color: transparent !important; } From bf12f0fcb8a11fe1c5a05304773d896f7f82a8b9 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 24 Jun 2024 15:44:36 +0300 Subject: [PATCH 3/7] filter icons hide --- frontend/src/resources/css/components-lkrp.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/frontend/src/resources/css/components-lkrp.css b/frontend/src/resources/css/components-lkrp.css index e9240a14..b030897a 100644 --- a/frontend/src/resources/css/components-lkrp.css +++ b/frontend/src/resources/css/components-lkrp.css @@ -375,6 +375,20 @@ border-radius: 4px; } +.webbpm.ervu_lkrp_ul ag-grid-angular .grid-setting-icon, +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-cell.ag-header-active .ag-header-cell-menu-button, +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-cell .ag-header-icon .ag-icon, +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-row-column-filter :is(.ag-header-cell, .ag-header-group-cell)::after, +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter .ag-filter-condition, +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter .ag-filter-condition + * { + display: none !important; +} + +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-row:not(:first-child) .ag-header-cell, +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-row:not(:first-child) .ag-header-group-cell.ag-header-group-cell-with-group { + border-top: 0; +} + .webbpm.ervu_lkrp_ul ag-grid-angular .ag-row.ag-row-hover, .webbpm.ervu_lkrp_ul ag-grid-angular .ag-row.ag-row-hover .ag-cell { color: var(--color-link); From 1ab4dea5d323f089843c82c50a3a8c4bf089f475 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 24 Jun 2024 16:34:50 +0300 Subject: [PATCH 4/7] filter-select --- .../src/resources/css/components-lkrp.css | 44 ++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/frontend/src/resources/css/components-lkrp.css b/frontend/src/resources/css/components-lkrp.css index b030897a..ac97bcfe 100644 --- a/frontend/src/resources/css/components-lkrp.css +++ b/frontend/src/resources/css/components-lkrp.css @@ -122,7 +122,7 @@ border: 0; border-radius: 4px; background: var(--color-link); - box-shadow: none; + box-shadow: none !important; &:not(:disabled):not(.disabled):hover, &:not(:disabled):not(.disabled):active, @@ -370,6 +370,11 @@ margin-top: var(--indent-medium); } +.webbpm.ervu_lkrp_ul input[type="text"] { + border-radius: 4px; + box-shadow: none; +} + .webbpm.ervu_lkrp_ul ag-grid-angular .ag-header { border: 1px solid var(--border-light); border-radius: 4px; @@ -389,6 +394,43 @@ border-top: 0; } +.webbpm.ervu_lkrp_ul ag-grid-angular { + font-family: 'Inter'; +} + +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter-select { + font-size: var(--size-text-secondary); + + .ag-picker-field-wrapper { + font-family: 'InterSB'; + border: 0; + + .ag-picker-field-display { + margin: 0; + } + } + .ag-icon-small-down::before { + content: ""; + background-image: url(../img/svg/arrow-left.svg); + transform: rotate(-45deg); + } +} + +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter-body { + margin-bottom: 0; + + input { + color: var(--color-light); + font-size: var(--size-text-secondary); + min-height: auto; + padding: 6px 12px !important; + } +} + +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-row { + font-family: 'InterSB'; +} + .webbpm.ervu_lkrp_ul ag-grid-angular .ag-row.ag-row-hover, .webbpm.ervu_lkrp_ul ag-grid-angular .ag-row.ag-row-hover .ag-cell { color: var(--color-link); From 168f7ea4caeeacf648e892faea0efddae6e0e9c3 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 24 Jun 2024 17:16:30 +0300 Subject: [PATCH 5/7] ag-grid-angular .ag-popup --- .../src/resources/css/components-lkrp.css | 43 +++++++++++++++---- frontend/src/resources/img/svg/calendar.svg | 3 ++ frontend/src/resources/img/svg/filter.svg | 3 ++ 3 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 frontend/src/resources/img/svg/calendar.svg create mode 100644 frontend/src/resources/img/svg/filter.svg diff --git a/frontend/src/resources/css/components-lkrp.css b/frontend/src/resources/css/components-lkrp.css index ac97bcfe..4415d559 100644 --- a/frontend/src/resources/css/components-lkrp.css +++ b/frontend/src/resources/css/components-lkrp.css @@ -122,7 +122,6 @@ border: 0; border-radius: 4px; background: var(--color-link); - box-shadow: none !important; &:not(:disabled):not(.disabled):hover, &:not(:disabled):not(.disabled):active, @@ -370,9 +369,13 @@ margin-top: var(--indent-medium); } -.webbpm.ervu_lkrp_ul input[type="text"] { +.webbpm.ervu_lkrp_ul input, +.webbpm.ervu_lkrp_ul button { border-radius: 4px; - box-shadow: none; + box-shadow: none !important; +} +.webbpm.ervu_lkrp_ul input:focus { + border-color: var(--color-link); } .webbpm.ervu_lkrp_ul ag-grid-angular .ag-header { @@ -385,7 +388,7 @@ .webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-cell .ag-header-icon .ag-icon, .webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-row-column-filter :is(.ag-header-cell, .ag-header-group-cell)::after, .webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter .ag-filter-condition, -.webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter .ag-filter-condition + * { +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter .ag-filter-condition ~ * { display: none !important; } @@ -398,22 +401,41 @@ font-family: 'Inter'; } +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-popup .ag-select-list-item { + font-size: var(--size-text-secondary); +} + +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-icon { + width: 24px; + height: 24px; + + &::before { + position: absolute; + content: ""; + width: 24px; + height: 24px; + transform: rotate(-90deg); + } + &.ag-icon-small-down::before { + background-image: url(../img/svg/arrow-left.svg); + } + &.ag-icon-filter::before { + background-image: url(../img/svg/filter.svg); + } +} + .webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter-select { font-size: var(--size-text-secondary); .ag-picker-field-wrapper { font-family: 'InterSB'; border: 0; + box-shadow: none !important; .ag-picker-field-display { margin: 0; } } - .ag-icon-small-down::before { - content: ""; - background-image: url(../img/svg/arrow-left.svg); - transform: rotate(-45deg); - } } .webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter-body { @@ -426,6 +448,9 @@ padding: 6px 12px !important; } } +.webbpm.ervu_lkrp_ul ag-grid-angular .ag-floating-filter-body input { + padding: 4px 8px !important; +} .webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-row { font-family: 'InterSB'; diff --git a/frontend/src/resources/img/svg/calendar.svg b/frontend/src/resources/img/svg/calendar.svg new file mode 100644 index 00000000..59660353 --- /dev/null +++ b/frontend/src/resources/img/svg/calendar.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/resources/img/svg/filter.svg b/frontend/src/resources/img/svg/filter.svg new file mode 100644 index 00000000..7c8757e8 --- /dev/null +++ b/frontend/src/resources/img/svg/filter.svg @@ -0,0 +1,3 @@ + + + From 4324e064d607f038dd5ae69eb5ed9047d5cfecb9 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 24 Jun 2024 17:36:57 +0300 Subject: [PATCH 6/7] //fix icons --- frontend/src/resources/css/components-lkrp.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/src/resources/css/components-lkrp.css b/frontend/src/resources/css/components-lkrp.css index 4415d559..3009370b 100644 --- a/frontend/src/resources/css/components-lkrp.css +++ b/frontend/src/resources/css/components-lkrp.css @@ -406,6 +406,7 @@ } .webbpm.ervu_lkrp_ul ag-grid-angular .ag-icon { + position: relative; width: 24px; height: 24px; @@ -414,13 +415,16 @@ content: ""; width: 24px; height: 24px; - transform: rotate(-90deg); + left: 0; + top: 0; } &.ag-icon-small-down::before { background-image: url(../img/svg/arrow-left.svg); + transform: rotate(-90deg); } &.ag-icon-filter::before { background-image: url(../img/svg/filter.svg); + top: -4px; } } @@ -448,9 +452,6 @@ padding: 6px 12px !important; } } -.webbpm.ervu_lkrp_ul ag-grid-angular .ag-floating-filter-body input { - padding: 4px 8px !important; -} .webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-row { font-family: 'InterSB'; From d47f0adeebfb3b389af04a4dafd98644aa953624 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 24 Jun 2024 19:02:10 +0300 Subject: [PATCH 7/7] // --- frontend/src/resources/css/components-lkrp.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/src/resources/css/components-lkrp.css b/frontend/src/resources/css/components-lkrp.css index 3009370b..60cf3eb9 100644 --- a/frontend/src/resources/css/components-lkrp.css +++ b/frontend/src/resources/css/components-lkrp.css @@ -406,17 +406,20 @@ } .webbpm.ervu_lkrp_ul ag-grid-angular .ag-icon { + display: flex; + align-items: center; + justify-content: center; position: relative; width: 24px; height: 24px; - &::before { + &:is(.ag-icon-small-down, .ag-icon-filter)::before { position: absolute; content: ""; width: 24px; height: 24px; - left: 0; top: 0; + left: 0; } &.ag-icon-small-down::before { background-image: url(../img/svg/arrow-left.svg); @@ -424,7 +427,8 @@ } &.ag-icon-filter::before { background-image: url(../img/svg/filter.svg); - top: -4px; + top: -4px; + left: -4px; } }