Fixed velocity ui issues

This commit is contained in:
jitendra 2022-03-14 18:58:57 +05:30
parent 68ce18d327
commit cd982583cf
26 changed files with 200 additions and 206 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,10 +1,10 @@
{
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8fce211d0b1b70",
"/js/velocity-core.js": "/js/velocity-core.js?id=73cc7c3501570ebe9151c72d954bd97d",
"/js/velocity.js": "/js/velocity.js?id=8ee54dee47fe0c33e837a3c84d7dd270",
"/js/velocity.js": "/js/velocity.js?id=f08f3e95b22be9af938d9712f2f89348",
"/js/manifest.js": "/js/manifest.js?id=3cded37ef514b0fb89b10e7109801248",
"/js/components.js": "/js/components.js?id=aa38c7c0c1db2c698155567aacf379d2",
"/css/velocity.css": "/css/velocity.css?id=c3f8667508711413ddd1d34b655de727",
"/js/components.js": "/js/components.js?id=1a3908f12c901cc233b8942ba937a191",
"/css/velocity.css": "/css/velocity.css?id=5c69196591bdcb537298ea5d137602f6",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a58377422766f3152e15486",
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",

View File

@ -11,7 +11,7 @@
@mouseout="toggleSidebar('0', $event, 'mouseout')"
@mouseover="toggleSidebar('0', $event, 'mouseover')"
>
<i class="rango-view-list text-down-4 align-vertical-top fs18"> </i>
<i class="rango-view-list align-vertical-top fs18"> </i>
<span
class="pl5"

View File

@ -2,8 +2,10 @@
<div :class="`dropdown ${cartItems.length > 0 ? '' : 'disable-active'}`">
<div class="dropdown-toggle btn btn-link" id="mini-cart" :class="{'cursor-not-allowed': ! cartItems.length}">
<div class="mini-cart-content">
<i class="material-icons-outlined text-down-3">shopping_cart</i>
<span class="badge" v-text="cartItems.length" v-if="cartItems.length != 0"></span>
<i class="material-icons-outlined">shopping_cart</i>
<div class="badge-container">
<span class="badge" v-text="cartItems.length" v-if="cartItems.length != 0"></span>
</div>
<span class="fs18 fw6 cart-text" v-text="cartText"></span>
</div>
@ -24,9 +26,9 @@
v-for="(item, index) in cartItems"
>
<div class="col-3 product-image-container mr15">
<a @click="removeProduct(item.id)">
<span class="remove-item" @click="removeProduct(item.id)">
<span class="rango-close"></span>
</a>
</span>
<a
class="unset"
@ -43,7 +45,7 @@
<div class="col-9 no-padding card-body align-vertical-top">
<div class="no-padding">
<div
class="fs16 text-nowrap fw6"
class="fs16 text-nowrap fw6 product-name"
v-html="item.name"
></div>

View File

@ -5,7 +5,7 @@
:class="`sidebar ${addClass ? addClass : ''}`"
v-if="slicedCategories && slicedCategories.length > 0"
>
<ul type="none">
<ul type="none" style="margin-bottom: 0">
<li
:key="categoryIndex"
:id="`category-${category.id}`"

View File

@ -1,3 +1,11 @@
/*
|
| Added back again because in chrome this is not using and light house also saying not used.
| But in mozilla all fonts are gone which creating problem.
|
*/
@import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap');
/* main imports */
@import 'main/rango';
@import 'main/icons';
@ -97,6 +105,10 @@ body {
font-family: $font-family-pro;
}
label {
margin: 0;
}
.btn {
&:hover {
text-decoration: none;
@ -380,13 +392,13 @@ body {
header {
.logo {
height: 50px;
height: 46px;
padding-left: 10px;
}
#search-form {
height: 40px;
margin: 5px 0px;
margin: 8px 0px;
background: $white-color;
* {
@ -467,53 +479,21 @@ header {
}
}
/* To Do: To avoid CLS reserve width for all locale */
.mini-cart-container {
height: 50px;
padding: 5px 17px;
display: inline-block;
cursor: pointer;
#mini-cart {
.mini-cart-content {
font-size: 16px;
font-weight: 600;
text-align: right;
margin-right: 7px;
letter-spacing: 0;
position: relative;
color: $font-color;
display: inline-block;
i {
+ span.cart-text {
padding-left: 0px;
vertical-align: text-bottom;
}
}
.cart-text {
padding-left: 5px;
}
+ .down-arrow-container {
.rango-arrow-down {
top: 8px;
}
}
}
}
}
.left-wrapper {
float: right;
.compare-btn,
.wishlist-btn {
height: 50px;
.wishlist-btn,
.mini-cart-btn {
font-size: 18px;
font-weight: 600;
padding: 10px 16px 6px 16px;
margin: 16px;
cursor: pointer;
display: inline-block;
&.mini-cart-btn {
margin-right: 0;
}
i {
margin-right: 5px;
@ -538,8 +518,39 @@ header {
}
span {
top: 2px;
position: relative;
padding-left: 0;
}
#mini-cart {
padding: 0;
line-height: inherit;
.mini-cart-content {
font-size: 16px;
font-weight: 600;
text-align: right;
margin-right: 7px;
letter-spacing: 0;
position: relative;
color: $font-color;
display: inline-block;
i {
+ span.cart-text {
padding-left: 0px;
vertical-align: text-bottom;
}
}
+ .down-arrow-container {
top: 0;
.rango-arrow-down {
top: 0;
}
}
}
}
}
}

View File

@ -47,6 +47,14 @@
.accordian {
.accordian-header {
width: 100%;
font-size: 18px;
cursor: pointer;
color: #3a3a3a;
padding: 20px 0;
display: inline-block;
border-bottom: 1px solid #d3d3d3;
i.rango-arrow {
float: right;
font-size: 24px;
@ -57,39 +65,24 @@
}
}
.accordian-content {
width: 100%;
display: none;
padding-bottom: 20px;
}
&.active {
.accordian-header {
border-bottom: 0;
i.rango-arrow::before {
content: "\E906";
}
}
}
}
.accordian {
.accordian-header {
width: 100%;
font-size: 18px;
cursor: pointer;
color: #3a3a3a;
margin-top: -1px;
padding-bottom: 20px;
display: inline-block;
}
.accordian-content {
width: 100%;
display: none;
padding-bottom: 10px;
}
&.active {
.accordian-header {
padding-bottom: 10px;
}
.accordian-content {
display: inline-block;
border-bottom: 1px solid #d3d3d3;
}
}
}

View File

@ -561,26 +561,6 @@
}
}
.mini-cart-container {
#mini-cart {
outline: none;
box-shadow: none;
text-decoration: unset;
.badge {
@include border-radius(50%);
top: -2px;
left: 15px;
padding: 4px;
min-width: 20px;
position: absolute;
color: $white-color;
background: $button-primary-bg;
}
}
}
.dropdown-icon-custom::after {
top: -5px;
color: black;
@ -597,11 +577,12 @@
}
#cart-modal-content {
top: 44px;
top: 40px;
z-index: 100;
width: 350px;
left: -265px;
right: 0;
position: absolute;
border-top: 4px solid #26A37C;
.close {
top: 12px;
@ -629,8 +610,14 @@
border: 1px solid $border-light;
}
label {
float: left;
margin-top: 7px;
}
input {
width: 30px;
width: 40px;
height: 36px;
text-align: center;
font-weight: 500;
border: 1px solid $border-light;
@ -640,18 +627,20 @@
float: right;
}
.rango-close {
.remove-item {
top: -10px;
left: -10px;
padding: 0px 4px 3px 3px;
font-size: 10px;
max-height: 17px;
line-height: 1.3rem;
text-align: center;
position: absolute;
border-radius: 50%;
color: $white-color;
background: $black-color;
position: absolute;
background: #111111;
color: #FFFFFF;
padding: 0px 4px;
.rango-close {
font-size: 12px;
font-weight: 600;
padding: 0;
}
}
}
@ -671,11 +660,11 @@
margin-bottom: 30px;
}
.cart-details-header {
h2 {
margin-bottom: 20px;
}
h1 {
margin-bottom: 25px;
}
.cart-details-header {
.cart-header {
max-height: 45px;
margin-bottom: 20px;
@ -1007,11 +996,6 @@
}
}
.accordian .accordian-header {
padding: 10px 0;
font-weight: 600;
}
.image-wrapper {
width: 100%;
margin-top: 10px;
@ -1577,7 +1561,7 @@
}
&.final-price {
font-size: 24px;
font-size: 30px;
}
}
}
@ -1617,7 +1601,7 @@
*/
.sticky-header {
top: 0px;
height: 55px;
height: 56px;
z-index: 100;
position: sticky;
background: white;
@ -1763,7 +1747,7 @@
border-left: 1px solid $border-common;
box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19),
0 6px 6px rgba(0, 0, 0, 0.23);
overflow-y: auto;
overflow-y: scroll;
li:nth-last-of-type(1) {
margin-bottom: 10px;

View File

@ -276,6 +276,7 @@
a {
padding: 8px 12px;
font-size: 16px;
&:link,
&:active,

View File

@ -470,9 +470,12 @@ header #search-form > *:focus {
}
.main-category {
padding: 8px 15px;
padding: 10px 15px;
border-top: 1px solid $border-common;
border-bottom: 5px solid transparent;
.pl5 {
vertical-align: top;
}
}
.content-list {
@ -499,7 +502,7 @@ header #search-form > *:focus {
cursor: pointer;
font-size: 16px;
font-weight: 600;
padding: 8px 15px;
padding: 11px 15px;
letter-spacing: 0;
position: relative;
color: $white-color;

View File

@ -388,7 +388,7 @@
}
}
.mini-cart-container {
.mini-cart-btn {
display: none;
}

View File

@ -8,10 +8,6 @@
@extend .fs16;
> div {
@extend .mb20;
border-bottom: 1px solid $border-common;
&.attributes {
.attribute {
margin-bottom: 20px;
@ -35,14 +31,20 @@
.reviews {
vertical-align: top;
.stars {
vertical-align: middle;
margin-bottom: -6px;
}
> div {
display: inline-block;
vertical-align: middle;
}
}
.info {
@extend .mb15;
margin-left: 0px;
border-bottom: 1px solid #d3d3d3;
> h2,
div {
@ -50,11 +52,11 @@
}
> * {
margin-bottom: 10px;
margin-bottom: 14px;
}
h2 {
@extend .fw7;
@extend .fw6;
@extend .fs24;
}
@ -68,12 +70,14 @@
}
.availability {
button {
label {
width: max-content;
border: none;
color: white;
font-weight: 600;
cursor: default;
padding: 2px 11px;
margin: 0;
padding: 1px 8px 3px 8px;
background: $button-danger;
&.active {
@ -155,6 +159,7 @@
.product-price {
height: unset;
line-height: 38px;
.price-from {
.bundle-regular-price {
@ -354,14 +359,6 @@
}
}
.accordian {
&.active {
.accordian-header {
padding-bottom: 0px;
}
}
}
.description {
overflow: auto;
ul,
@ -372,13 +369,11 @@
}
.accordian-content {
div {
overflow: auto;
}
font-weight: 400;
font-size: 16px;
}
.full-description {
font-size: 14px;
ul,
ol {
margin: revert;
@ -387,6 +382,8 @@
}
.full-specifications {
width: 100%;
tr {
td:first-child() {
width: 100px;

View File

@ -56,7 +56,7 @@ body {
}
}
.mini-cart-container {
.mini-cart-btn {
#mini-cart {
.badge {
top: -8px;
@ -103,7 +103,7 @@ body {
}
}
.main-content-wrapper .vc-header .mini-cart-container {
.main-content-wrapper .vc-header .mini-cart-btn {
#mini-cart {
.badge {
top: -6px;

View File

@ -611,7 +611,8 @@
.product-image {
@extend .bg-image;
height: 100%;
width: 70px;
height: 70px;
background-position: center;
}
@ -621,7 +622,10 @@
padding: 10px 0 !important;
.product-name {
font-size: 18px;
color: #000000;
width: 100%;
margin-bottom: 10px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;

View File

@ -1,11 +1,3 @@
/*
|
| Added back again because in chrome this is not using and light house also saying not used.
| But in mozilla all fonts are gone which creating problem.
|
*/
@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro&display=swap');
/*
|--------------------------------------------------------------------------
| Velocity Variables

View File

@ -1,4 +1,4 @@
<div class="mini-cart-container">
<a class="mini-cart-btn">
<mini-cart
is-tax-inclusive="{{ Webkul\Tax\Helpers\Tax::isTaxInclusive() }}"
view-cart-route="{{ route('shop.checkout.cart.index') }}"
@ -9,4 +9,4 @@
checkout-text="{{ __('shop::app.minicart.checkout') }}"
subtotal-text="{{ __('shop::app.checkout.cart.cart-subtotal') }}">
</mini-cart>
</div>
</a>

View File

@ -3,7 +3,7 @@
{{-- this is default content if js is not loaded --}}
<div class="main-category fs16 unselectable fw6 left">
<i class="rango-view-list text-down-4 align-vertical-top fs18"></i>
<i class="rango-view-list align-vertical-top fs18"></i>
<span class="pl5">{{ __('velocity::app.menu-navbar.text-category') }}</span>
</div>

View File

@ -100,7 +100,7 @@
{{-- right-section --}}
<div class="right col-lg-7 col-md-6">
{{-- product-info-section --}}
<div class="row info">
<div class="info">
<h2 class="col-12">{{ $product->name }}</h2>
@if ($total)
@ -141,7 +141,27 @@
</div>
@endif
<div class="product-actions">
@include ('shop::products.view.configurable-options')
@include ('shop::products.view.downloadable')
@include ('shop::products.view.grouped-products')
@include ('shop::products.view.bundle-options')
{!! view_render_event('bagisto.shop.products.view.quantity.before', ['product' => $product]) !!}
@if ($product->getTypeInstance()->showQuantityBox())
<div class="col-12">
<quantity-changer quantity-text="{{ __('shop::app.products.quantity') }}"></quantity-changer>
</div>
@else
<input type="hidden" name="quantity" value="1">
@endif
{!! view_render_event('bagisto.shop.products.view.quantity.after', ['product' => $product]) !!}
<div class="col-12 product-actions">
@if (core()->getConfigData('catalog.products.storefront.buy_now_button_display'))
@include ('shop::products.buy-now', [
'product' => $product,
@ -158,38 +178,7 @@
</div>
</div>
{!! view_render_event('bagisto.shop.products.view.short_description.before', ['product' => $product]) !!}
@if ($product->short_description)
<div class="description">
<h3 class="col-lg-12">{{ __('velocity::app.products.short-description') }}</h3>
{!! $product->short_description !!}
</div>
@endif
{!! view_render_event('bagisto.shop.products.view.short_description.after', ['product' => $product]) !!}
{!! view_render_event('bagisto.shop.products.view.quantity.before', ['product' => $product]) !!}
@if ($product->getTypeInstance()->showQuantityBox())
<div>
<quantity-changer quantity-text="{{ __('shop::app.products.quantity') }}"></quantity-changer>
</div>
@else
<input type="hidden" name="quantity" value="1">
@endif
{!! view_render_event('bagisto.shop.products.view.quantity.after', ['product' => $product]) !!}
@include ('shop::products.view.configurable-options')
@include ('shop::products.view.downloadable')
@include ('shop::products.view.grouped-products')
@include ('shop::products.view.bundle-options')
@include ('shop::products.view.short-description')
@include ('shop::products.view.attributes', [
'active' => true

View File

@ -18,7 +18,7 @@
@push('scripts')
<script type="text/x-template" id="bundle-option-list-template">
<div class="bundle-options-wrapper">
<div class="col-12 bundle-options-wrapper">
<div class="bundle-option-list">
<h3>{{ __('shop::app.products.customize-options') }}</h3>

View File

@ -16,7 +16,7 @@
@push('scripts')
<script type="text/x-template" id="product-options-template">
<div class="attributes" v-if="childAttributes.length > 0">
<div class="col-12 attributes" v-if="childAttributes.length > 0">
<input
type="hidden"
:value="selectedProductId"

View File

@ -1,7 +1,7 @@
@if ($product->type == 'downloadable')
{!! view_render_event('bagisto.shop.products.view.downloadable.before', ['product' => $product]) !!}
<div class="downloadable-container">
<div class="col-12 downloadable-container">
@if ($product->downloadable_samples->count())
<div class="sample-list">

View File

@ -1,7 +1,7 @@
@if ($product->type == 'grouped')
{!! view_render_event('bagisto.shop.products.view.grouped_products.before', ['product' => $product]) !!}
<div class="grouped-product-container">
<div class="col-12 grouped-product-container">
@if ($product->groupedProductsBySortOrder->count())
<div class="grouped-product-list">
<ul type="none">

View File

@ -0,0 +1,19 @@
{!! view_render_event('bagisto.shop.products.view.short_description.before', ['product' => $product]) !!}
<accordian :title="'{{ __('shop::app.products.short-description') }}'" :active="true">
<div slot="header">
<h3 class="no-margin display-inbl">
{{ __('velocity::app.products.short-description') }}
</h3>
<i class="rango-arrow"></i>
</div>
<div slot="body">
<div class="full-short-description">
{!! $product->short_description !!}
</div>
</div>
</accordian>
{!! view_render_event('bagisto.shop.products.view.short_description.after', ['product' => $product]) !!}

View File

@ -1,8 +1,7 @@
{!! view_render_event('bagisto.shop.products.view.stock.before', ['product' => $product]) !!}
<div class="col-12 availability">
<button
type="button"
<label
class="{{! $product->haveSufficientQuantity(1) ? '' : 'active' }} disable-box-shadow">
@if ( $product->haveSufficientQuantity(1) === true )
{{ __('shop::app.products.in-stock') }}
@ -11,7 +10,7 @@
@else
{{ __('shop::app.products.out-of-stock') }}
@endif
</button>
</label>
</div>
{!! view_render_event('bagisto.shop.products.view.stock.after', ['product' => $product]) !!}