From a78cc0b3b76cfbe54fc2f064e3f29a6231783038 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Thu, 6 Jun 2019 11:14:54 +0530 Subject: [PATCH] removed margin classes from shop to UI --- .../Http/Controllers/CartRuleController.php | 2 - .../Shop/src/Resources/assets/sass/app.scss | 110 ------------------ .../Ui/src/Resources/assets/sass/app.scss | 4 - 3 files changed, 116 deletions(-) diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index aca8d490e..e6427031b 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -144,8 +144,6 @@ class CartRuleController extends Controller unset($data['cart_attributes']); unset($data['attributes']); - // unset($data['all_conditions']); - if (isset($data['disc_amount']) && $data['action_type'] == config('pricerules.cart.validations.2')) { $data['actions'] = [ 'action_type' => $data['action_type'], diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index db79dd970..f6e235150 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -38,116 +38,6 @@ input { border-radius: 0px !important; } -//margin bottom classes -.mb-10 { - margin-bottom: 10px; -} - -.mb-15 { - margin-bottom: 15px; -} - -.mb-20 { - margin-bottom: 20px; -} - -.mb-25 { - margin-bottom: 25px; -} - -.mb-30 { - margin-bottom: 30px; -} - -.mb-35 { - margin-bottom: 35px; -} - -.mb-40 { - margin-bottom: 40px; -} - -.mb-45 { - margin-bottom: 45px; -} - -.mb-50 { - margin-bottom: 50px; -} - -.mb-60 { - margin-bottom: 60px; -} - -.mb-70 { - margin-bottom: 70px; -} - -.mb-80 { - margin-bottom: 80px; -} - -.mb-90 { - margin-bottom: 90px; -} - -//margin-top -.mt-5 { - margin-top: 5px; -} - -.mt-10 { - margin-top: 10px; -} - -.mt-15 { - margin-top: 15px; -} - -.mt-20 { - margin-top: 20px; -} - -.mt-25 { - margin-top: 25px; -} - -.mt-30 { - margin-top: 30px; -} - -.mt-35 { - margin-top: 35px; -} - -.mt-40 { - margin-top: 40px; -} - -.mt-45 { - margin-top: 45px; -} - -.mt-50 { - margin-top: 50px; -} - -.mt-60 { - margin-top: 60px; -} - -.mt-70 { - margin-top: 70px; -} - -.mt-80 { - margin-top: 80px; -} - -.mt-90 { - margin-top: 90px; -} - //pagination .pagination.shop{ display: flex; diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index 8c83a391c..d4413f8bf 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -16,10 +16,6 @@ } //margin bottom classes -.mb-5 { - margin-bottom: 5px; -} - .mb-10 { margin-bottom: 10px; }