Skip to content

Commit

Permalink
Merge pull request #160 from bcgov/develop
Browse files Browse the repository at this point in the history
v1.1.1
  • Loading branch information
NicoledeGreef authored Jul 15, 2020
2 parents ed750df + 3aafff5 commit 92fba0c
Show file tree
Hide file tree
Showing 61 changed files with 2,172 additions and 556 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
node_modules
config/key
etc
61 changes: 0 additions & 61 deletions article.css

This file was deleted.

15 changes: 15 additions & 0 deletions config/layer-display.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@
{
"type": "layers",
"display": [
{
"type": "group",
"title": "COVID 19 Relief",
"isVisible": true,
"items": [
{ "id": "covid19-relief-cardlock" },
{ "id": "covid19-relief-food-truck" },
{ "id": "covid19-relief-hotel" },
{ "id": "covid19-relief-inspection-station" },
{ "id": "covid19-relief-portable-toilet" },
{ "id": "covid19-relief-rest-area" },
{ "id": "covid19-relief-temporary-truck-parking" },
{ "id": "covid19-relief-tourist-centre" }
]
},
{
"type": "group",
"title": "Truck Routes",
Expand Down
5 changes: 4 additions & 1 deletion config/map.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@
"url": "https://geocoder.api.gov.bc.ca/",
"parameter": {
"maxDistance": 50,
"locationMode": "input"
"locationMode": "input",
"brief": false,
"minScore": 50,
"echo": true
}
},
"truck": true,
Expand Down
5 changes: 5 additions & 0 deletions fragments/about.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
section.trp-about {
display: flex;
flex-direction: column;
}

section.trp-about p {
margin-top: 0;
font-size: 14px;
Expand Down
4 changes: 2 additions & 2 deletions fragments/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
Do not operate a vehicle while using this application.
</em>
</p>
<img src="images/no_mobile_icon.svg" alt="Graphic warning to discourage using mobile devices" style="max-width: 15rem; align-self: center;">
</div>
<img src="images/no_mobile_icon.svg" alt="Graphic warning to discourage using mobile devices" style="max-width: 12rem; align-self: center;">
<div class="version">Version {{ package.version }}, built {{ package[ 'build-date' ] }}</div>
</section>


76 changes: 0 additions & 76 deletions fragments/disclaimer.css
Original file line number Diff line number Diff line change
@@ -1,80 +1,4 @@
dialog {
top: 50%;
max-width: 57em;
max-height: 80vh;
transform: translateY(-50%);
font-family:"Meta W01 Medium", Arial, Helvetica, sans-serif;
z-index: 3;
padding: 0;
border: none;
min-height: auto;
display: flex;
}

dialog form {
display: flex;
flex-direction: column;
min-height: auto;
}

dialog header {
flex-shrink: 0;
}

dialog section {
flex-shrink: 1;

display:flex;
flex-direction:column;
font-size:18px;
overflow-y: auto;
}

dialog section p {
margin-bottom: 0;
margin-left:18px;
margin-right:18px;
}

img.warningImage {
width: 150px;
align-self: center;
}

dialog menu {
margin: 0;
padding: 5px;
display: flex;
justify-content: center;
flex-shrink: 0;
}

dialog menu button {
background-color:rgb(0, 53, 95);
border: none;
color:rgb(255, 255, 255);
cursor:pointer;
font-size:14px;
outline: none;
padding: 9px;
}

dialog::backdrop {
background-color: black;
opacity: 0.8;
position: fixed;
top: 0px;
right: 0px;
bottom: 0px;
left: 0px;
}

dialog + .backdrop {
background-color: black;
opacity: 0.8;
position: fixed;
top: 0px;
right: 0px;
bottom: 0px;
left: 0px;
}
2 changes: 1 addition & 1 deletion fragments/disclaimer.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<form method="dialog">
<header>
<h1><span class="translink-logo"></span>Truck Route Planner</h1>
<span class="translink-logo"></span>Truck Route Planner
</header>

<section>
Expand Down
16 changes: 5 additions & 11 deletions fragments/feedback.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
<form class="feedback-form"
method="post"
enctype="text/plain"
action="mailto:[email protected]?subject=TRP Beta App Feedback"
>
<form class="feedback-form" method="post" enctype="text/plain" action="mailto:[email protected]?subject=TRP Beta App Feedback">

<input type="hidden" name="version" v-bind:value="package.version">

<label>To submit feedback on this app please fill out our survey:
<a target="_blank" href="https://translink.checkbox.ca/CVRP-Feedback.aspx">TRP-Feedback</a>
Or use this form to email Translink:
</label>

<p>Use this form to email TransLink:</p>

<label class="name">Your name
<input name="name">
Expand All @@ -27,4 +21,4 @@
<button type="reset">Reset</button>
</div>

</form>
</form>
Binary file added images/BCID_H_rgb_pos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions images/gov_bc_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions images/translink-logo-black.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 92fba0c

Please sign in to comment.