From ab83d5df282c769105c755b9a8e1c5083fd3e79a Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Thu, 24 Dec 2020 19:34:08 +0530 Subject: [PATCH 1/8] Bootstrap 3 Removal In Progress --- .../assets/js/UI/components/sidebar.vue | 2 +- .../src/Resources/assets/sass/app.scss | 5 +- .../Resources/assets/sass/components/app.scss | 2 +- .../Resources/views/shop/UI/header.blade.php | 8 +- .../views/shop/checkout/cart/index.blade.php | 2 +- .../shop/checkout/cart/mini-cart.blade.php | 2 +- .../checkout/onepage/customer-info.blade.php | 4 +- .../customers/account/address/index.blade.php | 2 +- .../customers/account/orders/view.blade.php | 6 +- .../account/partials/sidemenu.blade.php | 2 +- .../customers/account/profile/index.blade.php | 2 +- .../customers/account/reviews/index.blade.php | 2 +- .../account/wishlist/wishlist.blade.php | 2 +- .../shop/customers/session/index.blade.php | 2 +- .../guest/compare/compare-products.blade.php | 2 +- .../views/shop/layouts/master.blade.php | 98 ++----------------- .../views/shop/layouts/scripts.blade.php | 72 ++++++++++++++ .../views/shop/layouts/style.blade.php | 1 - .../views/shop/layouts/styles.blade.php | 18 ++++ .../shop/layouts/top-nav/index.blade.php | 2 +- .../layouts/top-nav/locale-currency.blade.php | 4 +- .../layouts/top-nav/login-section.blade.php | 2 +- .../list/layered-navigation.blade.php | 4 +- .../shop/products/list/toolbar.blade.php | 2 +- 24 files changed, 124 insertions(+), 124 deletions(-) create mode 100644 packages/Webkul/Velocity/src/Resources/views/shop/layouts/scripts.blade.php delete mode 100644 packages/Webkul/Velocity/src/Resources/views/shop/layouts/style.blade.php create mode 100644 packages/Webkul/Velocity/src/Resources/views/shop/layouts/styles.blade.php diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/sidebar.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/sidebar.vue index 812935e32..89b22be56 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/sidebar.vue +++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/sidebar.vue @@ -33,7 +33,7 @@ {{ category['name'] }} diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss index 4f0190cce..17fbc2f89 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss @@ -12,7 +12,6 @@ @import "components/rtl"; @import "static/material-icons"; -@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap"; * { margin: 0; @@ -207,8 +206,6 @@ body { } + .account-modal { - @extend .modal-dialog; - top: 40px; right: 10px; z-index: 101; @@ -414,7 +411,7 @@ header { width: 210px; .select-icon { - top: 9px; + top: -30px; right: 8px; z-index: 10; font-size: 18px; diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss index cfd32a68d..451ad2605 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss @@ -1046,7 +1046,7 @@ } .filter-left { - @extend .pull-left; + float: left; } .filter-right { diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/UI/header.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/UI/header.blade.php index 5627a1ec9..50324e0bc 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/UI/header.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/UI/header.blade.php @@ -23,7 +23,7 @@ + class="material-icons float-right text-dark"> cancel @@ -195,7 +195,7 @@

@{{ subCategory.name }}

- + cancel @@ -248,7 +248,7 @@

{{ __('velocity::app.responsive.header.languages') }}

- cancel + cancel
    @@ -290,7 +290,7 @@

    {{ __('velocity::app.shop.general.currencies') }}

    - cancel + cancel
      diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php index bf821db6b..92706845d 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php @@ -243,7 +243,7 @@ diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/mini-cart.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/mini-cart.blade.php index 079dfd5c2..f3e72a0b5 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/mini-cart.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/mini-cart.blade.php @@ -1,4 +1,4 @@ -
      +
      user()->addresses)) {{ __('shop::app.checkout.onepage.back') }} @@ -226,7 +226,7 @@ @auth('customer') @if(count(auth('customer')->user()->addresses)) {{ __('shop::app.checkout.onepage.back') }} diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php index 0512bcad1..243272120 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php @@ -19,7 +19,7 @@ @if (! $addresses->isEmpty()) + {{ __('shop::app.customer.account.address.index.add') }} diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php index 13882277c..fd64e3675 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php @@ -28,7 +28,7 @@ @if ($order->canCancel()) @@ -208,7 +208,7 @@ {{ __('shop::app.customer.account.order.view.total-due') }} - - + @if($order->status !== 'canceled') {{ core()->formatPrice($order->total_due, $order->order_currency_code) }} @else @@ -231,7 +231,7 @@
      {{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->id]) }} - + {{ __('shop::app.customer.account.order.view.print') }}
      diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php index a2dbe7f67..d0bab2b38 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php @@ -56,7 +56,7 @@ {{ trans($subMenuItem['name']) }} - + @endforeach diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php index 7c3ca3a93..10d9a2c1b 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php @@ -25,7 +25,7 @@ diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php index ceec7da1c..9317508e2 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php @@ -17,7 +17,7 @@ @if (count($reviews) > 1) -