diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css
index 762cc6b8..91f26dbd 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;
}
@@ -17,22 +24,33 @@
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);
}
+.webbpm.ervu_dashboard :is(.fa, .fa-calendar::before) {
+ font-size: var(--size-text-secondary);
+}
+.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);
+}
+.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: 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;
@@ -50,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 {
@@ -61,8 +78,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;
@@ -82,10 +99,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 {
@@ -135,7 +153,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;
@@ -263,7 +281,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);
}
@@ -299,6 +317,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);
}
@@ -311,7 +330,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);
@@ -338,9 +357,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;
@@ -430,10 +449,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 {
@@ -441,7 +460,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;
@@ -467,7 +485,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;
@@ -511,17 +529,26 @@
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;
}
+.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;
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%),
@@ -600,12 +627,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;
@@ -613,7 +640,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);
@@ -671,7 +698,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);
}
@@ -706,7 +733,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);
}
@@ -813,24 +840,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;
@@ -1055,6 +1082,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);
@@ -1106,7 +1136,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;
}
@@ -1122,7 +1152,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;
}
@@ -1159,7 +1189,11 @@
}
.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);
+ width: 15rem; /*240*/
+ min-width: 15rem; /*240*/;
+ padding: var(--indent-small);
+ 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%),
@@ -1180,9 +1214,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: 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) {
@@ -1193,6 +1227,11 @@
color: var(--color-success);
background-color: transparent;
}
+.webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu :is(th, td) {
+ 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 {
color: var(--color-text-primary);
@@ -1204,7 +1243,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;
@@ -1253,9 +1292,9 @@
color: var(--white);
font-size: var(--size-text-subtitle);
width: 100%;
- min-height: min(3.6vw, 4.5rem); /*72*/
+ 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);
@@ -1381,7 +1420,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);
}
@@ -1389,15 +1428,15 @@
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 {
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);
@@ -1592,8 +1631,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;
@@ -1640,7 +1679,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);
}
@@ -1663,7 +1702,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;
@@ -1723,7 +1762,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;
@@ -1734,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;
}
@@ -1760,13 +1796,12 @@
}
.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 {
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;
}
@@ -1868,11 +1903,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;
}
@@ -1898,228 +1933,180 @@
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 {
- left: calc(min(20vw, 23.75rem) + var(--indent-large));
+ left: calc(23.75rem + var(--indent-large));
}
/* end - Special pages */
-@media ((max-width: 780px) or (orientation: portrait)) {
- .webbpm.ervu_dashboard .header-logo .logo-title,
- .webbpm.ervu_dashboard .header-menu .update-data {
- display: none;
+@media (max-width: 1279px) {
+ .webbpm.ervu_dashboard check-box label span {
+ width: 14px; /*28*/
+ height: 14px; /*28*/
}
- .webbpm.ervu_dashboard .top-btn-block > .horizontal-container {
- flex-direction: column;
+ .webbpm.ervu_dashboard .radio-horizontal input[type="radio"] {
+ width: 14px; /*28*/
+ height: 14px; /*28*/
}
- .webbpm.ervu_dashboard .top-btn-block .component-float {
- width: auto;
+ .webbpm.ervu_dashboard dropdown-tree-view .row-item label {
+ min-width: 75px; /*150*/
}
- .webbpm.ervu_dashboard .top-btn-block .pull-right {
- margin-left: 0;
+ .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 .top-btn-block .pull-right > div {
- justify-content: flex-start;
+ .webbpm.ervu_dashboard .text-fixed-percent {
+ min-width: 30px !important; /*60*/
}
-
- .webbpm.ervu_dashboard [class*="text-fixed-percent"] {
- flex: auto !important;
+ .webbpm.ervu_dashboard .text-fixed-percent-medium {
+ min-width: 35px !important; /*70*/
}
-
- .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 text label {
+ width: 75px; /*150px*/
}
- .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 .tab-vertical .nav-tabs {
+ width: 190px; /*380*/
}
- .webbpm.ervu_dashboard .parent-block .child-block ~ hbox > .horizontal-container {
- flex-direction: column;
+ .webbpm.ervu_dashboard .tab-vertical .nav-tabs ~ .tab-active {
+ width: calc(100% - 200px - var(--indent-large));
}
- .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; /*36*/
- height: 2.25rem; /*36*/
- }
-
.webbpm.ervu_dashboard .graph-chart .chart-content {
- width: 12.5rem;
- height: 9rem;
+ width: 100px;
+ height: 70px;
}
.webbpm.ervu_dashboard .graph-donut .chart-content {
- width: 11rem;
- height: 11rem;
+ width: 80px;
+ height: 80px;
}
.webbpm.ervu_dashboard .graph-donut-medium .chart-content {
- width: 13.5rem;
- height: 13.5rem;
+ width: 100px;
+ height: 100px;
}
.webbpm.ervu_dashboard .graph-donut-large .chart-content {
- width: 18.5rem;
- height: 18.5rem;
+ 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 {
- flex: 1 0 auto;
+ min-width: 200px; /*400*/
}
- .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical + .search-btns {
- position: relative;
- width: 100%;
- overflow: visible;
+ .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu {
+ width: 120px; /*240*/
+ min-width: 120px; /*240*/
}
- .webbpm.ervu_dashboard.citizen .search-block.search-add-params .tab-vertical .nav-tabs {
- margin-bottom: 0;
+ .webbpm.ervu_dashboard .search-block .child-block .filter-group date-time-picker .dropdown-menu td span {
+ width: 27px; /*54*/
}
-}
-
-@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 .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: 3rem;
- height: 3rem;
+ width: 29px; /*58*/
+ height: 29px; /*58*/
}
- .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 .ervu-file-upload .selected-file .selected-file-name {
+ padding-left: 30px; /*60*/
}
-
- .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; /*28*/
- height: 1.75rem; /*28*/
- }
- .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;
+ 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: 0;
+ 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*/
+ border-radius: 1vw; /*20*/
+ }
+ .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: 100%;
+ width: calc(20vw - var(--indent-large));
}
- .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;
+ .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));
}
}
diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css
index 3493627c..4d42015e 100644
--- a/frontend/src/resources/css/inbox-dashboard.css
+++ b/frontend/src/resources/css/inbox-dashboard.css
@@ -48,40 +48,35 @@
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);
- --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: 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: 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: 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: 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: 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: min(calc(3.9*var(--w-content)), 4.875rem); /*78*/
- --w-screen: min(calc(2*var(--w-content)), 2.5rem); /*40*/
+ --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;
@@ -99,6 +94,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%),
@@ -115,7 +111,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;
}
@@ -126,15 +122,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 {
- width: 100px;
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: var(--indent-xbase);
}
.webbpm.ervu_dashboard .header-menu {
@@ -274,6 +273,72 @@ 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*/
+ --b-height: 34px; /*68*/
+ }
+ .webbpm.ervu_dashboard .header-logo .logo,
+ .webbpm.ervu_dashboard .header-logo .logo a {
+ width: 50px; /*100*/
+ }
+}
+@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*/
+ --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(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.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*/
+ --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*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 {
+ width: calc(5*var(--w-content)); /*100*/
+ }
+}
@supports not selector(::-webkit-scrollbar) {
* {
scrollbar-width: thin;
@@ -294,51 +359,10 @@ body.webbpm.ervu_dashboard {
background-color: transparent;
}
-@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-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: 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: 4.875rem; /*78*/
- --w-screen: 1rem; /*40*/
- }
-}
-
-@media (max-width: 480px) {
- .webbpm.ervu_dashboard {
- --size-text-title: 1.75rem; /*28px*/
- --size-text-primary: 1rem; /*16px*/
-
- --size-num-title: 3rem; /*48*/
- --size-num-subtitle: 2.5rem; /*40*/
- --size-num-addtitle: 2rem; /*32px*/
- --size-num-primary: 1.75rem; /*28px*/
- }
-}
-
.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;
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..94de2140 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
@@ -15896,6 +15903,16 @@
false
+
+ cssClasses
+
+-
+
+ "align-bottom"
+
+
+
+
style
@@ -16006,6 +16023,16 @@
false
+
+ cssClasses
+
+-
+
+ "align-bottom"
+
+
+
+
style
@@ -16059,6 +16086,7 @@
cssClasses
+
@@ -16219,6 +16247,16 @@
false
+
+ cssClasses
+
+-
+
+ "align-bottom"
+
+
+
+
style
@@ -16272,6 +16310,7 @@
cssClasses
+
@@ -33379,6 +33418,7 @@
aba668a8-547a-4dc0-a251-3e152d4a843c
Tab item_Сведения об образовании
true
+ false
false
@@ -37014,13 +37054,6 @@
false
-
- 3a00a919-c6aa-4fbf-951e-b6f2dbc24764
- d8de34eb-a48f-4987-9821-d0f7a58c8664
- Список (фильтр)
- false
- true
-
b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94
e09dc93e-6719-4c5d-8a8b-5924e229d752