From c05bbb159ba70c0bc40d84ebe53490063a7868a8 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 29 May 2025 09:16:38 +0300 Subject: [PATCH 01/34] test scale --- frontend/index.html | 2 +- frontend/index.webpack.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index 22b58aa5..8a20bd6a 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -3,7 +3,7 @@ Дашборд - + diff --git a/frontend/index.webpack.html b/frontend/index.webpack.html index e9aa8fe0..62bb270e 100644 --- a/frontend/index.webpack.html +++ b/frontend/index.webpack.html @@ -3,7 +3,7 @@ Дашборд - + From 5e057b1b8d4bbf1c8b65feb83483b5efc35ffde5 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 29 May 2025 10:39:37 +0300 Subject: [PATCH 02/34] 0.1 --- frontend/index.html | 2 +- frontend/index.webpack.html | 2 +- .../resources/css/components-dashboard.css | 20 +++++++++++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index 8a20bd6a..22b58aa5 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -3,7 +3,7 @@ Дашборд - + diff --git a/frontend/index.webpack.html b/frontend/index.webpack.html index 62bb270e..e9aa8fe0 100644 --- a/frontend/index.webpack.html +++ b/frontend/index.webpack.html @@ -3,7 +3,7 @@ Дашборд - + diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 762cc6b8..00b8bb46 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -17,6 +17,7 @@ font-size: var(--size-text-primary); font-family: 'GilroyM'; color: var(--black); + padding: var(--indent-mini) var(--indent-xbase); border-radius: 100px; border: 0; background-color: var(--color-text-secondary); @@ -135,7 +136,7 @@ font-size: var(--size-text-primary); color: var(--color-text-primary); line-height: 1.3; - padding: var(--indent-mini) var(--indent-xlarge) var(--indent-mini) var(--indent-xbase); + padding-right: var(--indent-xlarge); margin-bottom: 0; border-radius: 100px; border: 0; @@ -441,7 +442,6 @@ color: var(--black); font-family: 'GilroyM'; font-size: var(--size-text-primary); - padding-left: var(--indent-xbase); padding-right: var(--indent-xlarge); margin-bottom: 0; border: 0; @@ -1055,6 +1055,9 @@ .webbpm.ervu_dashboard .main-num-group > div .form-group { margin-bottom: 0; } +.webbpm.ervu_dashboard :is(.pers-group, .main-num-group) text label { + width: auto; +} .webbpm.ervu_dashboard .parent-block { padding: var(--indent-mini); @@ -1907,6 +1910,19 @@ } /* end - Special pages */ + + + +.webbpm.ervu_dashboard .wrapper { + width: calc(100% - 340px); +} +@media (max-width: 1279) { + +} + + + + @media ((max-width: 780px) or (orientation: portrait)) { .webbpm.ervu_dashboard .header-logo .logo-title, .webbpm.ervu_dashboard .header-menu .update-data { From 0fcd3a405b6a5fe83b9223021546e308096d9872 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 29 May 2025 11:56:06 +0300 Subject: [PATCH 03/34] v0.2 --- frontend/src/resources/css/components-dashboard.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 00b8bb46..5de1cfe5 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -22,6 +22,13 @@ border: 0; background-color: var(--color-text-secondary); } +.webbpm.ervu_dashboard .fa-calendar::before { + font-size: var(--size-text-secondary); +} + +.webbpm.ervu_dashboard .form-group { + margin-bottom: var(--indent-base); +} .webbpm.ervu_dashboard check-box label { width: min-content !important; From 66c3d7ddf7d2dc9c10f52f496d5916f07b247713 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 29 May 2025 13:01:46 +0300 Subject: [PATCH 04/34] v0.3 --- frontend/src/resources/css/components-dashboard.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 5de1cfe5..cf8d76c0 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -22,10 +22,13 @@ border: 0; background-color: var(--color-text-secondary); } -.webbpm.ervu_dashboard .fa-calendar::before { +.webbpm.ervu_dashboard :is(.fa, .fa-calendar::before) { font-size: var(--size-text-secondary); } +.webbpm.ervu_dashboard :is(.form-control, .input-group-addon) { + height: var(--indent-huge); +} .webbpm.ervu_dashboard .form-group { margin-bottom: var(--indent-base); } @@ -1908,8 +1911,7 @@ position: absolute; top: 0; bottom: 0; - overflow-y: auto; - overflow-x: hidden; + overflow: auto; } .webbpm.ervu_dashboard.citizencard .pers-block .nav-tabs ~ .tab-active, .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs ~ .tab-active { From 4eeadce92a762dd702ef7a06aa92285035aba3d3 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 29 May 2025 14:36:13 +0300 Subject: [PATCH 05/34] v0.4 --- .../src/resources/css/components-dashboard.css | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index cf8d76c0..228398f8 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -26,8 +26,9 @@ font-size: var(--size-text-secondary); } -.webbpm.ervu_dashboard :is(.form-control, .input-group-addon) { +.webbpm.ervu_dashboard :is(input.form-control, .input-group-addon) { height: var(--indent-huge); + padding: var(--indent-mini) var(--indent-xbase); } .webbpm.ervu_dashboard .form-group { margin-bottom: var(--indent-base); @@ -94,6 +95,7 @@ } .webbpm.ervu_dashboard .radio-horizontal input[type="radio"] + span { margin-left: var(--indent-base); + font-size: var(--size-text-primary); } .webbpm.ervu_dashboard .radio-horizontal .form-radio-group + .form-radio-group { margin-left: var(--indent-xlarge); @@ -310,6 +312,7 @@ } .webbpm.ervu_dashboard dropdown-tree-view :is(.row-item, .treeview-text) { color: var(--color-text-primary); + font-size: var(--size-text-primary); padding: var(--indent-base) var(--indent-xbase); border-bottom: 1px solid var(--color-primary-5); } @@ -527,6 +530,11 @@ .webbpm.ervu_dashboard .selectize-control .selectize-input::before { display: none; } +.webbpm.ervu_dashboard .selectize-dropdown, +.webbpm.ervu_dashboard .selectize-input { + line-height: normal; + height: var(--indent-huge); +} .webbpm.ervu_dashboard .selectize-dropdown { height: fit-content; @@ -1217,7 +1225,7 @@ } .webbpm.ervu_dashboard .search-block .child-block .search-date .date > div { width: auto; - min-width: min(7.5vw, 9.375rem); /*150*/ + /*min-width: min(7.5vw, 9.375rem);*/ /*150*/ } .webbpm.ervu_dashboard .search-block .child-block .search-date date-time-picker + text { margin-left: 0; @@ -1266,7 +1274,7 @@ color: var(--white); font-size: var(--size-text-subtitle); width: 100%; - min-height: min(3.6vw, 4.5rem); /*72*/ + min-height:min(calc(3.6*var(--w-content)), 4.5rem); /*72*/ margin: var(--indent-xbase) 0 0; border-radius: 20px; border: 1px solid var(--btn-border); From d52f74e3e5f242c273c2ae4838786d6529d37f51 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 29 May 2025 15:58:30 +0300 Subject: [PATCH 06/34] v0.5 --- .../resources/css/components-dashboard.css | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 228398f8..8e3f1b8a 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -276,7 +276,7 @@ width: 100%; padding: var(--indent-mini) var(--indent-xlarge) var(--indent-mini) var(--indent-xbase); border: 0; - border-radius: 24px; + border-radius: var(--indent-medium); background-color: var(--color-text-secondary); } @@ -524,9 +524,13 @@ top: calc((50% - var(--size-text-secondary)/ 2)); right: var(--indent-base); height: auto; + line-height: 1.5; width: auto; border: 0; } +.webbpm.ervu_dashboard .selectize-control .selectize-input.dropdown-active::after { + transform: rotate(180deg); +} .webbpm.ervu_dashboard .selectize-control .selectize-input::before { display: none; } @@ -539,7 +543,7 @@ .webbpm.ervu_dashboard .selectize-dropdown { height: fit-content; padding: var(--indent-base) 0; - border-radius: 24px; + border-radius: var(--indent-medium); border: 1px solid var(--color-text-secondary); background: linear-gradient(180deg, rgba(19, 46, 55, 0.5) 0%, rgba(19, 46, 55, 0.7) 100%), @@ -631,7 +635,7 @@ .webbpm.ervu_dashboard .tab-vertical .nav-tabs .nav-item { position: relative; padding: var(--indent-small) var(--indent-huge) var(--indent-small) var(--indent-base); - border-radius: 8px; + border-radius: var(--indent-mini); } .webbpm.ervu_dashboard .tab-vertical .nav-tabs .nav-item.active { background-color: var(--color-success); @@ -689,7 +693,7 @@ color: var(--color-text-secondary); line-height: 1; padding: var(--indent-mini) var(--indent-base); - border-radius: 8px; + border-radius: var(--indent-mini); border: 1px solid var(--color-primary-20); background-color: var(--bg-brick); } @@ -724,7 +728,7 @@ .webbpm.ervu_dashboard .list-group { padding: var(--indent-small) var(--indent-base) var(--indent-base); - border-radius: 8px; + border-radius: var(--indent-mini); border: 0; background-color: var(--color-dark-20); } @@ -1180,7 +1184,8 @@ } .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu { color: var(--color-text-primary); - border-radius: 24px; + font-size: var(--size-text-secondary); + border-radius: var(--indent-medium); border: 1px solid var(--color-text-secondary); background: linear-gradient(180deg, rgba(19, 46, 55, 0.5) 0%, rgba(19, 46, 55, 0.7) 100%), @@ -1201,9 +1206,9 @@ background-color: transparent; } .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu td span { - width: 54px; - height: 32px; - line-height: 32px; + width: min(2.7vw, 3.375rem); /*54*/ + height: var(--indent-large); + line-height: var(--indent-large); margin: 0; } .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu :is(.old, .new) { @@ -1214,6 +1219,11 @@ color: var(--color-success); background-color: transparent; } +.webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu .day { + height: var(--indent-medium); + line-height: var(--indent-medium); + width: var(--indent-medium); +} .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu .today, .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu .today:hover { color: var(--color-text-primary); @@ -1402,7 +1412,7 @@ color: var(--color-text-primary); font-size: var(--size-text-addprimary); font-family: 'GilroyM'; - border-radius: 8px; + border-radius: var(--indent-mini); border: 1px solid var(--color-primary-20); background-color: var(--bg-brick); } @@ -1410,7 +1420,7 @@ background-color: var(--bg-brick) !important; } .webbpm.ervu_dashboard ag-grid-angular .ag-root .ag-row:is(.ag-row-selected, .ag-row-hover):before { - border-radius: 8px; + border-radius: var(--indent-mini); background-color: var(--bg-brick) !important; } .webbpm.ervu_dashboard ag-grid-angular .ag-root .ag-cell { @@ -1661,7 +1671,7 @@ .webbpm.ervu_dashboard ervu-file-upload { padding: var(--indent-medium); - border-radius: 8px; + border-radius: var(--indent-mini); border: 1px solid var(--color-primary-20); background-color: var(--bg-brick); } From 92547bceb13d86cd43ea8dde0813d7e1bfa51004 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 29 May 2025 17:12:55 +0300 Subject: [PATCH 07/34] v0.6 --- frontend/src/resources/css/components-dashboard.css | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 8e3f1b8a..2113d5e3 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -1185,6 +1185,9 @@ .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu { color: var(--color-text-primary); font-size: var(--size-text-secondary); + width: min(12vw, 15rem); /*240*/ + min-width: min(12vw, 15rem); /*240*/; + padding: var(--indent-small); border-radius: var(--indent-medium); border: 1px solid var(--color-text-secondary); background: @@ -1219,10 +1222,10 @@ color: var(--color-success); background-color: transparent; } -.webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu .day { - height: var(--indent-medium); - line-height: var(--indent-medium); - width: var(--indent-medium); +.webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu :is(th, td) { + height: var(--indent-xlarge); + line-height: var(--indent-xlarge); + width: var(--indent-xlarge); } .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu .today, .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu .today:hover { From fc863a37d702d3d330c626dc500dd355e56c02a4 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 29 May 2025 20:51:26 +0300 Subject: [PATCH 08/34] v0.7 --- .../resources/css/components-dashboard.css | 99 +++++++++++++++++-- .../src/resources/css/inbox-dashboard.css | 29 ++++++ 2 files changed, 120 insertions(+), 8 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 2113d5e3..3f079594 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -1223,9 +1223,9 @@ background-color: transparent; } .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu :is(th, td) { - height: var(--indent-xlarge); - line-height: var(--indent-xlarge); - width: var(--indent-xlarge); + height: var(--indent-large); + line-height: var(--indent-large); + width: var(--indent-large); } .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu .today, .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu .today:hover { @@ -1946,21 +1946,104 @@ .webbpm.ervu_dashboard .wrapper { width: calc(100% - 340px); } -@media (max-width: 1279) { + + +@media (min-width: 1921px) { + .webbpm.ervu_dashboard check-box label span { + width: max(1.4vw, 1.75rem); /*28*/ + height: max(1.4vw, 1.75rem); /*28*/ + } + .webbpm.ervu_dashboard .radio-horizontal input[type="radio"] {; + width: max(1.4vw, 1.75rem); /*28*/ + height: max(1.4vw, 1.75rem); /*28*/ + } + .webbpm.ervu_dashboard dropdown-tree-view .row-item label { + min-width: max(7.5vw, 9.375rem); /*150*/ + } + .webbpm.ervu_dashboard :is(.arrow-btn, .delete-btn, .upload-btn) .btn, + .webbpm.ervu_dashboard .selected-file-delete-btn { + width: max(1.8vw, 2.25rem); /*36*/ + height: max(1.8vw, 2.25rem); /*36*/ + min-width: max(1.8vw, 2.25rem); + } + .webbpm.ervu_dashboard .text-fixed-percent { + min-width: max(3vw, 3.75rem) !important; /*60*/ + } + .webbpm.ervu_dashboard .text-fixed-percent-medium { + min-width: max(3.5vw, 4.375rem) !important; /*70*/ + } + .webbpm.ervu_dashboard text label { + width: max(7.5vw, 9.375rem) ; /*150px*/ + } + .webbpm.ervu_dashboard .tab-vertical .nav-tabs { + width: max(20vw, 23.75rem); /*380*/ + } + .webbpm.ervu_dashboard .tab-vertical .nav-tabs ~ .tab-active { + width: calc(100% - max(20vw, 23.75rem) - var(--indent-large)); + } + .webbpm.ervu_dashboard .graph-chart .chart-content { + width: max(calc(10*var(--w-content)), 12.5rem); + height: max(calc(7*var(--w-content)), 9rem); + } + .webbpm.ervu_dashboard .graph-donut .chart-content { + width: max(calc(8*var(--w-content)), 11rem); + height: max(calc(8*var(--w-content)), 11rem); + } + .webbpm.ervu_dashboard .graph-donut-medium .chart-content { + width: max(calc(10*var(--w-content)), 13.5rem); + height: max(calc(10*var(--w-content)), 13.5rem); + } + .webbpm.ervu_dashboard .graph-donut-large .chart-content { + width: max(calc(14*var(--w-content)), 18.5rem); + height: max(calc(14*var(--w-content)), 18.5rem); + } + .webbpm.ervu_dashboard .bg-diamond-people { + background-position: 100% 0, 50% max(16vw, 20rem); /*320*/ + } + .webbpm.ervu_dashboard .search-block .child-block:first-child { + min-width: max(20vw, 25rem); /*400*/ + } + .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu { + width: max(12vw, 15rem); /*240*/ + min-width: max(12vw, 15rem); /*240*/; + } + .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu td span { + width: max(2.7vw, 3.375rem); /*54*/ + } + .webbpm.ervu_dashboard .search-block .search-btn .btn { + min-height:max(calc(3.6*var(--w-content)), 4.5rem); /*72*/ + } + .webbpm.ervu_dashboard ag-grid-angular .ag-paging-panel .ag-paging-button { + width: max(2.9vw, 3.625rem); /*58*/ + height: max(2.9vw, 3.625rem); /*58*/ + } + .webbpm.ervu_dashboard .ervu-file-upload .selected-file .selected-file-name { + padding-left: max(3vw, 3.75rem); /*60*/ + } + .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs { + margin-bottom: max(6vw, 7.5rem); /*120*/ + } + .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical + .search-btns { + width: calc(max(20vw, 23.75rem) - var(--indent-large)); + } + .webbpm.ervu_dashboard.citizencard .pers-block .nav-tabs ~ .tab-active, + .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs ~ .tab-active { + left: calc(max(20vw, 23.75rem) + var(--indent-large)); + } } - - - @media ((max-width: 780px) or (orientation: portrait)) { .webbpm.ervu_dashboard .header-logo .logo-title, .webbpm.ervu_dashboard .header-menu .update-data { display: none; } - .webbpm.ervu_dashboard .top-btn-block > .horizontal-container { + .webbpm.ervu_dashboard .top-btn-block .horizontal-container { flex-direction: column; } + .webbpm.ervu_dashboard .top-btn-block .horizontal-container > * + * { + margin-left: 0; + } .webbpm.ervu_dashboard .top-btn-block .component-float { width: auto; } diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 3493627c..aedc87fc 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -294,6 +294,35 @@ body.webbpm.ervu_dashboard { background-color: transparent; } +@media (min-width: 1921px) { + .webbpm.ervu_dashboard { + --size-text-title: max(calc(1.5*var(--w-content)), 2rem); /*32px*/ + --size-text-subtitle: max(calc(1.2*var(--w-content)), 1.5rem); /*24px*/ + --size-text-addprimary: max(calc(1*var(--w-content)), 1.25rem); /*20px*/ + --size-text-primary: max(calc(0.9*var(--w-content)), 1.125rem); /*18px*/ + --size-text-secondary: max(calc(0.7*var(--w-content)), 0.875rem); /*14px*/ + + --size-num-title: max(calc(3*var(--w-content)), 3.75rem); /*60px*/ + --size-num-subtitle: max(calc(2.4*var(--w-content)), 3rem); /*48px*/ + --size-num-addtitle: max(calc(2*var(--w-content)), 2.5rem); /*40px*/ + --size-num-primary: max(calc(1.6*var(--w-content)), 2rem); /*32px*/ + --size-num-secondary: max(calc(1.2*var(--w-content)), 1.5rem); /*24px*/ + + --indent-huge: max(calc(2.4*var(--w-content)), 3rem); /*48*/ + --indent-xlarge: max(calc(2*var(--w-content)), 2.5rem); /*40*/ + --indent-large: max(calc(1.6*var(--w-content)), 2rem); /*32*/ + --indent-medium: max(calc(1.2*var(--w-content)), 1.5rem); /*24*/ + --indent-xbase: max(calc(1*var(--w-content)), 1.25rem); /*20*/ + --indent-base: max(calc(0.8*var(--w-content)), 1rem); /*16*/ + --indent-small: max(calc(0.6*var(--w-content)), 0.75rem); /*12px*/ + --indent-mini: max(calc(0.4*var(--w-content)), 0.5rem); /*8px*/ + --indent-xmini: max(calc(0.2*var(--w-content)), 0.25rem); /*4px*/ + + --h-header: max(calc(3.9*var(--w-content)), 4.875rem); /*78*/ + --w-screen: max(calc(2*var(--w-content)), 2.5rem); /*40*/ + } +} + @media ((max-width: 780px) or (orientation: portrait)) { .webbpm.ervu_dashboard { --size-text-title: 2rem; /*32px*/ From b6f1d44a1e2e52cdf0a197ea0451152c5baf6f3d Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Fri, 30 May 2025 09:27:43 +0300 Subject: [PATCH 09/34] v0.8 --- frontend/src/resources/css/inbox-dashboard.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index aedc87fc..315d409c 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -316,10 +316,17 @@ body.webbpm.ervu_dashboard { --indent-base: max(calc(0.8*var(--w-content)), 1rem); /*16*/ --indent-small: max(calc(0.6*var(--w-content)), 0.75rem); /*12px*/ --indent-mini: max(calc(0.4*var(--w-content)), 0.5rem); /*8px*/ - --indent-xmini: max(calc(0.2*var(--w-content)), 0.25rem); /*4px*/ + --indent-xmini: max(calc(0.2*var(--w-content)), 0.25rem); /*4px*/ --h-header: max(calc(3.9*var(--w-content)), 4.875rem); /*78*/ --w-screen: max(calc(2*var(--w-content)), 2.5rem); /*40*/ + + .webbpm.ervu_dashboard .header-logo .logo a { + width: max(calc(6.25*var(--w-content)), 5rem); + } + .webbpm.ervu_dashboard .header-logo .logo-title { + margin-left: max(calc(6.25*var(--w-content)), 5rem); + } } } From 67077950afaef385d3dcbd499dfd087f5d62445a Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Fri, 30 May 2025 10:08:59 +0300 Subject: [PATCH 10/34] fix logo --- .../src/resources/css/inbox-dashboard.css | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 315d409c..0b7d13b6 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -127,14 +127,14 @@ body.webbpm.ervu_dashboard { margin-left: var(--w-screen); } .webbpm.ervu_dashboard .header-logo .logo a { - width: 100px; + width: min(5vw, 6.25rem); /*100*/ height: var(--h-header); background: url('../../../src/resources/img/logo-full.svg') no-repeat 0 50%; background-size: auto 100%; } .webbpm.ervu_dashboard .header-logo .logo-title { font-family: 'GilroySB'; - margin-left: min(6vw, 7.5rem); /*120*/ + margin-left: min(5vw, 6.25rem); /*100*/ } .webbpm.ervu_dashboard .header-menu { @@ -318,15 +318,14 @@ body.webbpm.ervu_dashboard { --indent-mini: max(calc(0.4*var(--w-content)), 0.5rem); /*8px*/ --indent-xmini: max(calc(0.2*var(--w-content)), 0.25rem); /*4px*/ - --h-header: max(calc(3.9*var(--w-content)), 4.875rem); /*78*/ + --h-header: max(calc(3.9*var(--w-content)), 4.875rem); /*78*/ --w-screen: max(calc(2*var(--w-content)), 2.5rem); /*40*/ - - .webbpm.ervu_dashboard .header-logo .logo a { - width: max(calc(6.25*var(--w-content)), 5rem); - } - .webbpm.ervu_dashboard .header-logo .logo-title { - margin-left: max(calc(6.25*var(--w-content)), 5rem); - } + } + .webbpm.ervu_dashboard .header-logo .logo a { + width: max(calc(6.25*var(--w-content)), 5rem); + } + .webbpm.ervu_dashboard .header-logo .logo-title { + margin-left: max(calc(6.25*var(--w-content)), 5rem); } } From dc24aae0a44b8f5430d7905724a9757fb3cc0619 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Fri, 30 May 2025 10:23:08 +0300 Subject: [PATCH 11/34] hide screen width < 780 --- .../resources/css/components-dashboard.css | 11 ++-- .../src/resources/css/inbox-dashboard.css | 57 ++++++++++--------- 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 3f079594..049d8af9 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -2032,7 +2032,7 @@ left: calc(max(20vw, 23.75rem) + var(--indent-large)); } } - +/* @media ((max-width: 780px) or (orientation: portrait)) { .webbpm.ervu_dashboard .header-logo .logo-title, .webbpm.ervu_dashboard .header-menu .update-data { @@ -2084,8 +2084,8 @@ position: relative; display: grid; place-items: center; - width: 2.25rem; /*36*/ - height: 2.25rem; /*36*/ + width: 2.25rem; + height: 2.25rem; } .webbpm.ervu_dashboard .graph-chart .chart-content { @@ -2207,8 +2207,8 @@ border-bottom: 1px solid var(--color-primary-20) !important; } .webbpm.ervu_dashboard .search-add-params .child-block check-box label > span { - width: 1.75rem; /*28*/ - height: 1.75rem; /*28*/ + width: 1.75rem; + height: 1.75rem; } .webbpm.ervu_dashboard .search-add-params .child-block check-box + text { margin-left: 1.75rem !important; @@ -2251,6 +2251,7 @@ width: 100% !important; } } +*/ /* grid-checkbox diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 0b7d13b6..3f206764 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -328,47 +328,48 @@ body.webbpm.ervu_dashboard { margin-left: max(calc(6.25*var(--w-content)), 5rem); } } - +/* @media ((max-width: 780px) or (orientation: portrait)) { .webbpm.ervu_dashboard { - --size-text-title: 2rem; /*32px*/ - --size-text-subtitle: 1.5rem; /*24px*/ - --size-text-addprimary: 1.25rem; /*20px*/ - --size-text-primary: 1.125rem; /*18px*/ - --size-text-secondary: 0.875rem; /*14px*/ + --size-text-title: 2rem; + --size-text-subtitle: 1.5rem; + --size-text-addprimary: 1.25rem; + --size-text-primary: 1.125rem; + --size-text-secondary: 0.875rem; - --size-num-title: 3.75rem; /*60px*/ - --size-num-subtitle: 3rem; /*48px*/ - --size-num-addtitle: 2.5rem; /*40px*/ - --size-num-primary: 2rem; /*32px*/ - --size-num-secondary: 1.5rem; /*24px*/ + --size-num-title: 3.75rem; + --size-num-subtitle: 3rem; + --size-num-addtitle: 2.5rem; + --size-num-primary: 2rem; + --size-num-secondary: 1.5rem; - --indent-huge: 3rem; /*48*/ - --indent-xlarge: 2.5rem; /*40*/ - --indent-large: 2rem; /*32*/ - --indent-medium: 1.5rem; /*24*/ - --indent-xbase: 1.25rem; /*20*/ - --indent-base: 1rem; /*16*/ - --indent-small: 0.75rem; /*12px*/ - --indent-mini: 0.5rem; /*8px*/ - --indent-xmini: 0.25rem; /*4px*/ + --indent-huge: 3rem; + --indent-xlarge: 2.5rem; + --indent-large: 2rem; + --indent-medium: 1.5rem; + --indent-xbase: 1.25rem; + --indent-base: 1rem; + --indent-small: 0.75rem; + --indent-mini: 0.5rem; + --indent-xmini: 0.25rem; - --h-header: 4.875rem; /*78*/ - --w-screen: 1rem; /*40*/ + --h-header: 4.875rem; + --w-screen: 1rem; } } @media (max-width: 480px) { .webbpm.ervu_dashboard { - --size-text-title: 1.75rem; /*28px*/ - --size-text-primary: 1rem; /*16px*/ + --size-text-title: 1.75rem; + --size-text-primary: 1rem; - --size-num-title: 3rem; /*48*/ - --size-num-subtitle: 2.5rem; /*40*/ - --size-num-addtitle: 2rem; /*32px*/ - --size-num-primary: 1.75rem; /*28px*/ + --size-num-title: 3rem; + --size-num-subtitle: 2.5rem; + --size-num-addtitle: 2rem; + --size-num-primary: 1.75rem; } } +*/ .webbpm.ervu_dashboard .progress { width: 64px; From 4dcb3fe2cd36da623f9642408515fc1932563d2d Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Fri, 30 May 2025 12:08:58 +0300 Subject: [PATCH 12/34] progress --- frontend/src/resources/css/inbox-dashboard.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 3f206764..ceb839ca 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -372,9 +372,9 @@ body.webbpm.ervu_dashboard { */ .webbpm.ervu_dashboard .progress { - width: 64px; - height: 64px; - border: 5px dotted var(--color-text-primary); + width: 3.2vw; + height:3.2vw; + border: 0.25vw dotted var(--color-text-primary); border-radius: 100%; display: inline-block; position: relative; From ddaa2546daf201881d48c77dd5d3e57e3231b9ab Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Fri, 30 May 2025 17:28:01 +0300 Subject: [PATCH 13/34] // --- .../resources/css/components-dashboard.css | 307 ------------------ .../src/resources/css/inbox-dashboard.css | 83 ----- 2 files changed, 390 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 049d8af9..53359836 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -1941,318 +1941,11 @@ /* end - Special pages */ - - .webbpm.ervu_dashboard .wrapper { width: calc(100% - 340px); } - -@media (min-width: 1921px) { - .webbpm.ervu_dashboard check-box label span { - width: max(1.4vw, 1.75rem); /*28*/ - height: max(1.4vw, 1.75rem); /*28*/ - } - .webbpm.ervu_dashboard .radio-horizontal input[type="radio"] {; - width: max(1.4vw, 1.75rem); /*28*/ - height: max(1.4vw, 1.75rem); /*28*/ - } - .webbpm.ervu_dashboard dropdown-tree-view .row-item label { - min-width: max(7.5vw, 9.375rem); /*150*/ - } - .webbpm.ervu_dashboard :is(.arrow-btn, .delete-btn, .upload-btn) .btn, - .webbpm.ervu_dashboard .selected-file-delete-btn { - width: max(1.8vw, 2.25rem); /*36*/ - height: max(1.8vw, 2.25rem); /*36*/ - min-width: max(1.8vw, 2.25rem); - } - .webbpm.ervu_dashboard .text-fixed-percent { - min-width: max(3vw, 3.75rem) !important; /*60*/ - } - .webbpm.ervu_dashboard .text-fixed-percent-medium { - min-width: max(3.5vw, 4.375rem) !important; /*70*/ - } - .webbpm.ervu_dashboard text label { - width: max(7.5vw, 9.375rem) ; /*150px*/ - } - .webbpm.ervu_dashboard .tab-vertical .nav-tabs { - width: max(20vw, 23.75rem); /*380*/ - } - .webbpm.ervu_dashboard .tab-vertical .nav-tabs ~ .tab-active { - width: calc(100% - max(20vw, 23.75rem) - var(--indent-large)); - } - .webbpm.ervu_dashboard .graph-chart .chart-content { - width: max(calc(10*var(--w-content)), 12.5rem); - height: max(calc(7*var(--w-content)), 9rem); - } - .webbpm.ervu_dashboard .graph-donut .chart-content { - width: max(calc(8*var(--w-content)), 11rem); - height: max(calc(8*var(--w-content)), 11rem); - } - .webbpm.ervu_dashboard .graph-donut-medium .chart-content { - width: max(calc(10*var(--w-content)), 13.5rem); - height: max(calc(10*var(--w-content)), 13.5rem); - } - .webbpm.ervu_dashboard .graph-donut-large .chart-content { - width: max(calc(14*var(--w-content)), 18.5rem); - height: max(calc(14*var(--w-content)), 18.5rem); - } - .webbpm.ervu_dashboard .bg-diamond-people { - background-position: 100% 0, 50% max(16vw, 20rem); /*320*/ - } - .webbpm.ervu_dashboard .search-block .child-block:first-child { - min-width: max(20vw, 25rem); /*400*/ - } - .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu { - width: max(12vw, 15rem); /*240*/ - min-width: max(12vw, 15rem); /*240*/; - } - .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu td span { - width: max(2.7vw, 3.375rem); /*54*/ - } - .webbpm.ervu_dashboard .search-block .search-btn .btn { - min-height:max(calc(3.6*var(--w-content)), 4.5rem); /*72*/ - } - .webbpm.ervu_dashboard ag-grid-angular .ag-paging-panel .ag-paging-button { - width: max(2.9vw, 3.625rem); /*58*/ - height: max(2.9vw, 3.625rem); /*58*/ - } - .webbpm.ervu_dashboard .ervu-file-upload .selected-file .selected-file-name { - padding-left: max(3vw, 3.75rem); /*60*/ - } - .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs { - margin-bottom: max(6vw, 7.5rem); /*120*/ - } - .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical + .search-btns { - width: calc(max(20vw, 23.75rem) - var(--indent-large)); - } - .webbpm.ervu_dashboard.citizencard .pers-block .nav-tabs ~ .tab-active, - .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs ~ .tab-active { - left: calc(max(20vw, 23.75rem) + var(--indent-large)); - } -} -/* -@media ((max-width: 780px) or (orientation: portrait)) { - .webbpm.ervu_dashboard .header-logo .logo-title, - .webbpm.ervu_dashboard .header-menu .update-data { - display: none; - } - .webbpm.ervu_dashboard .top-btn-block .horizontal-container { - flex-direction: column; - } - .webbpm.ervu_dashboard .top-btn-block .horizontal-container > * + * { - margin-left: 0; - } - .webbpm.ervu_dashboard .top-btn-block .component-float { - width: auto; - } - .webbpm.ervu_dashboard .top-btn-block .pull-right { - margin-left: 0; - } - .webbpm.ervu_dashboard .top-btn-block .pull-right > div { - justify-content: flex-start; - } - - .webbpm.ervu_dashboard [class*="text-fixed-percent"] { - flex: auto !important; - } - - .webbpm.ervu_dashboard .parent-block > .horizontal-container { - flex-direction: column; - } - .webbpm.ervu_dashboard .parent-block .horizontal-container > .child-block + .child-block { - margin-left: var(--indent-mini); - } - .webbpm.ervu_dashboard .parent-block > .horizontal-container > * + * { - margin-left: 0; - margin-top: var(--indent-mini); - } - .webbpm.ervu_dashboard .parent-block .vertical-container > .child-block + *, - .webbpm.ervu_dashboard .parent-block .vertical-container > .child-block + .child-block { - margin-top: var(--indent-mini); - } - .webbpm.ervu_dashboard .parent-block .child-block ~ hbox > .horizontal-container { - flex-direction: column; - } - .webbpm.ervu_dashboard .parent-block .child-block ~ hbox > .horizontal-container > .child-block + .child-block { - margin-left: 0; - margin-top: var(--indent-mini); - } - - .webbpm.ervu_dashboard :is(.arrow-btn, .delete-btn, .upload-btn) .btn { - position: relative; - display: grid; - place-items: center; - width: 2.25rem; - height: 2.25rem; - } - - .webbpm.ervu_dashboard .graph-chart .chart-content { - width: 12.5rem; - height: 9rem; - } - .webbpm.ervu_dashboard .graph-donut .chart-content { - width: 11rem; - height: 11rem; - } - .webbpm.ervu_dashboard .graph-donut-medium .chart-content { - width: 13.5rem; - height: 13.5rem; - } - .webbpm.ervu_dashboard .graph-donut-large .chart-content { - width: 18.5rem; - height: 18.5rem; - } - - .webbpm.ervu_dashboard .search-block .child-block:first-child { - flex: 1 0 auto; - } - .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical + .search-btns { - position: relative; - width: 100%; - overflow: visible; - } - .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs { - margin-bottom: 0; - } -} - -@media (max-width: 480px) { - .webbpm.ervu_dashboard .top-btn-block .horizontal-container { - flex-direction: column; - } - .webbpm.ervu_dashboard .top-btn-block .horizontal-container combo-box { - padding-right: 0; - } - .webbpm.ervu_dashboard .top-btn-block :is(button-component, static-route-navigation-button) + :is(button-component, static-route-navigation-button) { - margin-left: 0; - margin-top: var(--indent-xmini); - } - .webbpm.ervu_dashboard .top-btn-block :is(button-component, static-route-navigation-button) button { - width: 100%; - } - - .webbpm.ervu_dashboard .child-block { - padding: var(--indent-base) var(--indent-xbase); - } - .webbpm.ervu_dashboard .parent-block > .horizontal-container > .child-block + .child-block { - margin-left: 0; - } - - .webbpm.ervu_dashboard .graph-legend-row { - margin-top: 0 !important; - } - .webbpm.ervu_dashboard .graph-legend-row > .horizontal-container { - flex-direction: column; - } - .webbpm.ervu_dashboard .graph-legend-row > .horizontal-container > vbox + vbox { - padding-left: 0; - padding-top: var(--indent-small); - margin-left: 0; - margin-top: var(--indent-small); - border-left: 0; - border-top: 1px solid var(--color-primary-20); - } - .webbpm.ervu_dashboard .graph-legend-row > .horizontal-container .text-invert > div { - justify-content: flex-end; - } - .webbpm.ervu_dashboard .graph-legend-column .horizontal-container { - flex-direction: column; - } - .webbpm.ervu_dashboard .graph-legend-column .horizontal-container .pull-right { - justify-content: flex-start; - margin-left: 0; - } - .webbpm.ervu_dashboard .donut-absolute-row .active > vbox > .vertical-container { - flex-direction: row; - } - .webbpm.ervu_dashboard .donut-absolute-row .active > vbox > .vertical-container ervu-chart-v2 { - justify-content: flex-start !important; - margin-top: 0 !important; - z-index: 1 !important; - } - .webbpm.ervu_dashboard .graph-donut .chart-content, - .webbpm.ervu_dashboard .graph-donut-medium .chart-content { - width: 10rem; - height: 10rem; - } - .webbpm.ervu_dashboard .graph-donut-large .chart-content { - width: 18rem; - height: 18rem; - } - - .webbpm.ervu_dashboard ag-grid-angular .ag-paging-panel { - flex-direction: column; - } - .webbpm.ervu_dashboard ag-grid-angular .ag-paging-panel .ag-paging-button { - width: 3rem; - height: 3rem; - } - .webbpm.ervu_dashboard ag-grid-angular .ag-paging-panel .ag-paging-page-summary-panel .ag-paging-description { - margin: 0 var(--indent-small); - } - - .webbpm.ervu_dashboard .search-add-params .filter-group > div > hbox > .horizontal-container { - flex-direction: column; - } - .webbpm.ervu_dashboard .search-add-params .search-main-block, - .webbpm.ervu_dashboard .search-add-params .search-main-block ~ vbox { - width: 100% !important; - } - .webbpm.ervu_dashboard .search-add-params .search-main-block ~ vbox { - padding: 0 !important; - padding-top: var(--indent-base) !important; - border: 0 !important; - border-bottom: 1px solid var(--color-primary-20) !important; - } - .webbpm.ervu_dashboard .search-add-params .child-block check-box label > span { - width: 1.75rem; - height: 1.75rem; - } - .webbpm.ervu_dashboard .search-add-params .child-block check-box + text { - margin-left: 1.75rem !important; - } - - .webbpm.ervu_dashboard.citizen .container-inside, - .webbpm.ervu_dashboard.citizencard .container-inside { - overflow: auto; - } - .webbpm.ervu_dashboard .tab-vertical > div, - .webbpm.ervu_dashboard .pers-block .horizontal-container { - flex-direction: column; - } - .webbpm.ervu_dashboard .search-block .grid { - min-height: 300px; - } - .webbpm.ervu_dashboard.citizencard .pers-block .nav-tabs, - .webbpm.ervu_dashboard.citizencard .pers-block .nav-tabs ~ .tab-active, - .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs, - .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs ~ .tab-active, - .webbpm.ervu_dashboard.citizen .search-block .tab-search-fio > div > vbox:not(.search-btns) > div { - position: relative; - width: 100%; - overflow: visible; - } - .webbpm.ervu_dashboard.citizencard .pers-block .nav-tabs, - .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs { - padding-right: 0; - margin-right: 0; - } - .webbpm.ervu_dashboard.citizencard .pers-block .nav-tabs ~ .tab-active, - .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs ~ .tab-active { - left: 0; - } - .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical + .search-btns { - width: 100%; - } - .webbpm.ervu_dashboard .pers-block .child-block:nth-child(2) .horizontal-container vbox, - .webbpm.ervu_dashboard .pers-block .child-block:nth-child(2) .horizontal-container text { - width: 100% !important; - } -} -*/ - /* grid-checkbox diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index ceb839ca..4b350837 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -48,12 +48,6 @@ linear-gradient(180deg, rgba(19, 46, 55, 0.16) 0%, rgba(19, 46, 55, 0.32) 100%), radial-gradient(ellipse at 50% 50%, rgba(0, 0, 0, 0.8) 0%, rgba(0, 0, 0, 0) 80%); --bg-group: rgba(8, 131, 198, 0.25); - /*conic-gradient(from 90deg at 100% 0%, rgba(0, 240, 255, 0.6) 0%, rgba(0, 191, 255, 0.24) 34%, rgba(0, 191, 255, 1) 100%),*/ - /* - linear-gradient(180deg, rgba(8, 131, 198, 0) 0%, rgba(8, 131, 198, 0.4) 100%), - linear-gradient(0deg, rgba(19, 46, 55, 0.08) 0%, rgba(19, 46, 55, 0.16) 100%), - linear-gradient(204deg, rgba(0, 191, 255, 0.5) 0%, rgba(0, 191, 255, 0) 50%); - */ --bg-brick: rgba(9, 91, 120, 0.6); --w-content: calc((100vw - 300px)/100); @@ -294,83 +288,6 @@ body.webbpm.ervu_dashboard { background-color: transparent; } -@media (min-width: 1921px) { - .webbpm.ervu_dashboard { - --size-text-title: max(calc(1.5*var(--w-content)), 2rem); /*32px*/ - --size-text-subtitle: max(calc(1.2*var(--w-content)), 1.5rem); /*24px*/ - --size-text-addprimary: max(calc(1*var(--w-content)), 1.25rem); /*20px*/ - --size-text-primary: max(calc(0.9*var(--w-content)), 1.125rem); /*18px*/ - --size-text-secondary: max(calc(0.7*var(--w-content)), 0.875rem); /*14px*/ - - --size-num-title: max(calc(3*var(--w-content)), 3.75rem); /*60px*/ - --size-num-subtitle: max(calc(2.4*var(--w-content)), 3rem); /*48px*/ - --size-num-addtitle: max(calc(2*var(--w-content)), 2.5rem); /*40px*/ - --size-num-primary: max(calc(1.6*var(--w-content)), 2rem); /*32px*/ - --size-num-secondary: max(calc(1.2*var(--w-content)), 1.5rem); /*24px*/ - - --indent-huge: max(calc(2.4*var(--w-content)), 3rem); /*48*/ - --indent-xlarge: max(calc(2*var(--w-content)), 2.5rem); /*40*/ - --indent-large: max(calc(1.6*var(--w-content)), 2rem); /*32*/ - --indent-medium: max(calc(1.2*var(--w-content)), 1.5rem); /*24*/ - --indent-xbase: max(calc(1*var(--w-content)), 1.25rem); /*20*/ - --indent-base: max(calc(0.8*var(--w-content)), 1rem); /*16*/ - --indent-small: max(calc(0.6*var(--w-content)), 0.75rem); /*12px*/ - --indent-mini: max(calc(0.4*var(--w-content)), 0.5rem); /*8px*/ - --indent-xmini: max(calc(0.2*var(--w-content)), 0.25rem); /*4px*/ - - --h-header: max(calc(3.9*var(--w-content)), 4.875rem); /*78*/ - --w-screen: max(calc(2*var(--w-content)), 2.5rem); /*40*/ - } - .webbpm.ervu_dashboard .header-logo .logo a { - width: max(calc(6.25*var(--w-content)), 5rem); - } - .webbpm.ervu_dashboard .header-logo .logo-title { - margin-left: max(calc(6.25*var(--w-content)), 5rem); - } -} -/* -@media ((max-width: 780px) or (orientation: portrait)) { - .webbpm.ervu_dashboard { - --size-text-title: 2rem; - --size-text-subtitle: 1.5rem; - --size-text-addprimary: 1.25rem; - --size-text-primary: 1.125rem; - --size-text-secondary: 0.875rem; - - --size-num-title: 3.75rem; - --size-num-subtitle: 3rem; - --size-num-addtitle: 2.5rem; - --size-num-primary: 2rem; - --size-num-secondary: 1.5rem; - - --indent-huge: 3rem; - --indent-xlarge: 2.5rem; - --indent-large: 2rem; - --indent-medium: 1.5rem; - --indent-xbase: 1.25rem; - --indent-base: 1rem; - --indent-small: 0.75rem; - --indent-mini: 0.5rem; - --indent-xmini: 0.25rem; - - --h-header: 4.875rem; - --w-screen: 1rem; - } -} - -@media (max-width: 480px) { - .webbpm.ervu_dashboard { - --size-text-title: 1.75rem; - --size-text-primary: 1rem; - - --size-num-title: 3rem; - --size-num-subtitle: 2.5rem; - --size-num-addtitle: 2rem; - --size-num-primary: 1.75rem; - } -} -*/ - .webbpm.ervu_dashboard .progress { width: 3.2vw; height:3.2vw; From 4dd4a4fc495d718e38ed983ee97073030f13ffe9 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Fri, 30 May 2025 19:14:59 +0300 Subject: [PATCH 14/34] 0.1 --- .../src/resources/css/inbox-dashboard.css | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 4b350837..928ae39b 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -1,3 +1,10 @@ +body { + width: 980px; +} + + + + @font-face { font-family: 'GilroyL'; src: url('../fonts/gilroy-light.otf'); @@ -52,30 +59,30 @@ --w-content: calc((100vw - 300px)/100); - --size-text-title: min(calc(1.5*var(--w-content)), 2rem); /*32px*/ - --size-text-subtitle: min(calc(1.2*var(--w-content)), 1.5rem); /*24px*/ - --size-text-addprimary: min(calc(1*var(--w-content)), 1.25rem); /*20px*/ - --size-text-primary: min(calc(0.9*var(--w-content)), 1.125rem); /*18px*/ - --size-text-secondary: min(calc(0.7*var(--w-content)), 0.875rem); /*14px*/ + --size-text-title: 16px; /*min(calc(1.5*var(--w-content)), 2rem);*/ /*32px*/ + --size-text-subtitle: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ + --size-text-addprimary: 10px; /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20px*/ + --size-text-primary: 9px; /*min(calc(0.9*var(--w-content)), 1.125rem);*/ /*18px*/ + --size-text-secondary: 7px; /*min(calc(0.7*var(--w-content)), 0.875rem);*/ /*14px*/ - --size-num-title: min(calc(3*var(--w-content)), 3.75rem); /*60px*/ - --size-num-subtitle: min(calc(2.4*var(--w-content)), 3rem); /*48px*/ - --size-num-addtitle: min(calc(2*var(--w-content)), 2.5rem); /*40px*/ - --size-num-primary: min(calc(1.6*var(--w-content)), 2rem); /*32px*/ - --size-num-secondary: min(calc(1.2*var(--w-content)), 1.5rem); /*24px*/ + --size-num-title: 30px; /*min(calc(3*var(--w-content)), 3.75rem);*/ /*60px*/ + --size-num-subtitle: 24px; /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48px*/ + --size-num-addtitle: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40px*/ + --size-num-primary: 16px; /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32px*/ + --size-num-secondary: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ - --indent-huge: min(calc(2.4*var(--w-content)), 3rem); /*48*/ - --indent-xlarge: min(calc(2*var(--w-content)), 2.5rem); /*40*/ - --indent-large: min(calc(1.6*var(--w-content)), 2rem); /*32*/ - --indent-medium: min(calc(1.2*var(--w-content)), 1.5rem); /*24*/ - --indent-xbase: min(calc(1*var(--w-content)), 1.25rem); /*20*/ - --indent-base: min(calc(0.8*var(--w-content)), 1rem); /*16*/ - --indent-small: min(calc(0.6*var(--w-content)), 0.75rem); /*12px*/ - --indent-mini: min(calc(0.4*var(--w-content)), 0.5rem); /*8px*/ - --indent-xmini: min(calc(0.2*var(--w-content)), 0.25rem); /*4px*/ + --indent-huge: 24px; /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48*/ + --indent-xlarge: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ + --indent-large: 16px; /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32*/ + --indent-medium: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24*/ + --indent-xbase: 10px; /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20*/ + --indent-base: 8px; /*min(calc(0.8*var(--w-content)), 1rem);*/ /*16*/ + --indent-small: 6px; /*min(calc(0.6*var(--w-content)), 0.75rem);*/ /*12px*/ + --indent-mini: 4px; /*min(calc(0.4*var(--w-content)), 0.5rem);*/ /*8px*/ + --indent-xmini: 2px; /*min(calc(0.2*var(--w-content)), 0.25rem);*/ /*4px*/ - --h-header: min(calc(3.9*var(--w-content)), 4.875rem); /*78*/ - --w-screen: min(calc(2*var(--w-content)), 2.5rem); /*40*/ + --h-header: 39px; /*min(calc(3.9*var(--w-content)), 4.875rem);*/ /*78*/ + --w-screen: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ } .webbpm.ervu_dashboard .ag-theme-balham-dark { --ag-modal-overlay-background-color: transparent !important; From ec32a1d79a706b837aa74e4d7d8d3e85dd099ebb Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Fri, 30 May 2025 19:45:08 +0300 Subject: [PATCH 15/34] 0.2 --- .../src/resources/css/inbox-dashboard.css | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 928ae39b..ef47fd16 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -1,5 +1,5 @@ body { - width: 980px; + min-width: 980px; } @@ -59,30 +59,30 @@ body { --w-content: calc((100vw - 300px)/100); - --size-text-title: 16px; /*min(calc(1.5*var(--w-content)), 2rem);*/ /*32px*/ - --size-text-subtitle: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ - --size-text-addprimary: 10px; /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20px*/ - --size-text-primary: 9px; /*min(calc(0.9*var(--w-content)), 1.125rem);*/ /*18px*/ - --size-text-secondary: 7px; /*min(calc(0.7*var(--w-content)), 0.875rem);*/ /*14px*/ + --size-text-title: calc(1.5*var(--w-content)); /*min(calc(1.5*var(--w-content)), 2rem);*/ /*32px*/ + --size-text-subtitle: calc(1.2*var(--w-content)); /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ + --size-text-addprimary: calc(1*var(--w-content)); /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20px*/ + --size-text-primary: calc(0.9*var(--w-content)); /*min(calc(0.9*var(--w-content)), 1.125rem);*/ /*18px*/ + --size-text-secondary: calc(0.7*var(--w-content)); /*min(calc(0.7*var(--w-content)), 0.875rem);*/ /*14px*/ - --size-num-title: 30px; /*min(calc(3*var(--w-content)), 3.75rem);*/ /*60px*/ - --size-num-subtitle: 24px; /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48px*/ - --size-num-addtitle: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40px*/ - --size-num-primary: 16px; /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32px*/ - --size-num-secondary: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ + --size-num-title: calc(3*var(--w-content)); /*min(calc(3*var(--w-content)), 3.75rem);*/ /*60px*/ + --size-num-subtitle: calc(2.4*var(--w-content)); /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48px*/ + --size-num-addtitle: calc(2*var(--w-content)); /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40px*/ + --size-num-primary: calc(1.6*var(--w-content)); /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32px*/ + --size-num-secondary: calc(1.2*var(--w-content)); /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ - --indent-huge: 24px; /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48*/ - --indent-xlarge: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ - --indent-large: 16px; /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32*/ - --indent-medium: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24*/ - --indent-xbase: 10px; /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20*/ - --indent-base: 8px; /*min(calc(0.8*var(--w-content)), 1rem);*/ /*16*/ - --indent-small: 6px; /*min(calc(0.6*var(--w-content)), 0.75rem);*/ /*12px*/ - --indent-mini: 4px; /*min(calc(0.4*var(--w-content)), 0.5rem);*/ /*8px*/ - --indent-xmini: 2px; /*min(calc(0.2*var(--w-content)), 0.25rem);*/ /*4px*/ + --indent-huge: calc(2.4*var(--w-content)); /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48*/ + --indent-xlarge: calc(2*var(--w-content)); /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ + --indent-large: calc(1.6*var(--w-content)); /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32*/ + --indent-medium: calc(1.2*var(--w-content)); /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24*/ + --indent-xbase: calc(1*var(--w-content)); /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20*/ + --indent-base: calc(0.8*var(--w-content)); /*min(calc(0.8*var(--w-content)), 1rem);*/ /*16*/ + --indent-small: calc(0.6*var(--w-content)); /*min(calc(0.6*var(--w-content)), 0.75rem);*/ /*12px*/ + --indent-mini: calc(0.4*var(--w-content)); /*min(calc(0.4*var(--w-content)), 0.5rem);*/ /*8px*/ + --indent-xmini: calc(0.2*var(--w-content)); /*min(calc(0.2*var(--w-content)), 0.25rem);*/ /*4px*/ - --h-header: 39px; /*min(calc(3.9*var(--w-content)), 4.875rem);*/ /*78*/ - --w-screen: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ + --h-header: calc(3.9*var(--w-content)); /*min(calc(3.9*var(--w-content)), 4.875rem);*/ /*78*/ + --w-screen: calc(2*var(--w-content)); /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ } .webbpm.ervu_dashboard .ag-theme-balham-dark { --ag-modal-overlay-background-color: transparent !important; From abc28c6806bc51b9dd621fffa7e7f222bdc7f7e4 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Fri, 30 May 2025 20:03:30 +0300 Subject: [PATCH 16/34] 0.3 --- .../resources/css/components-dashboard.css | 6 --- .../src/resources/css/inbox-dashboard.css | 45 ++++++++++--------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 53359836..e5289cdb 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -1940,12 +1940,6 @@ } /* end - Special pages */ - -.webbpm.ervu_dashboard .wrapper { - width: calc(100% - 340px); -} - - /* grid-checkbox diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index ef47fd16..1a3f4572 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -1,4 +1,5 @@ -body { +body. .wrapper { + width: 980px; min-width: 980px; } @@ -59,30 +60,30 @@ body { --w-content: calc((100vw - 300px)/100); - --size-text-title: calc(1.5*var(--w-content)); /*min(calc(1.5*var(--w-content)), 2rem);*/ /*32px*/ - --size-text-subtitle: calc(1.2*var(--w-content)); /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ - --size-text-addprimary: calc(1*var(--w-content)); /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20px*/ - --size-text-primary: calc(0.9*var(--w-content)); /*min(calc(0.9*var(--w-content)), 1.125rem);*/ /*18px*/ - --size-text-secondary: calc(0.7*var(--w-content)); /*min(calc(0.7*var(--w-content)), 0.875rem);*/ /*14px*/ + --size-text-title: 14.5px; /*min(calc(1.5*var(--w-content)), 2rem);*/ /*32px*/ + --size-text-subtitle: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ + --size-text-addprimary: 10px; /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20px*/ + --size-text-primary: 9px; /*min(calc(0.9*var(--w-content)), 1.125rem);*/ /*18px*/ + --size-text-secondary: 7px; /*min(calc(0.7*var(--w-content)), 0.875rem);*/ /*14px*/ - --size-num-title: calc(3*var(--w-content)); /*min(calc(3*var(--w-content)), 3.75rem);*/ /*60px*/ - --size-num-subtitle: calc(2.4*var(--w-content)); /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48px*/ - --size-num-addtitle: calc(2*var(--w-content)); /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40px*/ - --size-num-primary: calc(1.6*var(--w-content)); /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32px*/ - --size-num-secondary: calc(1.2*var(--w-content)); /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ + --size-num-title: 30px; /*min(calc(3*var(--w-content)), 3.75rem);*/ /*60px*/ + --size-num-subtitle: 24px; /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48px*/ + --size-num-addtitle: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40px*/ + --size-num-primary: 16px; /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32px*/ + --size-num-secondary: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ - --indent-huge: calc(2.4*var(--w-content)); /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48*/ - --indent-xlarge: calc(2*var(--w-content)); /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ - --indent-large: calc(1.6*var(--w-content)); /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32*/ - --indent-medium: calc(1.2*var(--w-content)); /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24*/ - --indent-xbase: calc(1*var(--w-content)); /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20*/ - --indent-base: calc(0.8*var(--w-content)); /*min(calc(0.8*var(--w-content)), 1rem);*/ /*16*/ - --indent-small: calc(0.6*var(--w-content)); /*min(calc(0.6*var(--w-content)), 0.75rem);*/ /*12px*/ - --indent-mini: calc(0.4*var(--w-content)); /*min(calc(0.4*var(--w-content)), 0.5rem);*/ /*8px*/ - --indent-xmini: calc(0.2*var(--w-content)); /*min(calc(0.2*var(--w-content)), 0.25rem);*/ /*4px*/ + --indent-huge: 24px; /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48*/ + --indent-xlarge: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ + --indent-large: 16px; /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32*/ + --indent-medium: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24*/ + --indent-xbase: 10px; /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20*/ + --indent-base: 8px; /*min(calc(0.8*var(--w-content)), 1rem);*/ /*16*/ + --indent-small: 6px; /*min(calc(0.6*var(--w-content)), 0.75rem);*/ /*12px*/ + --indent-mini: 4px; /*min(calc(0.4*var(--w-content)), 0.5rem);*/ /*8px*/ + --indent-xmini: 2px; /*min(calc(0.2*var(--w-content)), 0.25rem);*/ /*4px*/ - --h-header: calc(3.9*var(--w-content)); /*min(calc(3.9*var(--w-content)), 4.875rem);*/ /*78*/ - --w-screen: calc(2*var(--w-content)); /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ + --h-header: 39px; /*min(calc(3.9*var(--w-content)), 4.875rem);*/ /*78*/ + --w-screen: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ } .webbpm.ervu_dashboard .ag-theme-balham-dark { --ag-modal-overlay-background-color: transparent !important; From 877468e9f26cd5589f56db936ff3f18c742b8d10 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Fri, 30 May 2025 21:27:03 +0300 Subject: [PATCH 17/34] 0.4 --- frontend/src/resources/css/inbox-dashboard.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 1a3f4572..fe3d5f1a 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -1,5 +1,4 @@ -body. .wrapper { - width: 980px; +.webbpm.ervu_dashboard .wrapper { min-width: 980px; } @@ -63,7 +62,7 @@ body. .wrapper { --size-text-title: 14.5px; /*min(calc(1.5*var(--w-content)), 2rem);*/ /*32px*/ --size-text-subtitle: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ --size-text-addprimary: 10px; /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20px*/ - --size-text-primary: 9px; /*min(calc(0.9*var(--w-content)), 1.125rem);*/ /*18px*/ + --size-text-primary: 8.8px; /*min(calc(0.9*var(--w-content)), 1.125rem);*/ /*18px*/ --size-text-secondary: 7px; /*min(calc(0.7*var(--w-content)), 0.875rem);*/ /*14px*/ --size-num-title: 30px; /*min(calc(3*var(--w-content)), 3.75rem);*/ /*60px*/ From 89d26e3d46b04df77288cb5f11d7ffdfe57d2261 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Sat, 31 May 2025 20:13:08 +0300 Subject: [PATCH 18/34] 0.5 --- frontend/src/resources/css/inbox-dashboard.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index fe3d5f1a..018714ba 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -59,10 +59,10 @@ --w-content: calc((100vw - 300px)/100); - --size-text-title: 14.5px; /*min(calc(1.5*var(--w-content)), 2rem);*/ /*32px*/ + --size-text-title: 14px; /*min(calc(1.5*var(--w-content)), 2rem);*/ /*32px*/ --size-text-subtitle: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ --size-text-addprimary: 10px; /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20px*/ - --size-text-primary: 8.8px; /*min(calc(0.9*var(--w-content)), 1.125rem);*/ /*18px*/ + --size-text-primary: 8px; /*min(calc(0.9*var(--w-content)), 1.125rem);*/ /*18px*/ --size-text-secondary: 7px; /*min(calc(0.7*var(--w-content)), 0.875rem);*/ /*14px*/ --size-num-title: 30px; /*min(calc(3*var(--w-content)), 3.75rem);*/ /*60px*/ @@ -73,15 +73,15 @@ --indent-huge: 24px; /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48*/ --indent-xlarge: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ - --indent-large: 16px; /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32*/ + --indent-large: 14px; /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32*/ --indent-medium: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24*/ --indent-xbase: 10px; /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20*/ --indent-base: 8px; /*min(calc(0.8*var(--w-content)), 1rem);*/ /*16*/ --indent-small: 6px; /*min(calc(0.6*var(--w-content)), 0.75rem);*/ /*12px*/ --indent-mini: 4px; /*min(calc(0.4*var(--w-content)), 0.5rem);*/ /*8px*/ - --indent-xmini: 2px; /*min(calc(0.2*var(--w-content)), 0.25rem);*/ /*4px*/ + --indent-xmini: 2px; /*min(calc(0.2*var(--w-content)), 0.25rem);*/ /*4px*/ - --h-header: 39px; /*min(calc(3.9*var(--w-content)), 4.875rem);*/ /*78*/ + --h-header: 39px; /*min(calc(3.9*var(--w-content)), 4.875rem);*/ /*78*/ --w-screen: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ } .webbpm.ervu_dashboard .ag-theme-balham-dark { From 195117dd6754cdda12f2083b36e53609e0eb2cfd Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Sun, 1 Jun 2025 19:56:57 +0300 Subject: [PATCH 19/34] 0.6 --- .../src/resources/css/inbox-dashboard.css | 89 ++++++++++++------- 1 file changed, 59 insertions(+), 30 deletions(-) diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 018714ba..ff4a3e02 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -1,10 +1,3 @@ -.webbpm.ervu_dashboard .wrapper { - min-width: 980px; -} - - - - @font-face { font-family: 'GilroyL'; src: url('../fonts/gilroy-light.otf'); @@ -59,30 +52,30 @@ --w-content: calc((100vw - 300px)/100); - --size-text-title: 14px; /*min(calc(1.5*var(--w-content)), 2rem);*/ /*32px*/ - --size-text-subtitle: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ - --size-text-addprimary: 10px; /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20px*/ - --size-text-primary: 8px; /*min(calc(0.9*var(--w-content)), 1.125rem);*/ /*18px*/ - --size-text-secondary: 7px; /*min(calc(0.7*var(--w-content)), 0.875rem);*/ /*14px*/ + --size-text-title: 2rem; /*32px*/ + --size-text-subtitle: 1.5rem; /*24px*/ + --size-text-addprimary: 1.25rem; /*20px*/ + --size-text-primary: 1.125rem; /*18px*/ + --size-text-secondary: 0.875rem; /*14px*/ - --size-num-title: 30px; /*min(calc(3*var(--w-content)), 3.75rem);*/ /*60px*/ - --size-num-subtitle: 24px; /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48px*/ - --size-num-addtitle: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40px*/ - --size-num-primary: 16px; /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32px*/ - --size-num-secondary: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24px*/ + --size-num-title: 3.75rem; /*60px*/ + --size-num-subtitle: 3rem; /*48px*/ + --size-num-addtitle: 2.5rem; /*40px*/ + --size-num-primary: 2rem; /*32px*/ + --size-num-secondary: 1.5rem; /*24px*/ - --indent-huge: 24px; /*min(calc(2.4*var(--w-content)), 3rem);*/ /*48*/ - --indent-xlarge: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ - --indent-large: 14px; /*min(calc(1.6*var(--w-content)), 2rem);*/ /*32*/ - --indent-medium: 12px; /*min(calc(1.2*var(--w-content)), 1.5rem);*/ /*24*/ - --indent-xbase: 10px; /*min(calc(1*var(--w-content)), 1.25rem);*/ /*20*/ - --indent-base: 8px; /*min(calc(0.8*var(--w-content)), 1rem);*/ /*16*/ - --indent-small: 6px; /*min(calc(0.6*var(--w-content)), 0.75rem);*/ /*12px*/ - --indent-mini: 4px; /*min(calc(0.4*var(--w-content)), 0.5rem);*/ /*8px*/ - --indent-xmini: 2px; /*min(calc(0.2*var(--w-content)), 0.25rem);*/ /*4px*/ + --indent-huge: 3rem; /*48*/ + --indent-xlarge: 2.5rem; /*40*/ + --indent-large: 2rem; /*32*/ + --indent-medium: 1.5rem; /*24*/ + --indent-xbase: 1.25rem; /*20*/ + --indent-base: 1rem; /*16*/ + --indent-small: 0.75rem; /*12px*/ + --indent-mini: 0.5rem; /*8px*/ + --indent-xmini: 0.25rem; /*4px*/ - --h-header: 39px; /*min(calc(3.9*var(--w-content)), 4.875rem);*/ /*78*/ - --w-screen: 20px; /*min(calc(2*var(--w-content)), 2.5rem);*/ /*40*/ + --h-header: 4.875rem; /*78*/ + --w-screen: 2.5rem; /*40*/ } .webbpm.ervu_dashboard .ag-theme-balham-dark { --ag-modal-overlay-background-color: transparent !important; @@ -100,6 +93,7 @@ body.webbpm.ervu_dashboard { background-size: cover; } .webbpm.ervu_dashboard .wrapper { + min-width: 980px; background: radial-gradient(circle at 0% 0%, rgba(16, 67, 77, 0.35) 0%, rgba(8, 37, 43, 0) 37%), radial-gradient(circle at 100% 0%, rgba(16, 67, 77, 0.35) 0%, rgba(8, 37, 43, 0) 37%), @@ -128,14 +122,14 @@ body.webbpm.ervu_dashboard { margin-left: var(--w-screen); } .webbpm.ervu_dashboard .header-logo .logo a { - width: min(5vw, 6.25rem); /*100*/ + width: 6.25rem; /*100*/ height: var(--h-header); background: url('../../../src/resources/img/logo-full.svg') no-repeat 0 50%; background-size: auto 100%; } .webbpm.ervu_dashboard .header-logo .logo-title { font-family: 'GilroySB'; - margin-left: min(5vw, 6.25rem); /*100*/ + margin-left: 6.25rem; /*100*/ } .webbpm.ervu_dashboard .header-menu { @@ -275,6 +269,41 @@ body.webbpm.ervu_dashboard { } /*--------------- end Login -------------- */ +@media (max-width: 1279px) { + .webbpm.ervu_dashboard { + --size-text-title: 14px; /*32px*/ + --size-text-subtitle: 12px; /*24px*/ + --size-text-addprimary: 10px; /*20px*/ + --size-text-primary: 8px; /*18px*/ + --size-text-secondary: 7px; /*14px*/ + + --size-num-title: 30px; /*60px*/ + --size-num-subtitle: 24px; /*48px*/ + --size-num-addtitle: 20px; /*40px*/ + --size-num-primary: 16px; /*32px*/ + --size-num-secondary: 12px; /*24px*/ + + --indent-huge: 24px; /*48*/ + --indent-xlarge: 20px; /*40*/ + --indent-large: 14px; /*32*/ + --indent-medium: 12px; /*24*/ + --indent-xbase: 10px; /*20*/ + --indent-base: 8px; /*16*/ + --indent-small: 6px; /*12px*/ + --indent-mini: 4px; /*8px*/ + --indent-xmini: 2px; /*4px*/ + + --h-header: 39px; /*78*/ + --w-screen: 20px; /*40*/ + } + .webbpm.ervu_dashboard .header-logo .logo a { + width: 50px; /*100*/ + } + .webbpm.ervu_dashboard .header-logo .logo-title { + margin-left: 50px; /*100*/ + } +} + @supports not selector(::-webkit-scrollbar) { * { scrollbar-width: thin; From a3020f103b3c9460d4b680c4c2c50d36c3514f88 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Jun 2025 09:50:59 +0300 Subject: [PATCH 20/34] 0.7 --- .../resources/css/components-dashboard.css | 4 +- .../src/resources/css/inbox-dashboard.css | 40 +++++++++++++++---- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index e5289cdb..dbf33f20 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -1430,8 +1430,8 @@ display: flex; } .webbpm.ervu_dashboard ag-grid-angular .ag-root .ag-cell.ag-cell-not-inline-editing { - padding-left: 12px; - padding-right: 12px; + padding-left: var(--indent-small); + padding-right: var(--indent-small); } .webbpm.ervu_dashboard ag-grid-angular .ag-root .ag-cell.ag-cell-not-inline-editing:first-child { padding-left: var(--indent-base); diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index ff4a3e02..dc3e8a0b 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -110,7 +110,7 @@ body.webbpm.ervu_dashboard { position: relative; font-family: 'Gilroy'; font-size: var(--size-text-primary); - height: 100%; + height: 100%; padding: 0 var(--w-screen) var(--indent-mini) var(--w-screen); overflow: auto; } @@ -121,15 +121,18 @@ body.webbpm.ervu_dashboard { align-items: center; margin-left: var(--w-screen); } +.webbpm.ervu_dashboard .header-logo .logo, .webbpm.ervu_dashboard .header-logo .logo a { width: 6.25rem; /*100*/ +} +.webbpm.ervu_dashboard .header-logo .logo a { height: var(--h-header); background: url('../../../src/resources/img/logo-full.svg') no-repeat 0 50%; background-size: auto 100%; } .webbpm.ervu_dashboard .header-logo .logo-title { font-family: 'GilroySB'; - margin-left: 6.25rem; /*100*/ + margin-left: var(--indent-xbase); } .webbpm.ervu_dashboard .header-menu { @@ -270,7 +273,7 @@ body.webbpm.ervu_dashboard { /*--------------- end Login -------------- */ @media (max-width: 1279px) { - .webbpm.ervu_dashboard { + .webbpm.ervu_dashboard { --size-text-title: 14px; /*32px*/ --size-text-subtitle: 12px; /*24px*/ --size-text-addprimary: 10px; /*20px*/ @@ -296,14 +299,37 @@ body.webbpm.ervu_dashboard { --h-header: 39px; /*78*/ --w-screen: 20px; /*40*/ } + .webbpm.ervu_dashboard .header-logo .logo, .webbpm.ervu_dashboard .header-logo .logo a { width: 50px; /*100*/ } - .webbpm.ervu_dashboard .header-logo .logo-title { - margin-left: 50px; /*100*/ - } } - +@media (max-width: 2299px) { + .webbpm.ervu_dashboard { + --size-text-title: calc(1.5*var(--w-content); /*32px*/ + --size-text-subtitle: calc(1.2*var(--w-content); /*24px*/ + --size-text-addprimary: calc(1*var(--w-content); /*20px*/ + --size-text-primary: calc(0.9*var(--w-content); /*18px*/ + --size-text-secondary: calc(0.7*var(--w-content); /*14px*/ + + --indent-huge:calc(2.4*var(--w-content); /*48*/ + --indent-xlarge: calc(2*var(--w-content); /*40*/ + --indent-large: calc(1.5*var(--w-content); /*32*/ + --indent-medium: calc(1.2*var(--w-content); /*24*/ + --indent-xbase: calc(1*var(--w-content); /*20*/ + --indent-base: calc(0.8*var(--w-content); /*16*/ + --indent-small: calc(0.6*var(--w-content); /*12px*/ + --indent-mini: calc(0.4*var(--w-content); /*8px*/ + --indent-xmini: calc(0.2*var(--w-content); /*4px*/ + + --h-header: calc(3.9*var(--w-content); /*78*/ + --w-screen: calc(2.9*var(--w-content); /*40*/ + } + .webbpm.ervu_dashboard .header-logo .logo, + .webbpm.ervu_dashboard .header-logo .logo a { + width: calc(5*var(--w-content); /*100*/ + } +} @supports not selector(::-webkit-scrollbar) { * { scrollbar-width: thin; From 3ab31a4182c69837dc9577a97e33bb21c2e15a73 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Jun 2025 10:02:59 +0300 Subject: [PATCH 21/34] fix --- .../src/resources/css/inbox-dashboard.css | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index dc3e8a0b..707bc45f 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -306,28 +306,28 @@ body.webbpm.ervu_dashboard { } @media (max-width: 2299px) { .webbpm.ervu_dashboard { - --size-text-title: calc(1.5*var(--w-content); /*32px*/ - --size-text-subtitle: calc(1.2*var(--w-content); /*24px*/ - --size-text-addprimary: calc(1*var(--w-content); /*20px*/ - --size-text-primary: calc(0.9*var(--w-content); /*18px*/ - --size-text-secondary: calc(0.7*var(--w-content); /*14px*/ + --size-text-title: calc(1.5*var(--w-content)); /*32px*/ + --size-text-subtitle: calc(1.2*var(--w-content)); /*24px*/ + --size-text-addprimary: calc(1*var(--w-content)); /*20px*/ + --size-text-primary: calc(0.9*var(--w-content)); /*18px*/ + --size-text-secondary: calc(0.7*var(--w-content)); /*14px*/ - --indent-huge:calc(2.4*var(--w-content); /*48*/ - --indent-xlarge: calc(2*var(--w-content); /*40*/ - --indent-large: calc(1.5*var(--w-content); /*32*/ - --indent-medium: calc(1.2*var(--w-content); /*24*/ - --indent-xbase: calc(1*var(--w-content); /*20*/ - --indent-base: calc(0.8*var(--w-content); /*16*/ - --indent-small: calc(0.6*var(--w-content); /*12px*/ - --indent-mini: calc(0.4*var(--w-content); /*8px*/ - --indent-xmini: calc(0.2*var(--w-content); /*4px*/ + --indent-huge:calc(2.4*var(--w-content)); /*48*/ + --indent-xlarge: calc(2*var(--w-content)); /*40*/ + --indent-large: calc(1.5*var(--w-content)); /*32*/ + --indent-medium: calc(1.2*var(--w-content)); /*24*/ + --indent-xbase: calc(1*var(--w-content)); /*20*/ + --indent-base: calc(0.8*var(--w-content)); /*16*/ + --indent-small: calc(0.6*var(--w-content)); /*12px*/ + --indent-mini: calc(0.4*var(--w-content)); /*8px*/ + --indent-xmini: calc(0.2*var(--w-content)); /*4px*/ - --h-header: calc(3.9*var(--w-content); /*78*/ - --w-screen: calc(2.9*var(--w-content); /*40*/ + --h-header: calc(3.9*var(--w-content)); /*78*/ + --w-screen: calc(2.9*var(--w-content)); /*40*/ } .webbpm.ervu_dashboard .header-logo .logo, .webbpm.ervu_dashboard .header-logo .logo a { - width: calc(5*var(--w-content); /*100*/ + width: calc(5*var(--w-content)); /*100*/ } } @supports not selector(::-webkit-scrollbar) { From 821d5971a859beaaf1aec7e343865da790dab5fc Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Jun 2025 11:21:10 +0300 Subject: [PATCH 22/34] 0.8 --- .../resources/css/components-dashboard.css | 233 +++++++++++++++--- .../src/resources/css/inbox-dashboard.css | 8 +- 2 files changed, 207 insertions(+), 34 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index dbf33f20..4aed4e68 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -43,8 +43,8 @@ position: absolute; top: 0; left: 0; - width: min(1.4vw, 1.75rem); /*28*/ - height: min(1.4vw, 1.75rem); /*28*/ + width: 1.75rem; /*28*/ + height: 1.75rem; /*28*/ padding: 2px; margin: 0; border-radius: 4px; @@ -73,8 +73,8 @@ } .webbpm.ervu_dashboard .radio-horizontal input[type="radio"] { appearance: none; - width: min(1.4vw, 1.75rem); /*28*/ - height: min(1.4vw, 1.75rem); /*28*/ + width: 1.75rem; /*28*/ + height: 1.75rem; /*28*/ padding: 0; margin: 0; position: relative; @@ -325,7 +325,7 @@ .webbpm.ervu_dashboard dropdown-tree-view .row-item label { font-size: var(--size-text-primary); width: auto; - min-width: min(7.5vw, 9.375rem); /*150*/ + min-width: 9.375rem; /*150*/ } .webbpm.ervu_dashboard dropdown-tree-view :is(.bi-caret-down-fill, .bi-caret-right-fill) { margin-right: var(--indent-mini); @@ -352,9 +352,9 @@ position: relative; display: grid; place-items: center; - width: min(1.8vw, 2.25rem); /*36*/ - height: min(1.8vw, 2.25rem); /*36*/ - min-width: min(1.8vw, 2.25rem); + width: 2.25rem; /*36*/ + height: 2.25rem; /*36*/ + min-width: 2.25rem; padding: 0; margin: 0 calc(var(--indent-xmini)*(-1)) 0 var(--indent-mini); border-radius: 100px; @@ -444,10 +444,10 @@ flex: 0 !important; } .webbpm.ervu_dashboard .text-fixed-percent { - min-width: min(3vw, 3.75rem) !important; /*60*/ + min-width: 3.75rem !important; /*60*/ } .webbpm.ervu_dashboard .text-fixed-percent-medium { - min-width: min(3.5vw, 4.375rem) !important; /*70*/ + min-width: 4.375rem !important; /*70*/ } .webbpm.ervu_dashboard [class*="btn-text-"] .btn { @@ -480,7 +480,7 @@ } .webbpm.ervu_dashboard text label { - width: min(7.5vw, 9.375rem) ; /*150px*/ + width: 9.375rem; /*150px*/ } .webbpm.ervu_dashboard .free-label label { width: auto; @@ -622,12 +622,12 @@ .webbpm.ervu_dashboard .tab-vertical .nav-tabs { flex-direction: column; flex-wrap: nowrap; - width: min(20vw, 23.75rem); /*380*/ + width: 23.75rem; /*380*/ padding-right: var(--indent-large); margin-right: var(--indent-large); } .webbpm.ervu_dashboard .tab-vertical .nav-tabs ~ .tab-active { - width: calc(100% - min(20vw, 23.75rem) - var(--indent-large)); + width: calc(100% - 23.75rem - var(--indent-large)); } .webbpm.ervu_dashboard .tab-vertical .nav-tabs ~ .tab-active > .active { margin: 0; @@ -835,24 +835,24 @@ border-color: var(--color-text-primary); } .webbpm.ervu_dashboard .graph-chart .chart-content { - width: min(calc(10*var(--w-content)), 12.5rem); - height: min(calc(7*var(--w-content)), 9rem); + width: 12.5rem; + height: 9rem; } .webbpm.ervu_dashboard :is(.graph-donut, .graph-donut-large) { display: flex; justify-content: center; } .webbpm.ervu_dashboard .graph-donut .chart-content { - width: min(calc(8*var(--w-content)), 11rem); - height: min(calc(8*var(--w-content)), 11rem); + width: 11rem; + height: 11rem; } .webbpm.ervu_dashboard .graph-donut-medium .chart-content { - width: min(calc(10*var(--w-content)), 13.5rem); - height: min(calc(10*var(--w-content)), 13.5rem); + width: 13.5rem; + height: 13.5rem; } .webbpm.ervu_dashboard .graph-donut-large .chart-content { - width: min(calc(14*var(--w-content)), 18.5rem); - height: min(calc(14*var(--w-content)), 18.5rem); + width: 18.5rem; + height: 18.5rem; } .webbpm.ervu_dashboard .graph-legend .horizontal-container { align-items: center; @@ -1131,7 +1131,7 @@ } .webbpm.ervu_dashboard .bg-diamond-people { background-image: url(../img/svg/bg-diamond.svg), url(../img/svg/bg-people.svg); - background-position: 100% 0, 50% min(16vw, 20rem); /*320*/ + background-position: 100% 0, 50% 20rem; /*320*/ background-repeat: no-repeat; } @@ -1147,7 +1147,7 @@ padding: var(--indent-large) var(--indent-medium) var(--indent-medium); } .webbpm.ervu_dashboard .search-block .child-block:first-child { - min-width: min(20vw, 25rem); /*400*/ + min-width: 25rem; /*400*/ flex: 0; z-index: 1; } @@ -1185,8 +1185,8 @@ .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu { color: var(--color-text-primary); font-size: var(--size-text-secondary); - width: min(12vw, 15rem); /*240*/ - min-width: min(12vw, 15rem); /*240*/; + width: 15rem; /*240*/ + min-width: 15rem; /*240*/; padding: var(--indent-small); border-radius: var(--indent-medium); border: 1px solid var(--color-text-secondary); @@ -1209,7 +1209,7 @@ background-color: transparent; } .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu td span { - width: min(2.7vw, 3.375rem); /*54*/ + width: 3.375rem; /*54*/ height: var(--indent-large); line-height: var(--indent-large); margin: 0; @@ -1287,7 +1287,7 @@ color: var(--white); font-size: var(--size-text-subtitle); width: 100%; - min-height:min(calc(3.6*var(--w-content)), 4.5rem); /*72*/ + min-height: 4.5rem; /*72*/ margin: var(--indent-xbase) 0 0; border-radius: 20px; border: 1px solid var(--btn-border); @@ -1626,8 +1626,8 @@ display: flex; align-items: center; justify-content: center; - width: min(2.9vw, 3.625rem); /*58*/ - height: min(2.9vw, 3.625rem); /*58*/ + width: 3.625rem; /*58*/ + height: 3.625rem; /*58*/ margin: 0; border: 1px solid var(--color-primary-20); border-radius: 4px; @@ -1697,7 +1697,7 @@ } .webbpm.ervu_dashboard .ervu-file-upload .selected-file .selected-file-name { position: relative; - padding-left: min(3vw, 3.75rem); /*60*/ + padding-left: 3.75rem; /*60*/ } .webbpm.ervu_dashboard .ervu-file-upload .selected-file .selected-file-name::before { position: absolute; @@ -1902,11 +1902,11 @@ flex-direction: column; } .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs { - margin-bottom: min(6vw, 7.5rem); /*120*/ + margin-bottom: 7.5rem; /*120*/ } .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical + .search-btns { position: absolute; - width: calc(min(20vw, 23.75rem) - var(--indent-large)); + width: 23.75rem - var(--indent-large); bottom: 0; z-index: 1; } @@ -1936,10 +1936,177 @@ } .webbpm.ervu_dashboard.citizencard .pers-block .nav-tabs ~ .tab-active, .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs ~ .tab-active { - left: calc(min(20vw, 23.75rem) + var(--indent-large)); + left: 23.75rem + var(--indent-large); } /* end - Special pages */ +@media (max-width: 1279px) { + .webbpm.ervu_dashboard check-box label span { + width: 14px; /*28*/ + height: 14px; /*28*/ + } + .webbpm.ervu_dashboard .radio-horizontal input[type="radio"] { + width: 14px; /*28*/ + height: 14px; /*28*/ + } + .webbpm.ervu_dashboard dropdown-tree-view .row-item label { + min-width: 75px; /*150*/ + } + .webbpm.ervu_dashboard :is(.arrow-btn, .delete-btn, .upload-btn) .btn, + .webbpm.ervu_dashboard .selected-file-delete-btn { + width: 18px; /*36*/ + height: 18px; /*36*/ + min-width: 18px + } + .webbpm.ervu_dashboard .text-fixed-percent { + min-width: 30px !important; /*60*/ + } + .webbpm.ervu_dashboard .text-fixed-percent-medium { + min-width: 35px !important; /*70*/ + } + .webbpm.ervu_dashboard text label { + width: 75px; /*150px*/ + } + .webbpm.ervu_dashboard .tab-vertical .nav-tabs { + width: 190px; /*380*/ + } + .webbpm.ervu_dashboard .tab-vertical .nav-tabs ~ .tab-active { + width: calc(100% - 200px - var(--indent-large)); + } + .webbpm.ervu_dashboard .graph-chart .chart-content { + width: 100px; + height: 70px; + } + .webbpm.ervu_dashboard .graph-donut .chart-content { + width: 80px; + height: 80px; + } + .webbpm.ervu_dashboard .graph-donut-medium .chart-content { + width: 100px; + height: 100px; + } + .webbpm.ervu_dashboard .graph-donut-large .chart-content { + width: 140px; + height: 140px; + } + .webbpm.ervu_dashboard .bg-diamond-people { + background-position: 100% 0, 50% 160px; /*320*/ + } + .webbpm.ervu_dashboard .search-block .child-block:first-child { + min-width: 200px; /*400*/ + } + .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu { + width: 120px; /*240*/ + min-width: 120px; /*240*/ + } + .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu td span { + width: 27px; /*54*/ + } + .webbpm.ervu_dashboard .search-block .search-btn .btn { + min-height: 36px; /*72*/ + } + .webbpm.ervu_dashboard ag-grid-angular .ag-paging-panel .ag-paging-button { + width: 29px; /*58*/ + height: 29px; /*58*/ + } + .webbpm.ervu_dashboard .ervu-file-upload .selected-file .selected-file-name { + padding-left: 30px; /*60*/ + } + .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs { + margin-bottom: 60px; /*120*/ + } + .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical + .search-btns { + width: calc(200px - var(--indent-large)); + } + .webbpm.ervu_dashboard.citizencard .pers-block .nav-tabs ~ .tab-active, + .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs ~ .tab-active { + left: calc(200px + var(--indent-large)); + } +} +@media ((min-width: 1280px) and (max-width: 2299px)) { + .webbpm.ervu_dashboard check-box label span { + width: 1.4vw; /*28*/ + height: 1.4vw; /*28*/ + } + .webbpm.ervu_dashboard .radio-horizontal input[type="radio"] { + width: 1.4vw; /*28*/ + height: 1.4vw; /*28*/ + } + .webbpm.ervu_dashboard dropdown-tree-view .row-item label { + min-width: 7.5vw; /*150*/ + } + .webbpm.ervu_dashboard :is(.arrow-btn, .delete-btn, .upload-btn) .btn, + .webbpm.ervu_dashboard .selected-file-delete-btn { + width: 1.8vw; /*36*/ + height: 1.8vw; /*36*/ + min-width: 1.8vw; /*36*/ + } + .webbpm.ervu_dashboard .text-fixed-percent { + min-width: 3vw !important; /*60*/ + } + .webbpm.ervu_dashboard .text-fixed-percent-medium { + min-width: 3.5vw !important; /*70*/ + } + .webbpm.ervu_dashboard text label { + width: 7.5vw; /*150px*/ + } + .webbpm.ervu_dashboard .tab-vertical .nav-tabs { + width: 20vw; /*380*/ + } + .webbpm.ervu_dashboard .tab-vertical .nav-tabs ~ .tab-active { + width: calc(100% - 20vw - var(--indent-large)); + } + .webbpm.ervu_dashboard .graph-chart .chart-content { + width: calc(10*var(--w-content)); + height:calc(7*var(--w-content)); + } + .webbpm.ervu_dashboard .graph-donut .chart-content { + width: calc(8*var(--w-content)); + height: calc(8*var(--w-content)); + } + .webbpm.ervu_dashboard .graph-donut-medium .chart-content { + width: calc(10*var(--w-content)); + height: calc(10*var(--w-content)); + } + .webbpm.ervu_dashboard .graph-donut-large .chart-content { + width: calc(14*var(--w-content)); + height: calc(14*var(--w-content)); + } + .webbpm.ervu_dashboard .bg-diamond-people { + background-position: 100% 0, 50% 16vw; /*320*/ + } + .webbpm.ervu_dashboard .search-block .child-block:first-child { + min-width: 20vw; /*400*/ + } + .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu { + width: 12vw; /*240*/ + min-width: 12vw; /*240*/; + } + .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu td span { + width: 2.7vw; /*54*/ + } + .webbpm.ervu_dashboard .search-block .search-btn .btn { + min-height: calc(3.6*var(--w-content)); /*72*/ + } + .webbpm.ervu_dashboard ag-grid-angular .ag-paging-panel .ag-paging-button { + width: 2.9vw; /*58*/ + height: 2.9vw; /*58*/ + } + .webbpm.ervu_dashboard .ervu-file-upload .selected-file .selected-file-name { + padding-left: 3vw; /*60*/ + } + .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs { + margin-bottom: 6vw; /*120*/ + } + .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical + .search-btns { + width: calc(20vw - var(--indent-large)); + } + .webbpm.ervu_dashboard.citizencard .pers-block .nav-tabs ~ .tab-active, + .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs ~ .tab-active { + left: calc(20vw + var(--indent-large)); + } +} + /* grid-checkbox diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 707bc45f..2defec08 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -1,3 +1,9 @@ +body.webbpm.ervu_dashboard { + width: calc(100% - 300px) !important; +} + + + @font-face { font-family: 'GilroyL'; src: url('../fonts/gilroy-light.otf'); @@ -304,7 +310,7 @@ body.webbpm.ervu_dashboard { width: 50px; /*100*/ } } -@media (max-width: 2299px) { +@media ((min-width: 1280px) and (max-width: 2299px)) { .webbpm.ervu_dashboard { --size-text-title: calc(1.5*var(--w-content)); /*32px*/ --size-text-subtitle: calc(1.2*var(--w-content)); /*24px*/ From 367cf28d736b8ad790eaac88d68298b4609b6cc7 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Jun 2025 12:25:13 +0300 Subject: [PATCH 23/34] 0.9 --- frontend/src/resources/css/components-dashboard.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 4aed4e68..c67a56e3 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -1289,7 +1289,7 @@ width: 100%; min-height: 4.5rem; /*72*/ margin: var(--indent-xbase) 0 0; - border-radius: 20px; + border-radius: 1.25rem; /*20*/ border: 1px solid var(--btn-border); background: var(--btn-bg); box-shadow: var(--btn-shadow); @@ -2004,6 +2004,7 @@ } .webbpm.ervu_dashboard .search-block .search-btn .btn { min-height: 36px; /*72*/ + border-radius: 10px; /*20*/ } .webbpm.ervu_dashboard ag-grid-angular .ag-paging-panel .ag-paging-button { width: 29px; /*58*/ @@ -2087,6 +2088,7 @@ } .webbpm.ervu_dashboard .search-block .search-btn .btn { min-height: calc(3.6*var(--w-content)); /*72*/ + border-radius: 1vw; /*20*/ } .webbpm.ervu_dashboard ag-grid-angular .ag-paging-panel .ag-paging-button { width: 2.9vw; /*58*/ From 0cd9fba647caeae3d0fbce28471e912d22f01efe Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Jun 2025 13:52:42 +0300 Subject: [PATCH 24/34] add --b-height --- frontend/src/resources/css/components-dashboard.css | 2 +- frontend/src/resources/css/inbox-dashboard.css | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index c67a56e3..5f250903 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -1794,7 +1794,7 @@ } .webbpm.ervu_dashboard #milregistration, .webbpm.ervu_dashboard #convicts { - height: calc(100% - 68px); + height: calc(100% - var(--b-height)); } .webbpm.ervu_dashboard #milregistration .parent-block, .webbpm.ervu_dashboard #convicts .parent-block { diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 2defec08..7fb7ab83 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -82,6 +82,7 @@ body.webbpm.ervu_dashboard { --h-header: 4.875rem; /*78*/ --w-screen: 2.5rem; /*40*/ + --b-height: 4.25rem; /*68*/ } .webbpm.ervu_dashboard .ag-theme-balham-dark { --ag-modal-overlay-background-color: transparent !important; @@ -304,6 +305,7 @@ body.webbpm.ervu_dashboard { --h-header: 39px; /*78*/ --w-screen: 20px; /*40*/ + --b-height: 34px; /*68*/ } .webbpm.ervu_dashboard .header-logo .logo, .webbpm.ervu_dashboard .header-logo .logo a { @@ -330,6 +332,7 @@ body.webbpm.ervu_dashboard { --h-header: calc(3.9*var(--w-content)); /*78*/ --w-screen: calc(2.9*var(--w-content)); /*40*/ + --b-height: calc(3.4*var(--w-content)); /*68*/ } .webbpm.ervu_dashboard .header-logo .logo, .webbpm.ervu_dashboard .header-logo .logo a { From 6306735c1f462c29d1fe9a6de92ead3fedfe0759 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Jun 2025 14:23:14 +0300 Subject: [PATCH 25/34] test --- .../src/resources/css/components-dashboard.css | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 5f250903..8be29bde 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -1836,6 +1836,21 @@ width: 100%; } +/* test */ +.webbpm.ervu_dashboard .container-inside > div { + height: 100%; +} +.webbpm.ervu_dashboard .container-inside > div > div[id] { + display: flex; + flex-direction: column; + height: 100%; +} +.webbpm.ervu_dashboard .container-inside > div > div[id] > vbox:first-child, +.webbpm.ervu_dashboard .container-inside .parent-block { + flex-grow: 1; +} +/* test */ + .webbpm.ervu_dashboard [page-citizen], .webbpm.ervu_dashboard #citizen, .webbpm.ervu_dashboard [page-citizen_all_filters], @@ -1936,7 +1951,7 @@ } .webbpm.ervu_dashboard.citizencard .pers-block .nav-tabs ~ .tab-active, .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs ~ .tab-active { - left: 23.75rem + var(--indent-large); + left: calc(23.75rem + var(--indent-large)); } /* end - Special pages */ From c1e46adff0408f4aeb1511e82705ff0781a8c3b7 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Jun 2025 14:31:08 +0300 Subject: [PATCH 26/34] // --- frontend/src/resources/css/components-dashboard.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 8be29bde..a4ca4359 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -1849,8 +1849,7 @@ .webbpm.ervu_dashboard .container-inside .parent-block { flex-grow: 1; } -/* test */ - +/* .webbpm.ervu_dashboard [page-citizen], .webbpm.ervu_dashboard #citizen, .webbpm.ervu_dashboard [page-citizen_all_filters], @@ -1868,7 +1867,8 @@ .webbpm.ervu_dashboard #citizen_all_filters .search-block { flex: 1; } - +*/ +/* test */ .webbpm.ervu_dashboard.citizencard .container-inside { height: calc(100vh - var(--h-header)); overflow: hidden; From 469e6246bfb815cdb25d921e005199ae63fafb5f Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Jun 2025 14:44:27 +0300 Subject: [PATCH 27/34] fix --- frontend/src/resources/css/inbox-dashboard.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 7fb7ab83..c0d20f7a 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -67,7 +67,7 @@ body.webbpm.ervu_dashboard { --size-num-title: 3.75rem; /*60px*/ --size-num-subtitle: 3rem; /*48px*/ --size-num-addtitle: 2.5rem; /*40px*/ - --size-num-primary: 2rem; /*32px*/ + --size-num-primary: 2rem; /*32px*/ --size-num-secondary: 1.5rem; /*24px*/ --indent-huge: 3rem; /*48*/ @@ -319,8 +319,14 @@ body.webbpm.ervu_dashboard { --size-text-addprimary: calc(1*var(--w-content)); /*20px*/ --size-text-primary: calc(0.9*var(--w-content)); /*18px*/ --size-text-secondary: calc(0.7*var(--w-content)); /*14px*/ + + --size-num-title: calc(3*var(--w-content)); /*60px*/ + --size-num-subtitle: calc(2.4*var(--w-content)); /*48*/ + --size-num-addtitle: calc(2*var(--w-content)); /*40*/ + --size-num-primary: calc(0.8*var(--w-content)); /*16*/ + --size-num-secondary: calc(0.6*var(--w-content)); /*12px*/ - --indent-huge:calc(2.4*var(--w-content)); /*48*/ + --indent-huge: calc(2.4*var(--w-content)); /*48*/ --indent-xlarge: calc(2*var(--w-content)); /*40*/ --indent-large: calc(1.5*var(--w-content)); /*32*/ --indent-medium: calc(1.2*var(--w-content)); /*24*/ @@ -328,7 +334,7 @@ body.webbpm.ervu_dashboard { --indent-base: calc(0.8*var(--w-content)); /*16*/ --indent-small: calc(0.6*var(--w-content)); /*12px*/ --indent-mini: calc(0.4*var(--w-content)); /*8px*/ - --indent-xmini: calc(0.2*var(--w-content)); /*4px*/ + --indent-xmini: calc(0.2*var(--w-content)); /*4px*/ --h-header: calc(3.9*var(--w-content)); /*78*/ --w-screen: calc(2.9*var(--w-content)); /*40*/ From 29ef89c5bbc1b9da9275ab340461f55e85041611 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Jun 2025 15:01:04 +0300 Subject: [PATCH 28/34] fix --- frontend/src/resources/css/inbox-dashboard.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index c0d20f7a..2d040487 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -323,12 +323,12 @@ body.webbpm.ervu_dashboard { --size-num-title: calc(3*var(--w-content)); /*60px*/ --size-num-subtitle: calc(2.4*var(--w-content)); /*48*/ --size-num-addtitle: calc(2*var(--w-content)); /*40*/ - --size-num-primary: calc(0.8*var(--w-content)); /*16*/ - --size-num-secondary: calc(0.6*var(--w-content)); /*12px*/ + --size-num-primary: calc(1.6*var(--w-content)); /*32*/ + --size-num-secondary: calc(1.2*var(--w-content)); /*24px*/ --indent-huge: calc(2.4*var(--w-content)); /*48*/ --indent-xlarge: calc(2*var(--w-content)); /*40*/ - --indent-large: calc(1.5*var(--w-content)); /*32*/ + --indent-large: calc(1.6*var(--w-content)); /*32*/ --indent-medium: calc(1.2*var(--w-content)); /*24*/ --indent-xbase: calc(1*var(--w-content)); /*20*/ --indent-base: calc(0.8*var(--w-content)); /*16*/ From 929ab09de076ae3a7fda803b17059530ad550cda Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Wed, 4 Jun 2025 17:45:44 +0300 Subject: [PATCH 29/34] align-bottom --- frontend/src/resources/css/components-dashboard.css | 13 ++++++++++--- frontend/src/resources/css/inbox-dashboard.css | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index a4ca4359..55d13bac 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -8,6 +8,13 @@ height: 100%; } +.webbpm.ervu_dashboard .align-bottom { + display: flex; +} +.webbpm.ervu_dashboard .align-bottom > * { + justify-content: flex-end; +} + .webbpm.ervu_dashboard text > div > div:last-of-type { overflow: visible; } @@ -94,11 +101,11 @@ background-color: var(--color-text-primary); } .webbpm.ervu_dashboard .radio-horizontal input[type="radio"] + span { - margin-left: var(--indent-base); + margin-left: var(--indent-small); font-size: var(--size-text-primary); } .webbpm.ervu_dashboard .radio-horizontal .form-radio-group + .form-radio-group { - margin-left: var(--indent-xlarge); + margin-left: var(--indent-large); } .webbpm.ervu_dashboard .bread-crumb .form-group { @@ -1757,7 +1764,7 @@ /* Special pages */ .webbpm.ervu_dashboard #total_registered_second .child-block:nth-child(1) { - flex: 0; + flex: 1.2; } .webbpm.ervu_dashboard #total_registered_second .child-block:nth-child(2) { flex: 1.4; diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 2d040487..0d03138c 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -337,7 +337,7 @@ body.webbpm.ervu_dashboard { --indent-xmini: calc(0.2*var(--w-content)); /*4px*/ --h-header: calc(3.9*var(--w-content)); /*78*/ - --w-screen: calc(2.9*var(--w-content)); /*40*/ + --w-screen: calc(2*var(--w-content)); /*40*/ --b-height: calc(3.4*var(--w-content)); /*68*/ } .webbpm.ervu_dashboard .header-logo .logo, From 4ecb60e710ff5d6811d0164135e43125bed85bd3 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 5 Jun 2025 11:55:52 +0300 Subject: [PATCH 30/34] check-box fix --- .../src/resources/css/components-dashboard.css | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 55d13bac..64a71d64 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -40,16 +40,15 @@ .webbpm.ervu_dashboard .form-group { margin-bottom: var(--indent-base); } - +.webbpm.ervu_dashboard check-box { + padding: 0; +} .webbpm.ervu_dashboard check-box label { width: min-content !important; margin: 0 !important; -} +} .webbpm.ervu_dashboard check-box label span { content: ""; - position: absolute; - top: 0; - left: 0; width: 1.75rem; /*28*/ height: 1.75rem; /*28*/ padding: 2px; @@ -69,7 +68,6 @@ } .webbpm.ervu_dashboard check-box + text { color: var(--color-text-secondary); - margin-left: var(--indent-large) !important; } .webbpm.ervu_dashboard .radio-horizontal label { @@ -1775,9 +1773,6 @@ .webbpm.ervu_dashboard #total_registered_second .child-block:nth-child(4) { flex: 1.4; } -.webbpm.ervu_dashboard #milregistration .parent-block > div > vbox:nth-child(1) { - flex: 0; -} .webbpm.ervu_dashboard #appeals .parent-block > div > vbox:nth-child(1) { flex: 2; } @@ -1807,7 +1802,6 @@ .webbpm.ervu_dashboard #convicts .parent-block { flex: 1; } -.webbpm.ervu_dashboard #milregistration .parent-block > div > vbox:nth-child(1), .webbpm.ervu_dashboard #convicts .parent-block > div > vbox:nth-child(1) { flex: 0; } From 66b21ec14f5999c8624a07f554bdb69d9077e8df Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 5 Jun 2025 14:25:20 +0300 Subject: [PATCH 31/34] remove height: 100% for all pages --- .../src/resources/css/components-dashboard.css | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 64a71d64..91f26dbd 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -1837,20 +1837,6 @@ width: 100%; } -/* test */ -.webbpm.ervu_dashboard .container-inside > div { - height: 100%; -} -.webbpm.ervu_dashboard .container-inside > div > div[id] { - display: flex; - flex-direction: column; - height: 100%; -} -.webbpm.ervu_dashboard .container-inside > div > div[id] > vbox:first-child, -.webbpm.ervu_dashboard .container-inside .parent-block { - flex-grow: 1; -} -/* .webbpm.ervu_dashboard [page-citizen], .webbpm.ervu_dashboard #citizen, .webbpm.ervu_dashboard [page-citizen_all_filters], @@ -1868,8 +1854,7 @@ .webbpm.ervu_dashboard #citizen_all_filters .search-block { flex: 1; } -*/ -/* test */ + .webbpm.ervu_dashboard.citizencard .container-inside { height: calc(100vh - var(--h-header)); overflow: hidden; From 9e23956a3bab03e5737770461f989f9946531651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B8=D0=BC=D1=83=D1=80?= Date: Mon, 9 Jun 2025 10:46:33 +0300 Subject: [PATCH 32/34] add align-bottom --- .../business-model/citizen_all_filters.page | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/resources/src/main/resources/business-model/citizen_all_filters.page b/resources/src/main/resources/business-model/citizen_all_filters.page index 2134b256..c199411f 100644 --- a/resources/src/main/resources/business-model/citizen_all_filters.page +++ b/resources/src/main/resources/business-model/citizen_all_filters.page @@ -9047,7 +9047,6 @@ 40425766-68d3-4a7c-bfa7-c63434dfca2c Tab item_Личные сведения true - false false @@ -15288,7 +15287,6 @@ a7959de0-901d-47ad-8745-a7956ecda563 Hbox true - false false @@ -15310,6 +15308,11 @@ "search-date" + + + + "align-bottom" + @@ -15557,6 +15560,11 @@ "search-date" + + + + "align-bottom" + @@ -15881,7 +15889,6 @@ 68684514-9633-487b-8c1a-a485dd3d9c17 Горизонтальный контейнер true - false false @@ -16059,6 +16066,11 @@ cssClasses + + + "align-bottom" + + @@ -16272,6 +16284,11 @@ cssClasses + + + "align-bottom" + + @@ -33379,6 +33396,7 @@ aba668a8-547a-4dc0-a251-3e152d4a843c Tab item_Сведения об образовании true + false false @@ -37014,13 +37032,6 @@ false - - 3a00a919-c6aa-4fbf-951e-b6f2dbc24764 - d8de34eb-a48f-4987-9821-d0f7a58c8664 - Список (фильтр) - false - true - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 e09dc93e-6719-4c5d-8a8b-5924e229d752 From e59f06e494152e19fa379670db8a810f21e495b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B8=D0=BC=D1=83=D1=80?= Date: Mon, 9 Jun 2025 11:03:12 +0300 Subject: [PATCH 33/34] fix --- .../business-model/citizen_all_filters.page | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/resources/src/main/resources/business-model/citizen_all_filters.page b/resources/src/main/resources/business-model/citizen_all_filters.page index c199411f..94de2140 100644 --- a/resources/src/main/resources/business-model/citizen_all_filters.page +++ b/resources/src/main/resources/business-model/citizen_all_filters.page @@ -15903,6 +15903,16 @@ false + + cssClasses + + + + "align-bottom" + + + + style @@ -16013,6 +16023,16 @@ false + + cssClasses + + + + "align-bottom" + + + + style @@ -16066,11 +16086,7 @@ cssClasses - - - "align-bottom" - - + @@ -16231,6 +16247,16 @@ false + + cssClasses + + + + "align-bottom" + + + + style @@ -16284,11 +16310,7 @@ cssClasses - - - "align-bottom" - - + From 53599571c92aec526598ba6b2ea4378326a866ff Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 9 Jun 2025 11:48:33 +0300 Subject: [PATCH 34/34] - 300px --- frontend/src/resources/css/inbox-dashboard.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 0d03138c..4d42015e 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -1,9 +1,3 @@ -body.webbpm.ervu_dashboard { - width: calc(100% - 300px) !important; -} - - - @font-face { font-family: 'GilroyL'; src: url('../fonts/gilroy-light.otf');