diff --git a/htmlpage/static/favicon.ico b/htmlpage/static/favicon.ico index 2f7e078a..02cf1de8 100644 Binary files a/htmlpage/static/favicon.ico and b/htmlpage/static/favicon.ico differ diff --git a/htmlpage/static/img/nidus-logo-256-transparent.png b/htmlpage/static/img/nidus-logo-256-transparent.png index a5aae515..d6fbe669 100644 Binary files a/htmlpage/static/img/nidus-logo-256-transparent.png and b/htmlpage/static/img/nidus-logo-256-transparent.png differ diff --git a/htmlpage/static/img/nidus-logo-no-lettering-64.png b/htmlpage/static/img/nidus-logo-no-lettering-64.png new file mode 100644 index 00000000..8cc5606b Binary files /dev/null and b/htmlpage/static/img/nidus-logo-no-lettering-64.png differ diff --git a/sync/dash.go b/sync/dash.go index 477704aa..ae855655 100644 --- a/sync/dash.go +++ b/sync/dash.go @@ -67,12 +67,6 @@ func getDistrict(w http.ResponseWriter, r *http.Request) { htmlpage.RenderOrError(w, districtT, &context) } -func getFavicon(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-type", "image/x-icon") - - http.ServeFile(w, r, "static/favicon.ico") -} - func getRoot(w http.ResponseWriter, r *http.Request) { user, err := auth.GetAuthenticatedUser(r) if err != nil { diff --git a/sync/routes.go b/sync/routes.go index 369bedd2..8c57a09b 100644 --- a/sync/routes.go +++ b/sync/routes.go @@ -16,7 +16,6 @@ func Router() chi.Router { r.Get("/arcgis/oauth/begin", getArcgisOauthBegin) r.Get("/arcgis/oauth/callback", getArcgisOauthCallback) r.Get("/district", getDistrict) - r.Get("/favicon.ico", getFavicon) r.Get("/mock", renderMock("mock-root")) r.Get("/mock/admin", renderMock("admin")) diff --git a/sync/template/authenticated.html b/sync/template/authenticated.html index f9f76158..0ffb64e6 100644 --- a/sync/template/authenticated.html +++ b/sync/template/authenticated.html @@ -8,6 +8,8 @@ + + {{block "extraheader" .}} {{end}} diff --git a/sync/template/base.html b/sync/template/base.html index f1304fbb..5cd8657e 100644 --- a/sync/template/base.html +++ b/sync/template/base.html @@ -10,6 +10,8 @@ + + {{block "extraheader" .}} {{end}} diff --git a/sync/template/components/header.html b/sync/template/components/header.html index 04409b21..93e806df 100644 --- a/sync/template/components/header.html +++ b/sync/template/components/header.html @@ -3,9 +3,7 @@
-
- Your Logo -
+ @@ -19,12 +17,6 @@
  • Dashboard
    • -
  • - Projects -
    • -
  • - Maps -
    • diff --git a/sync/template/oauth-prompt.html b/sync/template/oauth-prompt.html index f57f32ca..0bc6a645 100644 --- a/sync/template/oauth-prompt.html +++ b/sync/template/oauth-prompt.html @@ -17,20 +17,6 @@ margin-bottom: 25px; text-align: center; } - .logo-area { - text-align: center; - margin-bottom: 30px; - } - .logo-placeholder { - width: 120px; - height: 60px; - background-color: #e9ecef; - margin: 0 auto; - display: flex; - align-items: center; - justify-content: center; - border-radius: 6px; - } .steps-container { margin: 30px 0; } @@ -48,13 +34,6 @@ {{define "content"}}
    - -
    -
    - Your Logo -
    -
    -

    Connect Your ArcGIS Account

    diff --git a/sync/template/signup.html b/sync/template/signup.html index 70b2d201..a44e93da 100644 --- a/sync/template/signup.html +++ b/sync/template/signup.html @@ -26,28 +26,11 @@ text-align: center; margin-bottom: 30px; } - .logo-placeholder { - width: 120px; - height: 60px; - background-color: #e9ecef; - margin: 0 auto; - display: flex; - align-items: center; - justify-content: center; - border-radius: 6px; - } {{end}} {{define "content"}}
    - -
    -
    - Your Logo -
    -
    -
    @@ -90,8 +73,9 @@
    -

    Account Information

    -

    What you need to know

    +
    + +
    Who should register?