Merge pull request #5693 from deepaksinghgusain227/checkout-index-cart-issue

UI issue in cart page on phone view
This commit is contained in:
Devansh 2022-01-27 12:31:22 +05:30 committed by GitHub
commit 710e1515fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 87 additions and 58 deletions

File diff suppressed because one or more lines are too long

View File

@ -3,7 +3,7 @@
"/js/velocity.js": "/js/velocity.js?id=6f3038cbf7349644c857",
"/js/manifest.js": "/js/manifest.js?id=49cba5d7f2bde965afa8",
"/js/components.js": "/js/components.js?id=8f1ecae83b7eb193e1c5",
"/css/velocity.css": "/css/velocity.css?id=5fd69f6ddd663bce8b59",
"/css/velocity.css": "/css/velocity.css?id=dd5a8199e031ae58e1ec",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=da7de48a51829d6c06dd",
"/images/Camera.svg": "/images/Camera.svg?id=b2fd2f9e17e1ccee96e2",
"/images/Icon-Calendar.svg": "/images/Icon-Calendar.svg?id=870d0f733a5837742276",

View File

@ -2,7 +2,7 @@
padding: 20px;
position: relative;
> div:first-child {
>div:first-child {
top: 40px;
position: sticky;
height: max-content;
@ -28,7 +28,7 @@
}
.customer-reviews {
> div {
>div {
&.row {
padding-bottom: 30px;
display: block;
@ -69,7 +69,7 @@
position: relative;
background-color: $light-background;
> div {
>div {
width: 0px;
height: 100%;
background-color: $black-color;
@ -86,7 +86,7 @@
.review-form {
width: 80%;
> div {
>div {
padding-top: 30px;
label {
@ -111,7 +111,7 @@
margin: 20px 0;
.toolbar-wrapper {
> div {
>div {
margin: 0 20px 0 0;
display: inline-block;
@ -133,7 +133,7 @@
}
}
> div:not(:first-child) {
>div:not(:first-child) {
vertical-align: super;
}
@ -191,10 +191,8 @@
animation: fade-in-white 0.3s ease-in-out;
@include border-radius(5px);
@include box-shadow(
0px 15px 25px 0px rgba(0, 0, 0, 0.03),
0px 20px 45px 5px rgba(0, 0, 0, 0.2)
);
@include box-shadow(0px 15px 25px 0px rgba(0, 0, 0, 0.03),
0px 20px 45px 5px rgba(0, 0, 0, 0.2));
.modal-header {
h3 {
@ -276,7 +274,7 @@
.card-body {
cursor: default;
> div:last-child {
>div:last-child {
margin-top: 10px;
}
@ -294,6 +292,7 @@
}
.card-body {
.compare-icon,
.wishlist-icon {
left: 0;
@ -473,7 +472,7 @@
}
form {
> div {
>div {
padding-bottom: 20px;
input {
@ -486,7 +485,7 @@
}
.container-right {
> .recently-viewed {
>.recently-viewed {
padding-top: 20px;
}
}
@ -678,7 +677,7 @@
padding-bottom: 20px !important;
border-bottom: 2px solid $border-general;
> h3 {
>h3 {
font-size: 16px;
font-weight: 600;
}
@ -698,12 +697,20 @@
}
}
.destop-cart-view {
display: block;
}
.mobile-view {
display: none;
}
.cart-item-list {
> .row {
>.row {
margin-bottom: 40px;
}
> .row:last-child {
>.row:last-child {
padding-bottom: 20px;
border-bottom: 2px solid $border-general;
}
@ -730,7 +737,7 @@
font-size: 18px;
}
> a {
>a {
line-height: 20px;
}
}
@ -764,7 +771,7 @@
li.breadcrumb-item {
display: inline-block;
& + .breadcrumb-item::before {
&+.breadcrumb-item::before {
display: inline-block;
padding-right: 5px;
padding-left: 5px;
@ -905,7 +912,8 @@
}
.account-table-content {
> .row,
>.row,
.control-group {
margin-bottom: 30px;
}
@ -942,7 +950,7 @@
.address-holder {
margin-top: 30px;
> div {
>div {
margin: 5px 0;
padding-left: 0;
}
@ -969,7 +977,7 @@
margin-bottom: 15px;
}
.table > table {
.table>table {
width: 100%;
color: #5e5e5e;
border: 1px solid rgba(0, 0, 0, 0.125);
@ -1018,11 +1026,9 @@
margin-right: 20px;
border-radius: 0 0 4px 4px;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.24);
background-image: linear-gradient(
-180deg,
rgba(0, 0, 0, 0.08),
rgba(0, 0, 0, 0.24)
);
background-image: linear-gradient(-180deg,
rgba(0, 0, 0, 0.08),
rgba(0, 0, 0, 0.24));
}
input {
@ -1059,7 +1065,7 @@
}
.reviews-container {
> .row {
>.row {
margin-bottom: 40px;
}
}
@ -1069,6 +1075,7 @@
margin: 0;
a:not([href]) {
&.next,
&.previous {
cursor: not-allowed;
@ -1093,6 +1100,7 @@
&.next,
&.previous {
.angle-right-icon,
.angle-left-icon {
@extend .rango-default;
@ -1155,7 +1163,7 @@
}
.section-content {
label + span {
label+span {
font-weight: 600;
color: $grey-color;
}
@ -1246,8 +1254,9 @@
padding: 40px 20px;
.col-lg-7 {
.coupon-container,
> div:not(:first-child) {
>div:not(:first-child) {
margin-top: 20px;
}
}
@ -1284,7 +1293,7 @@
.styled-select {
cursor: pointer;
+ .select-icon {
+.select-icon {
top: 55%;
left: 92%;
font-size: 20px;
@ -1321,7 +1330,7 @@
.address-holder {
margin-top: 15px;
> div {
>div {
margin: 5px 0;
padding-left: 0;
}
@ -1344,7 +1353,7 @@
display: table;
text-align: center;
> div {
>div {
display: table-cell;
vertical-align: middle;
@ -1402,7 +1411,7 @@
.shipping-methods,
.payment-methods {
> .row {
>.row {
margin-bottom: 20px;
}
@ -1440,11 +1449,11 @@
margin-bottom: 20px !important;
}
> .row:first-child {
>.row:first-child {
margin-top: 50px;
}
> .row {
>.row {
margin-bottom: 20px;
}
}
@ -1461,7 +1470,7 @@
position: sticky !important;
max-width: 500px !important;
> div {
>div {
width: 100%;
}
@ -1469,11 +1478,11 @@
padding: 25px 30px;
border: 1px solid $border-general;
> h3 {
>h3 {
margin-bottom: 20px;
}
> .row:not(:last-child) {
>.row:not(:last-child) {
margin-bottom: 10px;
}
@ -1601,6 +1610,7 @@
}
.main-container-wrapper {
/**
* Sticky header for logo and search component. Just make sure
* this class should have height otherwise CLS score will reduce.
@ -1676,8 +1686,8 @@
}
li:hover {
> a {
> span {
>a {
>span {
color: $light-link-color;
}
}
@ -1689,7 +1699,7 @@
.category {
padding: 5px 0 4px 15px;
+ .nested {
+.nested {
color: $font-color;
li {
@ -1820,7 +1830,7 @@
line-height: 38px;
}
> * {
>* {
height: 100%;
}
}
@ -2055,22 +2065,22 @@
}
.full-content-wrapper {
> .container-fluid {
>.container-fluid {
padding: 0 !important;
margin-bottom: 60px !important;
> .row {
>.row {
padding: 0 15px !important;
}
}
p,
div {
> .container-fluid {
>.container-fluid {
padding: 0 !important;
margin-bottom: 60px !important;
> .row {
>.row {
padding: 0 15px !important;
}
}
@ -2151,7 +2161,7 @@
}
}
input[type='checkbox'] + span {
input[type='checkbox']+span {
margin-left: 10px !important;
}
}
@ -2254,6 +2264,7 @@
&.next,
&.previous {
.angle-right-icon,
.angle-left-icon {
@extend .rango-default;
@ -2306,7 +2317,7 @@
}
.carousel-products {
+ .recently-viewed {
+.recently-viewed {
top: -40px;
position: relative;
}
@ -2477,6 +2488,23 @@
}
}
@media only screen and (max-width: 425px) {
.cart-details {
.cart-content {
.destop-view {
display: none;
}
.mobile-view {
display: block;
}
}
}
}
/**
* Spinner style.
*/
@ -2567,4 +2595,4 @@
100% {
transform: rotate(360deg);
}
}
}

View File

@ -75,7 +75,7 @@
}
@endphp
<div class="row col-12" v-if="!isMobileDevice">
<div class="row col-12 destop-view">
<a
title="{{ $product->name }}"
class="product-image-container col-2"
@ -183,7 +183,7 @@
@endif
</div>
<div class="row col-12" v-else>
<div class="row col-12 mobile-view">
<a
title="{{ $product->name }}"
class="product-image-container col-2"
@ -195,17 +195,17 @@
alt="{{ $product->name }}">
</a>
<div class="col-10 pr0 item-title">
<div class="col-10 pr0 pl0 item-title">
<a
href="{{ route('shop.productOrCategory.index', $url_key) }}"
title="{{ $product->name }}"
class="unset col-12 no-padding">
class="unset col-2 no-padding">
<span class="fs20 fw6 link-color">{{ $product->name }}</span>
</a>
@if (isset($item->additional['attributes']))
<div class="row col-12 no-padding no-margin">
<div class="row col-8 no-padding no-margin">
@foreach ($item->additional['attributes'] as $attribute)
<b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
@endforeach
@ -213,11 +213,12 @@
@endif
<div class="col-12 no-padding">
@include ('shop::products.price', ['product' => $product])
@include ('shop::products.price', ['product' => $product])
</div>
<div class="row col-12 remove-padding-margin actions">
<div class="product-quantity col-lg-4 col-6 no-padding">
<div class="product-quantity col-lg-4 col-6 no-padding">
<quantity-changer
:control-name="'qty[{{$item->id}}]'"
quantity="{{ $item->quantity }}"