diff --git a/.gitignore b/.gitignore index fd757b21b..2f8c49019 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.DS_Store /target/ **/*.rs.bk /node_modules diff --git a/src/main.rs b/src/main.rs index 3ecf2afbf..0f1a4bb9a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -173,13 +173,6 @@ fn index() -> Template { render_index(ENGLISH.into()) } -#[get("/favicon.ico", rank = 0)] -fn favicon() -> Option> { - NamedFile::open("static/images/favicon.ico") - .ok() - .map(|file| file.cached(vec![CacheDirective::MaxAge(3600)])) -} - #[get("/", rank = 3)] fn index_locale(locale: SupportedLocale) -> Template { render_index(locale.0) @@ -493,7 +486,6 @@ fn main() { sponsors, subject, files, - favicon, logos, components, index_locale, diff --git a/static/images/android-chrome-192x192.png b/static/images/android-chrome-192x192.png index eb248ee3e..90bab0144 100644 Binary files a/static/images/android-chrome-192x192.png and b/static/images/android-chrome-192x192.png differ diff --git a/static/images/android-chrome-512x512.png b/static/images/android-chrome-512x512.png index 66db686ef..c3a20859e 100644 Binary files a/static/images/android-chrome-512x512.png and b/static/images/android-chrome-512x512.png differ diff --git a/static/images/apple-touch-icon.png b/static/images/apple-touch-icon.png index 631e00f7d..5dc288d4a 100644 Binary files a/static/images/apple-touch-icon.png and b/static/images/apple-touch-icon.png differ diff --git a/static/images/browserconfig.xml b/static/images/browserconfig.xml index 5aecc916b..63c4f7fb6 100644 --- a/static/images/browserconfig.xml +++ b/static/images/browserconfig.xml @@ -2,8 +2,8 @@ - - #00aba9 + + #ffffff diff --git a/static/images/favicon-16x16.png b/static/images/favicon-16x16.png index a31742a4e..7a3f11f95 100644 Binary files a/static/images/favicon-16x16.png and b/static/images/favicon-16x16.png differ diff --git a/static/images/favicon-32x32.png b/static/images/favicon-32x32.png index c2a10b177..2aa79d898 100644 Binary files a/static/images/favicon-32x32.png and b/static/images/favicon-32x32.png differ diff --git a/static/images/favicon.ico b/static/images/favicon.ico index b8ad23769..4c681bbde 100644 Binary files a/static/images/favicon.ico and b/static/images/favicon.ico differ diff --git a/static/images/goldberg.jpg b/static/images/goldberg.jpg deleted file mode 100644 index e1afbd81f..000000000 Binary files a/static/images/goldberg.jpg and /dev/null differ diff --git a/static/images/mstile-144x144.png b/static/images/mstile-144x144.png index 32098c776..5239bc757 100644 Binary files a/static/images/mstile-144x144.png and b/static/images/mstile-144x144.png differ diff --git a/static/images/mstile-150x150.png b/static/images/mstile-150x150.png index ff56310c4..44c4e10bf 100644 Binary files a/static/images/mstile-150x150.png and b/static/images/mstile-150x150.png differ diff --git a/static/images/mstile-310x150.png b/static/images/mstile-310x150.png index 1a0a8c188..eff5b82bf 100644 Binary files a/static/images/mstile-310x150.png and b/static/images/mstile-310x150.png differ diff --git a/static/images/mstile-310x310.png b/static/images/mstile-310x310.png index 307e3654a..99f01559f 100644 Binary files a/static/images/mstile-310x310.png and b/static/images/mstile-310x310.png differ diff --git a/static/images/mstile-70x70.png b/static/images/mstile-70x70.png index d94c49c8c..3a54845a0 100644 Binary files a/static/images/mstile-70x70.png and b/static/images/mstile-70x70.png differ diff --git a/static/images/rust-logo-purple.png b/static/images/rust-logo-purple.png deleted file mode 100644 index 637d1bc61..000000000 Binary files a/static/images/rust-logo-purple.png and /dev/null differ diff --git a/static/images/rust-logo-purple2.png b/static/images/rust-logo-purple2.png deleted file mode 100644 index 9c6f4e3ee..000000000 Binary files a/static/images/rust-logo-purple2.png and /dev/null differ diff --git a/static/images/safari-pinned-tab.svg b/static/images/safari-pinned-tab.svg index 0c5fcf3fa..da5e246b3 100644 --- a/static/images/safari-pinned-tab.svg +++ b/static/images/safari-pinned-tab.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/site.webmanifest b/static/images/site.webmanifest index b20abb7cb..47b410487 100644 --- a/static/images/site.webmanifest +++ b/static/images/site.webmanifest @@ -3,17 +3,16 @@ "short_name": "", "icons": [ { - "src": "/android-chrome-192x192.png", + "src": "/static/images/android-chrome-192x192.png?v=ngJW8jGAmR", "sizes": "192x192", "type": "image/png" }, { - "src": "/android-chrome-512x512.png", + "src": "/static/images/android-chrome-512x512.png?v=ngJW8jGAmR", "sizes": "512x512", "type": "image/png" } ], "theme_color": "#ffffff", - "background_color": "#ffffff", - "display": "standalone" + "background_color": "#ffffff" } diff --git a/static/images/wordpress.png b/static/images/wordpress.png deleted file mode 100644 index 84efcda34..000000000 Binary files a/static/images/wordpress.png and /dev/null differ diff --git a/templates/components/layout.hbs b/templates/components/layout.hbs index cfa829811..32cf1c045 100644 --- a/templates/components/layout.hbs +++ b/templates/components/layout.hbs @@ -27,11 +27,6 @@ - - - - - @@ -39,12 +34,15 @@ - - - - - - + + + + + + + + + {{#if is_landing}}