Merge remote-tracking branch 'origin/master'

# Conflicts:
#	templates/frontOffice/custom/assets/dist/css/custom.min.css
This commit is contained in:
2021-06-14 11:15:55 +02:00
2 changed files with 3 additions and 1 deletions

File diff suppressed because one or more lines are too long

View File

@@ -403,12 +403,14 @@ span.product-categorie {
grid-column: 3;
grid-row: 1;
white-space: nowrap;
justify-self: flex-start;
}
div.custom-grid-four {
margin: 0 25px 0 auto;
grid-column: 4;
grid-row: 1;
white-space: nowrap;
justify-self: flex-start;
}
}
@media (max-width: 768px) {