Merge remote-tracking branch 'origin/master'

master
Константин 2023-12-13 13:49:02 +03:00
commit b5ed7f98d2
6 changed files with 156 additions and 102 deletions

View File

@ -1,82 +0,0 @@
.area {
position: relative;
display: flex;
height: 100px;
padding: 16px;
border: var(--prime) dashed 1px;
border-radius: 4px;
overflow: hidden;
font-size: 20px;
&.hover {
background-color: #e0e0e0;
}
p {
margin: auto;
color: var(--second-dis);
text-align: center;
span {
color: var(--orange-2);
cursor: pointer;
}
}
input {
display: none;
}
.indicator {
display: flex;
flex-direction: column;
justify-content: center;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding: 16px;
background-color: #f7f7f7;
.label {
margin-bottom: 4px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.progress {
height: 4px;
background-color: #dfdfdf;
overflow: hidden;
.fill {
width: 0;
height: 100%;
background-color: #3ca128;
}
}
}
}
.values {
display: flex;
flex-direction: row;
flex-wrap: wrap;
column-gap: 24px;
row-gap: 12px;
margin-top: 8px;
overflow: hidden;
.item {
display: flex;
flex-direction: row;
.preview {
width: 80px;
height: 80px;
border: #0033661F solid 2px;
overflow: hidden;
img {
display: block;
width: 100%;
height: 100%;
object-fit: cover;
}
}
.trash {
margin-left: 10px;
}
}
}

View File

@ -154,7 +154,7 @@ pages-tree{
flex-direction: row;
align-items: center;
flex-shrink: 1;
gap: 8px;
gap: 24px;
}
}
}

View File

@ -154,7 +154,7 @@ form-field-document{
display: flex;
height: 100px;
padding: 16px;
border: var(--prime) dashed 1px;
border: var(--prime) solid 1px;
border-radius: 4px;
overflow: hidden;
font-size: 20px;
@ -251,6 +251,93 @@ form-field-document{
}
}
form-field-image{
.area {
position: relative;
display: flex;
height: 100px;
padding: 16px;
border: var(--prime) dashed 3px;
border-radius: 4px;
border-image: url('/assets/images/ico/border_gr.svg') 3 round round;
overflow: hidden;
font-size: 20px;
&.hover {
background-color: #e0e0e0;
}
p {
margin: auto;
color: var(--second-dis);
text-align: center;
span {
color: var(--orange-2);
cursor: pointer;
}
}
input {
display: none;
}
.indicator {
display: flex;
flex-direction: column;
justify-content: center;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding: 16px;
background-color: #f7f7f7;
.label {
margin-bottom: 4px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.progress {
height: 4px;
background-color: #dfdfdf;
overflow: hidden;
.fill {
width: 0;
height: 100%;
background-color: #3ca128;
}
}
}
}
.values {
display: flex;
flex-direction: row;
flex-wrap: wrap;
column-gap: 24px;
row-gap: 12px;
margin-top: 8px;
overflow: hidden;
.item {
display: flex;
flex-direction: row;
.preview {
width: 80px;
height: 80px;
border: #0033661F solid 2px;
overflow: hidden;
img {
display: block;
width: 100%;
height: 100%;
object-fit: cover;
}
}
.trash {
margin-left: 4px;
}
}
}
}
.field {
flex-direction: column;

View File

@ -109,10 +109,51 @@
}
.body {
padding: 2;
font-family: PT Sans;
font-size: 16px;
font-style: normal;
font-weight: 400;
line-height: 24px;
form-frame, object-filters{
margin: 0 var(--l);
margin: 36px 24px;
display: block;
.group .title {
margin: 16px 0;
font-family: PT Sans;
font-size: 16px;
font-style: normal;
font-weight: 700;
line-height: 24px;
}
form-field{
margin-bottom: 16px;
.field {
.caption{
font-family: PT Sans;
font-size: 16px;
font-style: normal;
font-weight: 400;
line-height: 24px;
margin-bottom: 4px;
}
input, textarea, .combobox, .area p{
border-radius: 4px;
padding: 8px 12px;
font-family: PT Sans;
font-size: 16px;
font-style: normal;
font-weight: 400;
line-height: 24px;
}
input, .combobox{
height: 40px;
}
}
}
}
}
@ -143,9 +184,9 @@
display: flex;
flex-direction: row;
align-items: center;
padding: var(--m) var(--l);
border-top: 1px solid var(--second);
padding: 16px 24px;
background: #F8F8F8;
box-shadow: 0px -2px 8px 0px rgba(0, 0, 0, 0.12);
.left {
.reset {
@ -154,8 +195,11 @@
}
.notice {
font-weight: 300;
line-height: var(--l); /* 150% */
font-family: PT Sans;
font-size: 16px;
font-style: normal;
font-weight: 400;
line-height: 24px;
}
}

View File

@ -3,21 +3,23 @@
margin-bottom: 32px;
max-width: 100%;
overflow: auto;
border-bottom: #E8E8E8 solid 1px;
box-shadow: inset 0px -1px var(--second-dis);
-webkit-overflow-scrolling: touch;
&.simple {
margin-bottom: 24px;
}
button {
padding: 7px 16px;
padding: 8px 20px;
margin-right: -1px;
background: #ffffff;
border-radius: 8px 8px 0 0;
border: #E8E8E8 solid 1px;
border-bottom: none;
color: #86898E;
border-radius: 4px 4px 0 0;
border: var(--prime) solid 1px;
color: var(--prime);
font-family: PT Sans;
font-size: 16px;
font-weight: 700;
font-style: normal;
font-weight: 400;
line-height: 24px; /* 150% */
cursor: pointer;
&:last-child {
margin-right: 0;
@ -31,16 +33,16 @@
}
&.active {
color: #ffffff;
background-color: #F9B417;
border-color: #F9B417;
background-color: var(--prime);
border-color: var(--prime)
}
&.disabled {
opacity: 0.7;
cursor: not-allowed;
}
&:hover {
background-color: #F9B417;
border-color: #F9B417;
background-color: var(--prime-act);
border-color: var(--prime-act);
color: #ffffff;
}
}

View File

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
<path fill-rule="evenodd" clip-rule="evenodd" d="M1 8H0V4C0 1.79086 1.79086 0 4 0H8V1H4C2.34315 1 1 2.34315 1 4V8ZM20 0C22.2091 0 24 1.79086 24 4V8H23V4C23 2.34315 21.6569 1 20 1H16V0H20ZM0 20V16H1V20C1 21.6569 2.34315 23 4 23H8V24H4C1.79086 24 0 22.2091 0 20ZM23 16H24V20C24 22.2091 22.2091 24 20 24H16V23H20C21.6569 23 23 21.6569 23 20V16Z" fill="#7F7F7F"/>
</svg>

After

Width:  |  Height:  |  Size: 462 B