Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2086 Add Lucha Libre Mask #2121

Merged
merged 20 commits into from
Jun 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/views/mobileValidate.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
@import models.amt.AMTAssignmentTable
@import play.api.libs.json.Json
@import play.api.libs.json.JsValue
@import play.api.Play
@import play.api.Play.current
@import views.html.bootstrap._

@(title: String, user: Option[User] = None, mission: Option[JsValue], labelList: Option[JsValue], progress: Option[JsValue], missionSetProgress: Int, hasNextMission: Boolean)(implicit lang: Lang)
Expand Down Expand Up @@ -61,7 +63,7 @@
<div id="modal-mission-holder">
<div id="modal-mission-background" class="modal-background"></div>
<div id="modal-mission-foreground" class="modal-foreground">
<img src='@routes.Assets.at("javascripts/SVValidate/img/logo.png")' id="ps-logo-mission"></img>
<img src='@routes.Assets.at("assets/" + Play.configuration.getString("city-id").get + "/sidewalk-logo.png")' id="ps-logo-mission"></img>
<h1 id="modal-mission-header" class="text-center"></h1>
<div id="modal-mission-instruction"></div>
<button class="button" id="modal-mission-close-button">OK</button>
Expand Down Expand Up @@ -109,7 +111,7 @@ <h1 class="status-holder-header-2" id="label-type-counterexample"></h1>
<div id="modal-mission-complete-holder">
<div id="modal-mission-complete-background" class="modal-background"></div>
<div id="modal-mission-complete-foreground" class="modal-foreground">
<img src='@routes.Assets.at("javascripts/SVValidate/img/logo.png")' id="ps-logo-mission-complete"></img>
<img src='@routes.Assets.at("assets/" + Play.configuration.getString("city-id").get + "/sidewalk-logo.png")' id="ps-logo-mission-complete"></img>
<h1 class="normal" id="modal-mission-complete-title"></h1>
<p><div id="modal-mission-complete-message"></div></p>
<div id="modal-mission-complete-table">
Expand Down Expand Up @@ -138,7 +140,7 @@ <h3>@Messages("validate.mission.complete.category")</h3>
<div id="modal-landscape-holder">
<div id="modal-landscape-background" class="modal-background"></div>
<div id="modal-landscape-foreground" class="modal-foreground">
<img src='@routes.Assets.at("javascripts/SVValidate/img/logo.png")' id="ps-logo-landscape"></img>
<img src='@routes.Assets.at("assets/" + Play.configuration.getString("city-id").get + "/sidewalk-logo.png")' id="ps-logo-landscape"></img>
<div>
<p id="modal-landscape-header">
Welcome to Project Sidewalk!
Expand Down
2 changes: 1 addition & 1 deletion app/views/navbar.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div id="header-container" class="navbar-container container-fluid">
<div class="navbar-header">
<div class="navbar-logo">
<a id="brand navbar-brand" href="/"><img alt="Project Sidewalk Logo" height="40" src='@routes.Assets.at("assets/sidewalk-logo-new.png")'></a>
<a id="brand navbar-brand" href="/"><img alt="Project Sidewalk Logo" height="40" src='@routes.Assets.at("assets/" + Play.configuration.getString("city-id").get + "/sidewalk-logo.png")'></a>
</div>
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
Expand Down
Binary file added public/assets/cdmx/sidewalk-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/columbus-oh/sidewalk-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/logo-lucha-libre-high-res.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/newberg-or/sidewalk-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/seattle-wa/sidewalk-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/sidewalk-logo-new.png
Binary file not shown.
Binary file added public/assets/spgg/sidewalk-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/washington-dc/sidewalk-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.