Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tile sizing, categories sort #3817

Merged
merged 5 commits into from
Nov 20, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed problem with cutting image height in category page on 1024px+ screen res - @AdKamil (#3781)
- Fixed null value of search input - @AdKamil (#3778)
- Fixed product sorting - @AdKamil (#3785)

- Fixed sorting on category page and product tile sizing - @andrzejewsky (#3817)

## [1.11.0-rc.2] - 2019.10.31

Expand Down
7 changes: 2 additions & 5 deletions src/themes/default/components/core/ProductTile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -198,14 +198,11 @@ $color-white: color(white);

.product-cover {
overflow: hidden;
max-height: 300px;

&__thumb {
padding-bottom: calc(143.88% / (164.5 / 100));
@media screen and (min-width: 768px) {
padding-bottom: calc(250% / (276.5 / 100));
}
@media screen and (min-width: 1024px) {
padding-bottom: calc(200% / (276.5 / 100));
padding-bottom: calc(300% / (276.5 / 100));
}
opacity: 0.8;
will-change: opacity, transform;
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/components/core/SortBy.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default {
value: {
handler () {
const defaultVariant = this.value && this.value.length ? this.value : products.defaultSortBy.attribute
this.sortby = this.sortingVariants.find(variant => variant.id === defaultVariant)
this.sortby = this.sortingVariants.find(variant => variant.id.includes(defaultVariant))
},
immediate: true
}
Expand Down