Skip to content

Commit c281633

Browse files
committed
to fix: glasses,About bottom figures, vert long tablet overflow
1 parent b9cbc5e commit c281633

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

Routes/CartRoute.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ export const CartRoute = {
3838
id="orderRequestButton"
3939
@click="showDialog(),cart.clearLS()">Оформить заказ</div>
4040
41-
<dialog>Поздравляем с покупкой! <br>
42-
<p v-if="cart.totalPrice() >= 15000">Ваш промокод на скидку в 15%: {{cart.promoCodeGen(15)}}</p> <br>
43-
<p v-if="cart.totalPrice() >= 10000 && cart.totalPrice() < 15000">Ваш промокод на скидку в 10%: {{cart.promoCodeGen(10)}}</p> <br>
41+
<dialog class="cart-route-dialog">Поздравляем с покупкой! <br>
42+
<p v-if="cart.totalPrice() >= 15000">Ваш промокод на скидку в 15%: <span>{{cart.promoCodeGen(15)}}</span></p> <br>
43+
<p v-if="cart.totalPrice() >= 10000 && cart.totalPrice() < 15000">Ваш промокод на скидку в 10%: <span>{{cart.promoCodeGen(10)}}</span></p> <br>
4444
<router-link to="/">
4545
<p class="close-dialog-red-x" @click="hideDialog(),cart.cartBox=[]">Закрыть</p>
4646
</router-link>

Routes/Collections.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ export const Collections = {
101101
let female = ['Римская туника','Черное платье','Солнечные очки','Белый топ','Цветочный топ','Черный топ']
102102
let selected = this.maleStaff === true ? male : female
103103
return this.finalItems.filter(el => {
104-
return selected.some(selectedEl => selectedEl === el.name.slice(9))
104+
//return selected.some(selectedEl => selectedEl === el.name.slice(9))
105+
return selected.includes(el.name.slice(9))
105106
})
106107
}
107108
}

styles.css

+7-2
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ nav{
191191

192192

193193
/*=========== Сart Route =============================*/
194-
dialog{
194+
.cart-route-dialog{
195195
position: absolute;
196196
left: 0;
197197
right: 0;
@@ -201,6 +201,10 @@ dialog{
201201
background: white;
202202
color: black;
203203
}
204+
.cart-route-dialog span{
205+
background-color:yellow;
206+
}
207+
204208

205209
.CartRoute-allRows-container{
206210
display:flex;
@@ -635,13 +639,14 @@ footer{
635639
width:50%;
636640
aspect-ratio: 1/1;
637641
text-align: center;
638-
margin: 10px 0;
639642
}
640643
.About-figures img{
641644
width:100%;
642645
height:100%;
643646
object-fit: contain;
647+
object-position: top;
644648
}
649+
645650
}
646651
/*для планш гориз */
647652
@media screen and (min-width:768px) and (max-width: 1200px) {

0 commit comments

Comments
 (0)