Merge remote-tracking branch 'origin/feature/new-design-test'
This commit is contained in:
Булат Хайруллин
commit
073451faff
4 changed files with 121 additions and 6 deletions
|
|
@ -122,7 +122,6 @@
|
|||
border: 0;
|
||||
border-radius: 4px;
|
||||
background: var(--color-link);
|
||||
box-shadow: none;
|
||||
|
||||
&:not(:disabled):not(.disabled):hover,
|
||||
&:not(:disabled):not(.disabled):active,
|
||||
|
|
@ -201,8 +200,8 @@
|
|||
}
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul :is(.warning-group, .modal.show) button-component:not(.info):not(.link),
|
||||
.webbpm.ervu_lkrp_ul .warning-group static-route-navigation-button:not(.info):not(.link) {
|
||||
.webbpm.ervu_lkrp_ul :is(.warning-group, .modal.show) button-component:not(.info):not(.link):not(.btn-main),
|
||||
.webbpm.ervu_lkrp_ul .warning-group static-route-navigation-button:not(.info):not(.link):not(.btn-main) {
|
||||
padding-top: 0 !important;
|
||||
margin-top: 16px;
|
||||
border-top: 0 !important;
|
||||
|
|
@ -301,6 +300,21 @@
|
|||
}
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul .filter-block {
|
||||
color: var(--color-light);
|
||||
font-size: var(--size-text-secondary);
|
||||
|
||||
.link .btn {
|
||||
color: var(--color-light) !important;
|
||||
text-decoration: underline;
|
||||
margin-top: -2px;
|
||||
|
||||
&:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul :is(.fieldset, .warning-group) hbox:not(.subtitle) > .horizontal-container {
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
|
@ -355,14 +369,102 @@
|
|||
margin-top: var(--indent-medium);
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul input,
|
||||
.webbpm.ervu_lkrp_ul button {
|
||||
border-radius: 4px;
|
||||
box-shadow: none !important;
|
||||
}
|
||||
.webbpm.ervu_lkrp_ul input:focus {
|
||||
border-color: var(--color-link);
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header {
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .grid-setting-icon,
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-cell.ag-header-active .ag-header-cell-menu-button,
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-cell .ag-header-icon .ag-icon,
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-row-column-filter :is(.ag-header-cell, .ag-header-group-cell)::after,
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter .ag-filter-condition,
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter .ag-filter-condition ~ * {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-row:not(:first-child) .ag-header-cell,
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-row:not(:first-child) .ag-header-group-cell.ag-header-group-cell-with-group {
|
||||
border-top: 0;
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular {
|
||||
font-family: 'Inter';
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-popup .ag-select-list-item {
|
||||
font-size: var(--size-text-secondary);
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-icon {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
position: relative;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
||||
&:is(.ag-icon-small-down, .ag-icon-filter)::before {
|
||||
position: absolute;
|
||||
content: "";
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
top: 0;
|
||||
left: 0;
|
||||
}
|
||||
&.ag-icon-small-down::before {
|
||||
background-image: url(../img/svg/arrow-left.svg);
|
||||
transform: rotate(-90deg);
|
||||
}
|
||||
&.ag-icon-filter::before {
|
||||
background-image: url(../img/svg/filter.svg);
|
||||
top: -4px;
|
||||
left: -4px;
|
||||
}
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter-select {
|
||||
font-size: var(--size-text-secondary);
|
||||
|
||||
.ag-picker-field-wrapper {
|
||||
font-family: 'InterSB';
|
||||
border: 0;
|
||||
box-shadow: none !important;
|
||||
|
||||
.ag-picker-field-display {
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-filter-body {
|
||||
margin-bottom: 0;
|
||||
|
||||
input {
|
||||
color: var(--color-light);
|
||||
font-size: var(--size-text-secondary);
|
||||
min-height: auto;
|
||||
padding: 6px 12px !important;
|
||||
}
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-header-row {
|
||||
font-family: 'InterSB';
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-row.ag-row-hover,
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-row.ag-row-hover .ag-cell {
|
||||
color: var(--color-link);
|
||||
border-radius: 0;
|
||||
background-color: transparent !important;
|
||||
}
|
||||
|
||||
|
|
@ -375,6 +477,10 @@
|
|||
border-width: 1px 0 0;
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul ag-grid-angular .ag-cell-focus:not(.ag-cell-range-selected):focus-within {
|
||||
border-color: var(--color-link);
|
||||
}
|
||||
|
||||
.webbpm.ervu_lkrp_ul .okved-list {
|
||||
height: auto;
|
||||
|
||||
|
|
@ -574,7 +680,6 @@
|
|||
}
|
||||
hyper-link {
|
||||
padding-top: 0;
|
||||
margin-top: 8px;
|
||||
border: 0;
|
||||
|
||||
.link {
|
||||
|
|
@ -583,6 +688,9 @@
|
|||
background: none;
|
||||
}
|
||||
}
|
||||
& > div > * + *:not([hidden]) {
|
||||
margin-top: 8px;
|
||||
}
|
||||
}
|
||||
.warning-message {
|
||||
display: block;
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ body {
|
|||
--color-link: #c64e1b;
|
||||
--color-link-hover: #fa773f;
|
||||
--color-bg-main: #223d36;
|
||||
--color-light: #868b87;
|
||||
--bg-light: #fafafa;
|
||||
--bg-warn: #ffdcc6;
|
||||
--border-light: #d2d2d2;
|
||||
|
|
@ -197,7 +198,7 @@ body {
|
|||
.webbpm.ervu_lkrp_ul .loader {
|
||||
font-size: 15px;
|
||||
left: calc(50% - 50px);
|
||||
top: (50% - 50px);
|
||||
top: calc(50% - 50px);
|
||||
width: 0.8em;
|
||||
height: 0.8em;
|
||||
border-radius: 50%;
|
||||
|
|
|
|||
3
frontend/src/resources/img/svg/calendar.svg
Normal file
3
frontend/src/resources/img/svg/calendar.svg
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.3333 2.99935V4.33268H11.3333V2.99935H12C12.5523 2.99935 13 3.44706 13 3.99935V5.3431L3 5.3431V3.99935C3 3.44706 3.44772 2.99935 4 2.99935H4.66667V4.33268H5.66667V2.99935L10.3333 2.99935ZM3 6.3431L3 11.9993C3 12.5516 3.44772 12.9993 4 12.9993H12C12.5523 12.9993 13 12.5516 13 11.9993V6.3431L3 6.3431ZM4 1.99935H4.66667V0.666016H5.66667V1.99935L10.3333 1.99935V0.666016H11.3333V1.99935H12C13.1046 1.99935 14 2.89478 14 3.99935V11.9993C14 13.1039 13.1046 13.9993 12 13.9993H4C2.89543 13.9993 2 13.1039 2 11.9993V3.99935C2 2.89478 2.89543 1.99935 4 1.99935Z" fill="#868B87"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 728 B |
3
frontend/src/resources/img/svg/filter.svg
Normal file
3
frontend/src/resources/img/svg/filter.svg
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.05912 6.34747C5.16339 6.13558 5.38862 6 5.63637 6H18.3636C18.6114 6 18.8366 6.13558 18.9409 6.34747C19.0452 6.55937 19.0095 6.80907 18.8495 6.98744L13.9091 12.4957V17.4C13.9091 17.6079 13.7949 17.8011 13.6073 17.9104C13.4197 18.0197 13.1854 18.0297 12.9881 17.9367L10.4427 16.7367C10.2271 16.635 10.0909 16.4273 10.0909 16.2V12.4957L5.15046 6.98744C4.99048 6.80907 4.95484 6.55937 5.05912 6.34747ZM7.00793 7.2L11.2132 11.8886C11.3103 11.9969 11.3636 12.1341 11.3636 12.276V15.8292L12.6364 16.4292V12.276C12.6364 12.1341 12.6897 11.9969 12.7868 11.8886L16.9921 7.2H7.00793Z" fill="#1D1E21"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 746 B |
Loading…
Add table
Add a link
Reference in a new issue