This repository has been archived by the owner on Oct 15, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 941
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2602 from amoraleda/amoraleda/flight-routes
Flight Routes: Solved timezone issues
- Loading branch information
Showing
4 changed files
with
373 additions
and
291 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,55 @@ | ||
| <div class="tile__heading"> | ||
| <div class="tile__date"> | ||
| <div class="tile__week">{{departing.weekday}}</div> | ||
| <div class="tile__day">{{departing.day}}</div> | ||
| <div class="tile__heading {{#if has_landed}}tile__landed{{/if}} {{#if is_cancelled}}tile__cancelled{{/if}}"> | ||
| <div class="tile__date text--secondary tx--13"> | ||
| <div class="tile__week">{{airlineName}} {{flightNumber}}</div> | ||
| <div class="tile__day">{{departing.departureDateF}}</div> | ||
| </div> | ||
| <h5 class="tile__flightID"> | ||
| {{airlineName}} {{flightNumber}} | ||
| </h5> | ||
| <div class="tile__airports"> | ||
| {{departing.airport}} to {{arriving.airport}} | ||
| <div class="tile__flightID text--primary tx--16"> | ||
| {{departing.airport.fs}} to {{arriving.airport.fs}} | ||
| </div> | ||
| <div> | ||
| <span class="tile__status"> | ||
| {{{airline_status flight departureDate arrivalDate scheduledDepartureDate scheduledArrivalDate}}} | ||
| </span> | ||
| <div class="tx-clr--dk2"> | ||
| <span class="tile__status tx-{{statusColor}}"> | ||
| {{status}} | ||
| </span> {{#unless is_cancelled}}– {{status_text}} {{datetime}}{{#if delay_time}} (+{{delay_time}}){{/if}}{{/unless}} | ||
| </div> | ||
| </div> | ||
| <div class="half"> | ||
| <div class="tile__schedule">Scheduled Departure: {{airline_time departing.isDeparted scheduledArrivalDate scheduledDepartureDate}}</div> | ||
| <div class="tile__time">{{airline_time departing.isDeparted arrivalDate departureDate}}</div> | ||
| <div>Gate {{{departing.gate}}} - Terminal {{{departing.terminal}}}</div> | ||
|
|
||
| <div class="progress__bar bg-clr--platinum-light"> | ||
| <div class="progress__complete bg-{{statusColor}}" style="width: {{progress_percent}}%;"></div> | ||
| {{#if has_arrived}} | ||
| <!-- progress dot not displayed --> | ||
| {{else}} | ||
| <div class="dot bg-{{statusColor}} tx-clr--white" style="left: {{progress_percent}}%;"></div> | ||
| {{/if}} | ||
| </div> | ||
|
|
||
| <div class="tile__departure"> | ||
| <table class="whole"> | ||
| <tr class="tx-clr--lt"> | ||
| <td>DEPARTURE</td> | ||
| <td>SCHEDULED</td> | ||
| <td>GATE</td> | ||
| <td>TERMINAL</td> | ||
| </tr> | ||
| <tr class="text--primary tx--16"> | ||
| <td>{{departing.location}}</td> | ||
| <td {{#if delay_time}}class="tx--clr-red"{{/if}}>{{scheduled_depart}}</td> | ||
| <td>{{departing.gate}}</td> | ||
| <td>{{departing.terminal}}</td> | ||
| </tr> | ||
| <tr> | ||
| <td colspan="4"><hr class="divider bg-clr--platinum-light"></td> | ||
| </tr> | ||
| <tr class="tx-clr--lt"> | ||
| <td>ARRIVAL</td> | ||
| <td>SCHEDULED</td> | ||
| <td>GATE</td> | ||
| <td>TERMINAL</td> | ||
| </tr> | ||
| <tr class="text--primary tx--16"> | ||
| <td>{{arriving.location}}</td> | ||
| <td {{#if delay_time}}class="tx--clr-red"{{/if}}>{{scheduled_arrival}}</td> | ||
| <td>{{arriving.gate}}</td> | ||
| <td>{{arriving.terminal}}</td> | ||
| </tr> | ||
| </table> | ||
| </div> | ||
| <div class="half"> | ||
| <div class="tile__schedule">Scheduled Arrival: {{airline_time arriving.isDeparted scheduledArrivalDate scheduledDepartureDate}}</div> | ||
| <div class="tile__time">{{airline_time arriving.isDeparted arrivalDate departureDate}}</div> | ||
| <div>Gate {{{arriving.gate}}} - Terminal {{{arriving.terminal}}}</div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,56 @@ | ||
| .tile--route { | ||
| width: 37em; | ||
| padding: 1.44em; | ||
| } | ||
|
|
||
| .zci--route .tile__schedule { | ||
| color: #878787; | ||
| font-size: 12px; | ||
| .zci--route .text--primary { | ||
| line-height: 1.3em; | ||
| } | ||
|
|
||
| .zci--route .tile__time { | ||
| font-size: 2em; | ||
| .zci--route .text--secondary { | ||
| line-height: 1.3em; | ||
| } | ||
|
|
||
| .zci--route .tile__heading { | ||
| margin-bottom: 1em; | ||
| .zci--route td { | ||
| padding: 0px 1em 0px 0px; | ||
| vertical-align: top; | ||
| } | ||
|
|
||
| .zci--route .tile__flightID { | ||
| font-size: 2em; | ||
| padding-bottom: 0; | ||
| padding-top: 0; | ||
| .zci--route td:first-child { | ||
| padding-left: 0px; | ||
| } | ||
|
|
||
| .zci--route .tile__airports { | ||
| font-size: 1.5em; | ||
| padding-bottom: 0; | ||
| padding-top: 0; | ||
| margin-top: -0.2em; | ||
| .zci--route td:last-child { | ||
| padding-right: 0px; | ||
| } | ||
|
|
||
| .zci--route .tile__ok { | ||
| color: #60AB5D; | ||
| .zci--route .divider { | ||
| height: 1px; | ||
| border: 0; | ||
| margin: 1.2em 0; | ||
| } | ||
|
|
||
| .zci--route .tile__not { | ||
| color: #C14316; | ||
| .zci--route .dot { | ||
| border-radius: 50%; | ||
| width: 4px; | ||
| height: 4px; | ||
| border: solid 2px; | ||
| display: inline-block; | ||
| position: relative; | ||
| top: -9px; | ||
| } | ||
|
|
||
| .zci--route .tile__date { | ||
| color: #B3B3B3; | ||
| float: right; | ||
| text-align: center; | ||
| font-weight: 600; | ||
| } | ||
|
|
||
| .zci--route .tile__week { | ||
| font-size: 12px; | ||
| .zci--route .progress__bar { | ||
| width: 100%; | ||
| height: 2px; | ||
| margin: 1em 0px 1em 0px; | ||
| } | ||
|
|
||
| .zci--route .tile__day { | ||
| line-height: 12px; | ||
| font-size: 1.5em; | ||
| .zci--route .progress__complete { | ||
| height: 2px; | ||
| } | ||
|
|
||
| .zci--route .na { | ||
| color: #999; | ||
| .zci--route .tile__date { | ||
| float: right; | ||
| text-align: right; | ||
| padding-top: 3px; | ||
| } | ||
|
|
||
| .is-mobile .tile--route { | ||
| width: 100%; | ||
| } |
Oops, something went wrong.