From ab747b34036ea242982deee4386a41dfbee53b39 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 18 Aug 2021 15:54:38 +0800 Subject: [PATCH] large commit --- .../assets/sass/modules/_typography.scss | 1 + .../CustomerProfileSectionComponent.vue | 4 +- .../sections/OnBoardingSectionComponent.vue | 2 +- .../orders/elements/QuickOrderComponent.vue | 2 +- resources/views/layouts/base_portal.blade.php | 72 +++++++++++++++- resources/views/partials/menu.blade.php | 84 +------------------ 6 files changed, 78 insertions(+), 87 deletions(-) diff --git a/resources/assets/sass/modules/_typography.scss b/resources/assets/sass/modules/_typography.scss index 8fa063fe..f72c91ce 100644 --- a/resources/assets/sass/modules/_typography.scss +++ b/resources/assets/sass/modules/_typography.scss @@ -297,6 +297,7 @@ hr{ .bg-info-primary-gradient { background: linear-gradient($color-info, $color-primary); } + /* Primary ------------------------------------ */ diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue index a57f5353..749e7ef8 100644 --- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue @@ -31,11 +31,11 @@
-
+
Or Select a different warehouse & delivery address
-
+
diff --git a/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue b/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue index 5f59a13d..c7b5b154 100644 --- a/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue @@ -91,7 +91,7 @@
- +
diff --git a/resources/assets/vue/components/orders/elements/QuickOrderComponent.vue b/resources/assets/vue/components/orders/elements/QuickOrderComponent.vue index c6d9158d..e6b1d167 100644 --- a/resources/assets/vue/components/orders/elements/QuickOrderComponent.vue +++ b/resources/assets/vue/components/orders/elements/QuickOrderComponent.vue @@ -42,7 +42,7 @@
-
+
diff --git a/resources/views/layouts/base_portal.blade.php b/resources/views/layouts/base_portal.blade.php index 00d7e316..452d1560 100644 --- a/resources/views/layouts/base_portal.blade.php +++ b/resources/views/layouts/base_portal.blade.php @@ -7,7 +7,7 @@
-
+
@include('partials.menu')
@@ -23,6 +23,76 @@
+
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 958fa52b..90d7d4d2 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -1,4 +1,4 @@ -
+
@@ -104,7 +104,7 @@
-
Contact Us
+
Contact Us
@@ -113,83 +113,3 @@
-