From b4aa627f7f3e6917eba89d0bea61eaaaab6c2aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?GEGULA=EF=BF=BD?= Date: Fri, 4 Aug 2017 11:45:34 +0800 Subject: [PATCH] tracorder IMPORTER --- Importer/trackorder.html | 124 +++++++----------- .../horizontal-timeline.js | 2 +- assets/pages/css/timeline-old.css | 2 +- 3 files changed, 53 insertions(+), 75 deletions(-) diff --git a/Importer/trackorder.html b/Importer/trackorder.html index eb161d2..9ce608f 100644 --- a/Importer/trackorder.html +++ b/Importer/trackorder.html @@ -320,12 +320,12 @@ License: You must have a valid license purchased only from themeforest(the above
- Milestone + Milestone (Order No : 014587)
-
+
@@ -334,7 +334,7 @@ License: You must have a valid license purchased only from themeforest(the above 1 Jan
Order Date
  • - 10 Jan
    WH Received
    + 17 Jan
    WH Received
  • 19 Jan
    CTN Loading
    @@ -346,13 +346,13 @@ License: You must have a valid license purchased only from themeforest(the above 5 Feb
    ETA
  • - 20 Feb
    Custom Cleareance
    + 10 Feb
    Custom Cleareance
  • - 05 Mar
    Delivery Arrangement
    + 17 Feb
    Delivery Arrangement
  • - 30 Mar
    Delivery
    + 20 Feb
    Delivery
  • @@ -393,12 +393,16 @@ License: You must have a valid license purchased only from themeforest(the above
    - - -
    -
    - - + +

    00005

    + +

    PO & SO

    + +

    03-07-2017

    + +

    123456

    + +

    12,000.00(RMB)

  • @@ -418,18 +422,14 @@ License: You must have a valid license purchased only from themeforest(the above
    - - - - - - + +

    01-01-2017

    + +

    20

    + +

    Warehouse received xxx

    -
    - - -
  • @@ -448,18 +448,14 @@ License: You must have a valid license purchased only from themeforest(the above
    - - - - - - + +

    02-02-2017

    + +

    05-02-2017

    + +

    07-02-2017

    -
    - - -
  • @@ -477,14 +473,10 @@ License: You must have a valid license purchased only from themeforest(the above
    - - - - -
    -
    - - + +

    01-02-2017

    + +

    Estimated time delivery

  • @@ -503,16 +495,18 @@ License: You must have a valid license purchased only from themeforest(the above
  • - - - - - - + +

    02-02-2017

    + +

    Blok 3730, Persiaran Apec, 63000 Cyberjaya, Selangor

    + + + +
    - +
  • @@ -531,14 +525,10 @@ License: You must have a valid license purchased only from themeforest(the above
  • - - - - -
    -
    - - + +

    06-02-2017

    + +

    Customs cleareance finish

  • @@ -607,25 +597,13 @@ License: You must have a valid license purchased only from themeforest(the above

  • -

    - Delivery Request Accepted by Linda Wong
    -
    - - - 25 Mar 2017 - -
    -
    -
    -
    - Delivery Arrangement Completed by Linda Wong
    -
    - - - 31 Mar 2017 - -
    + + +
    +
    + +
    diff --git a/assets/global/plugins/horizontal-timeline/horizontal-timeline.js b/assets/global/plugins/horizontal-timeline/horizontal-timeline.js index 1955ff0..136faa5 100644 --- a/assets/global/plugins/horizontal-timeline/horizontal-timeline.js +++ b/assets/global/plugins/horizontal-timeline/horizontal-timeline.js @@ -6,7 +6,7 @@ jQuery(document).ready(function($){ function initTimeline(timelines) { timelines.each(function(){ - var qweqwe = $(this).data('spacing') - 65; + var qweqwe = $(this).data('spacing') - 69; eventsMinDistance = qweqwe; var timeline = $(this), timelineComponents = {}; diff --git a/assets/pages/css/timeline-old.css b/assets/pages/css/timeline-old.css index 4bc2745..d444a84 100644 --- a/assets/pages/css/timeline-old.css +++ b/assets/pages/css/timeline-old.css @@ -267,7 +267,7 @@ Timeline UI Base color: #555555; } -@media (max-width: 767px) { +@media (max-width: 700px) { timeline > li .timeline-time span.time { font-size: 18px; }