fix conflicts

This commit is contained in:
yogesh_gohil
2019-11-14 15:51:48 +05:30
parent 4839e57791
commit 2dda0baa3f
51 changed files with 576 additions and 226 deletions

View File

@ -490,7 +490,7 @@
font-weight: 300;
font-size: 12px;
padding-top: 2px;
padding-left: 10px;
// padding-left: 10px;
textarea {
@ -504,6 +504,7 @@
border: none;
resize: none;
width: 100%;
padding-left: 11px;
color: $ls-color-gray--very-dark;
}
}

View File

@ -33,7 +33,7 @@
}
.filter-date {
flex: 1;
flex: 2;
display: flex;
margin-right: 40px;
align-items: center;
@ -55,7 +55,7 @@
margin-top: 28px;
}
@media(max-width: $medium-breakpoint ) {
@media(max-width: $large-breakpoint ) {
.filter-container {
flex-direction: column;
}