Skip to content
This repository was archived by the owner on Jan 26, 2024. It is now read-only.

Commit 7d74bef

Browse files
authored
Merge branch 'develop' into feature/update-changelog
2 parents 74cd97b + d9ffa71 commit 7d74bef

File tree

5 files changed

+28
-6
lines changed

5 files changed

+28
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4545
- Check for placing single order in case of error in any payment module - @patzick (#2409)
4646
- Display prices in products added in offline mode. - @patzick (#2450)
4747
- Updated cypress dependency for e2e tests - @lukeromanowicz (#2518)
48+
- Improved styles on recommendation filters, product tile and numeric input - @patzick (#2458)
4849

4950
### Deprecated / Removed
5051
- `@vue-storefront/store` package deprecated - @filrak

src/themes/default/components/core/GenericSelector.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export default {
2626
height: 40px;
2727
padding-left: 8px;
2828
padding-right: 8px;
29+
min-width: 50px;
2930
3031
&:hover,
3132
&:focus {

src/themes/default/components/core/ProductTile.vue

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,22 @@ $color-white: color(white);
152152
width: 100%;
153153
overflow: hidden;
154154
max-height: 300px;
155-
height: 270px;
155+
height: 100%;
156+
min-height: 155px;
156157
display: flex;
157158
align-items: flex-end;
158159
background-image: url('/assets/placeholder.svg');
159160
background-repeat: no-repeat;
160161
background-position: center;
161162
background-size: 60% auto;
162163
164+
@media (min-width: 768px) {
165+
min-height: 190px;
166+
}
167+
@media (min-width: 1200px) {
168+
min-height: 300px;
169+
}
170+
163171
&__content {
164172
display: none;
165173
}

src/themes/default/components/core/blocks/Category/Sidebar.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
:content="price.label"
5353
/>
5454
</div>
55-
<div v-else>
55+
<div v-else class="sidebar__inline-selecors">
5656
<generic-selector
5757
context="category"
58-
class="price-select mb10 block"
58+
class="mr10 mb10 block"
5959
:code="filterIndex"
6060
v-for="(option, index) in filter"
6161
:key="index"
@@ -108,5 +108,9 @@ export default {
108108
align-items: center;
109109
min-height: 47px;
110110
}
111+
112+
&__inline-selecors {
113+
display: flex;
114+
}
111115
}
112116
</style>

src/themes/default/components/core/blocks/Form/BaseInputNumber.vue

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="base-input-number">
3-
<label class="base-input-number__label flex" :for="getInputId">{{ name }}</label>
3+
<label class="base-input-number__label cl-primary flex" :for="getInputId">{{ name }}</label>
44
<input
55
:id="getInputId"
66
type="number"
@@ -69,13 +69,21 @@ export default {
6969
border-style: solid;
7070
border-width: 0 0 1px 0;
7171
width: 50px;
72-
height: 1.7rem;
72+
height: 1.4rem;
7373
line-height: 1.7rem;
74+
@media (min-width: 768px) {
75+
height: 1.7rem;
76+
}
7477
}
7578
7679
&__label {
77-
font-size: 14px;
80+
font-size: 0.8rem;
81+
line-height: 1.2rem;
7882
max-width: 100px;
83+
@media (min-width: 768px) {
84+
font-size: 1rem;
85+
line-height: 1.4rem;
86+
}
7987
}
8088
}
8189

0 commit comments

Comments
 (0)