diff --git a/public/Forwarder/chat.html b/public/Forwarder/chat.html index 9c544ec..f9b3edc 100644 --- a/public/Forwarder/chat.html +++ b/public/Forwarder/chat.html @@ -1010,12 +1010,11 @@ - -
+ - diff --git a/public/Forwarder/shippingorderstatus.html b/public/Forwarder/shippingorderstatus.html index c87061a..a6a5705 100644 --- a/public/Forwarder/shippingorderstatus.html +++ b/public/Forwarder/shippingorderstatus.html @@ -60,13 +60,16 @@ License: You must have a valid license purchased only from themeforest(the above margin-right: -100%; } } + .dropdown-menu{ + min-width: 100px; + } .table td, .table th { - font-size: 10px; + font-size: 12px; text-align:center; vertical-align: middle; } .table thead tr th{ - font-size: 10px; + font-size: 12px; text-align:center; vertical-align: middle; } @@ -113,8 +116,9 @@ License: You must have a valid license purchased only from themeforest(the above -
+
@@ -315,9 +282,7 @@ License: You must have a valid license purchased only from themeforest(the above
| No | - Order No + | Order No - |
Date - + |
- Marking + | Marking - + |
Supplier - |
- Warehouse Name + | Warehouse Name - |
Total CBM - |
Total Weight - |
Total Carton - |
Action - |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| |
001254 | 03-07-2017 | @@ -461,13 +377,14 @@ License: You must have a valid license purchased only from themeforest(the above14 |
-
+
|
||||||||
| |
012546 | 02-07-2017 | @@ -479,12 +396,14 @@ License: You must have a valid license purchased only from themeforest(the above17 |
- |
||||||||
| |
015423 | 01-07-2017 | @@ -496,12 +415,14 @@ License: You must have a valid license purchased only from themeforest(the above11 |
- |
||||||||
| |
011254 | 01-07-2017 | @@ -513,7 +434,9 @@ License: You must have a valid license purchased only from themeforest(the above19 |
- |
@@ -554,20 +477,221 @@ License: You must have a valid license purchased only from themeforest(the above
-
+
+
+<<<<<<< HEAD
+=======
+>>>>>>> 76243987fe20e4ef2698f43285e37fa4feb1f9bb
diff --git a/public/Importer/notice.html b/public/Importer/notice.html
index 9613909..5e625dc 100644
--- a/public/Importer/notice.html
+++ b/public/Importer/notice.html
@@ -97,7 +97,11 @@ License: You must have a valid license purchased only from themeforest(the above