From 861c6697724b56a152a3b9b1bd2cdcd7c1a176c8 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Fri, 3 Apr 2020 13:44:52 -0600 Subject: [PATCH] Toolbox: Center UIs in middle of screen with max width (#36) --- www/assets/css/tablet.css | 4 +- www/pages/add.html | 4 +- www/pages/toolbox.html | 90 +++++++------ www/pages/toolbox/addrlookup.html | 180 +++++++++++++------------ www/pages/toolbox/scanner.html | 58 ++++---- www/pages/toolbox/scanner/entries.html | 64 ++++----- www/pages/toolbox/scanner/scanner.html | 12 +- www/pages/toolbox/sharelist.html | 88 ++++++------ www/pages/toolbox/track.html | 84 ++++++------ www/pages/toolbox/trackinginfo.html | 106 ++++++++------- www/pages/toolbox/weather.html | 43 +++--- 11 files changed, 384 insertions(+), 349 deletions(-) diff --git a/www/assets/css/tablet.css b/www/assets/css/tablet.css index 9fc73a5..9198f3b 100644 --- a/www/assets/css/tablet.css +++ b/www/assets/css/tablet.css @@ -47,7 +47,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. padding-bottom: 0; } - .page[data-name="add"] #add-tab .list { + .elevation-tablet { /* .elevation-3 */ box-shadow: var(--f7-elevation-3)!important; } @@ -63,7 +63,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. } @media all and (min-width: 768px) and (min-height: 700px) { - .page[data-name="add"] #add-tab .page-content { + .margin-top-tablet { margin-top: 1rem; } } \ No newline at end of file diff --git a/www/pages/add.html b/www/pages/add.html index 8f090c8..29e2344 100644 --- a/www/pages/add.html +++ b/www/pages/add.html @@ -61,8 +61,8 @@ -
-
+
+
  • Address
  • diff --git a/www/pages/toolbox.html b/www/pages/toolbox.html index 17149fa..4549a25 100644 --- a/www/pages/toolbox.html +++ b/www/pages/toolbox.html @@ -17,49 +17,53 @@
-
- +
+
+
+ +
+
\ No newline at end of file diff --git a/www/pages/toolbox/addrlookup.html b/www/pages/toolbox/addrlookup.html index 8dd99c5..85e4f2e 100644 --- a/www/pages/toolbox/addrlookup.html +++ b/www/pages/toolbox/addrlookup.html @@ -18,100 +18,104 @@
-
-
    -
  • -
    -
    -
    Number and Street
    -
    - -
    -
    -
    -
    • -
  • -
    -
    -
    -
    City
    -
    - +
    +
    +
    +
      +
    • +
      +
      +
      Number and Street
      +
      + +
      -
    -
    -
    -
    State
    -
    - +
    • +
  • +
    +
    +
    +
    City
    +
    + +
    +
    +
    +
    +
    +
    State
    +
    + +
    +
    +
    +
    +
    +
    ZIP
    +
    + +
    +
    -
-
-
-
ZIP
-
- + +
  • +
    + Lookup +
    +
    • +
  • Result
    • +
    -
    - -
  • -
    - Lookup -
    -
    • -
  • Result
    • - - - - - - - - + + + + + + + + +
    +
    diff --git a/www/pages/toolbox/scanner.html b/www/pages/toolbox/scanner.html index 4e2ceb7..56772e8 100644 --- a/www/pages/toolbox/scanner.html +++ b/www/pages/toolbox/scanner.html @@ -17,34 +17,38 @@
    -
    - -
    +
    +
    +
    + +
    -
    - info -
    - Scan barcodes while your postal scanner is crashed or restarting. - When the scanner is working again, you can scan all the saved - barcodes from your phone screen using the scanner's Manual Input or - Scan Barcode feature. +
    + info +
    + Scan barcodes while your postal scanner is crashed or restarting. + When the scanner is working again, you can scan all the saved + barcodes from your phone screen using the scanner's Manual Input or + Scan Barcode feature. +
    +
    \ No newline at end of file diff --git a/www/pages/toolbox/scanner/entries.html b/www/pages/toolbox/scanner/entries.html index 64d517f..0299917 100644 --- a/www/pages/toolbox/scanner/entries.html +++ b/www/pages/toolbox/scanner/entries.html @@ -22,38 +22,42 @@
    - {{#if entries}} -
    -
      - {{#each entries}} -
    • -
      -
      -
      - +
      +
      + {{#if entries}} +
      +
        + {{#each entries}} +
      • +
        +
        +
        + +
        +
        {{event}}
        +
        {{date}}
        + {{#if form3849}} +

        Form 3849:

        +
        + +
        + {{/if}} +
        -
        {{event}}
        -
        {{date}}
        - {{#if form3849}} -

        Form 3849:

        -
        - -
        - {{/if}} -
      -
      -
      • - {{/each}} -
    + + {{/each}} + +
    + {{else}} +
    + +

    + No scan entries. +

    +
    + {{/if}} +
    - {{else}} -
    - -

    - No scan entries. -

    -
    - {{/if}} diff --git a/www/pages/toolbox/scanner/scanner.html b/www/pages/toolbox/scanner/scanner.html index e9e0cf4..3882606 100644 --- a/www/pages/toolbox/scanner/scanner.html +++ b/www/pages/toolbox/scanner/scanner.html @@ -95,11 +95,15 @@
    -
    -
      -
    +
    +
    +
    +
      +
    +
    +
    +
    -
    diff --git a/www/pages/toolbox/sharelist.html b/www/pages/toolbox/sharelist.html index b56a77f..5b1ca52 100644 --- a/www/pages/toolbox/sharelist.html +++ b/www/pages/toolbox/sharelist.html @@ -17,50 +17,54 @@
    -
    - -
    + + -
    - info -
    - Share your delivery list to another device. The sender uploads the list, - and the receiver(s) either scan the barcode on the sender's device, or - type in the code beneath the barcode. + +
  • Receive List
    • +
  • +
    +
    +
    List ID
    +
    + + +
    +
    +
    +
    • +
  • + Download List +
    • +
  • +
    + Scan List Barcode +
    +
    • + +
    + +
    + info +
    + Share your delivery list to another device. The sender uploads the list, + and the receiver(s) either scan the barcode on the sender's device, or + type in the code beneath the barcode. +
    +
    diff --git a/www/pages/toolbox/track.html b/www/pages/toolbox/track.html index 34fabe5..21e606a 100644 --- a/www/pages/toolbox/track.html +++ b/www/pages/toolbox/track.html @@ -23,49 +23,53 @@
    -
    -
      -
    • -
      -
      Tracking Code
      -
      - - -
      -
      -
      • -
    • - Track -
      • -
    -
    +
    +
    +
    +
      +
    • +
      +
      Tracking Code
      +
      + + +
      +
      +
      • +
    • + Track +
      • +
    +
    -
    - info -
    - Compatible with USPS, UPS, FedEx, and DHL tracking codes. - Can extract full delivery point address (and sometimes customer phone number) - from 2D FedEx and UPS Mail Innovations barcodes. -
    +
    + info +
    + Compatible with USPS, UPS, FedEx, and DHL tracking codes. + Can extract full delivery point address (and sometimes customer phone number) + from 2D FedEx and UPS Mail Innovations barcodes. +
    - {{#if trackingcodehistory}} -
    -
      -
    • - History -
      • - {{#each trackingcodehistory}} -
    • -
      -
      -
      {{this}}
      -
      -
      -
      • - {{/each}} -
    + {{#if trackingcodehistory}} +
    +
      +
    • + History +
      • + {{#each trackingcodehistory}} +
    • +
      +
      +
      {{this}}
      +
      +
      +
      • + {{/each}} +
    +
    + {{/if}} +
    - {{/if}}
    diff --git a/www/pages/toolbox/trackinginfo.html b/www/pages/toolbox/trackinginfo.html index ebda36d..95c0df2 100644 --- a/www/pages/toolbox/trackinginfo.html +++ b/www/pages/toolbox/trackinginfo.html @@ -22,59 +22,63 @@
    -
    -
      -
    • Information
      • -
    • -
      -
      - {{#with current}} -
      -
      {{status}}
      -
      {{date}}
      +
      +
      +
      +
        +
      • Information
        • +
      • +
        +
        + {{#with current}} +
        +
        {{status}}
        +
        {{date}}
        +
        +
        {{details}}
        +
        {{location.display}}
        + {{/with}} +
        -
        {{details}}
        -
        {{location.display}}
        - {{/with}} -
      -
      -
      • -
    • -
      -
      -
      Tracking Code: {{code}}
      -
      Carrier: {{carrier.name}}
      - {{#if service.name}}
      Service: {{service.name}}
      {{/if}} -
      From: {{addresses.from}}
      -
      To: {{addresses.to}}
      -
      -
      -
      • -
    • -
      - -
      -
      • -
    • History
      • - {{#each history}} -
    • -
      -
      -
      -
      {{status}}
      -
      {{date}}
      +
      • +
    • +
      +
      +
      Tracking Code: {{code}}
      +
      Carrier: {{carrier.name}}
      + {{#if service.name}}
      Service: {{service.name}}
      {{/if}} +
      From: {{addresses.from}}
      +
      To: {{addresses.to}}
      +
      -
      {{details}}
      -
      {{location.display}}
      -
    -
    - - {{else}} -
  • - No item history found. -
    • - {{/each}} - + +
  • +
    + +
    +
    • +
  • History
    • + {{#each history}} +
  • +
    +
    +
    +
    {{status}}
    +
    {{date}}
    +
    +
    {{details}}
    +
    {{location.display}}
    +
    +
    +
    • + {{else}} +
  • + No item history found. +
    • + {{/each}} + + + diff --git a/www/pages/toolbox/weather.html b/www/pages/toolbox/weather.html index 3e8579a..81d25e8 100644 --- a/www/pages/toolbox/weather.html +++ b/www/pages/toolbox/weather.html @@ -22,29 +22,32 @@
    +
    +
    +
    + -
    - +
    +
    +

    Low: ...

    +
    +
    +

    High: ...

    +
    +
    +

    Precipitation: ...

    +

    Wind speed: ...

    +
    +
    -
    -
    -

    Low: ...

    +
    + +
    + +
    + +
    -
    -

    High: ...

    -
    -
    -

    Precipitation: ...

    -

    Wind speed: ...

    -
    -
    - -
    - -
    - -
    -