Skip to content

Update Favicon #1005

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

Merged
merged 2 commits into from
Feb 5, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
/target/
**/*.rs.bk
/node_modules
Expand Down
8 changes: 0 additions & 8 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,6 @@ fn index() -> Template {
render_index(ENGLISH.into())
}

#[get("/favicon.ico", rank = 0)]
fn favicon() -> Option<Cached<NamedFile>> {
NamedFile::open("static/images/favicon.ico")
.ok()
.map(|file| file.cached(vec![CacheDirective::MaxAge(3600)]))
}

#[get("/<locale>", rank = 3)]
fn index_locale(locale: SupportedLocale) -> Template {
render_index(locale.0)
Expand Down Expand Up @@ -493,7 +486,6 @@ fn main() {
sponsors,
subject,
files,
favicon,
logos,
components,
index_locale,
Expand Down
Binary file modified static/images/android-chrome-192x192.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 modified static/images/android-chrome-512x512.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 modified static/images/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions static/images/browserconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#00aba9</TileColor>
<square150x150logo src="/static/images/mstile-150x150.png?v=ngJW8jGAmR"/>
<TileColor>#ffffff</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file modified static/images/favicon-16x16.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 modified static/images/favicon-32x32.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 modified static/images/favicon.ico
Binary file not shown.
Binary file removed static/images/goldberg.jpg
Binary file not shown.
Binary file modified static/images/mstile-144x144.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 modified static/images/mstile-150x150.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 modified static/images/mstile-310x150.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 modified static/images/mstile-310x310.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 modified static/images/mstile-70x70.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 static/images/rust-logo-purple.png
Binary file not shown.
Binary file removed static/images/rust-logo-purple2.png
Binary file not shown.
2 changes: 1 addition & 1 deletion static/images/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions static/images/site.webmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Binary file removed static/images/wordpress.png
Binary file not shown.
20 changes: 9 additions & 11 deletions templates/components/layout.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,22 @@
<meta property="og:type" content="website" />
<meta property="og:locale" content="en_US" />

<!-- Windows Shortcut Theme -->
<meta name="msapplication-TileColor" content="#00aba9">
<meta name="theme-color" content="#ffffff">


<!-- styles -->
<link rel="stylesheet" href="/static/styles/solarized-dark.css"/>
<link rel="stylesheet" href="{{assets.css.vendor}}"/>
<link rel="stylesheet" href="{{assets.css.fonts}}"/>
<link rel="stylesheet" href="{{assets.css.app}}"/>

<!-- favicon -->
<link rel="apple-touch-icon" sizes="180x180" href="/static/images/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/static/images/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/static/images/favicon-16x16.png">
<link rel="shortcut icon" href="/static/images/favicon.ico">
<link rel="manifest" href="/static/images/site.webmanifest">
<link rel="mask-icon" href="/static/images/safari-pinned-tab.svg" color="#5bbad5">
<link rel="apple-touch-icon" sizes="180x180" href="/static/images/apple-touch-icon.png?v=ngJW8jGAmR">
<link rel="icon" type="image/png" sizes="32x32" href="/static/images/favicon-32x32.png?v=ngJW8jGAmR">
<link rel="icon" type="image/png" sizes="16x16" href="/static/images/favicon-16x16.png?v=ngJW8jGAmR">
<link rel="manifest" href="/static/images/site.webmanifest?v=ngJW8jGAmR">
<link rel="mask-icon" href="/static/images/safari-pinned-tab.svg?v=ngJW8jGAmR" color="#000000">
<link rel="shortcut icon" href="/static/images/favicon.ico?v=ngJW8jGAmR">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-config" content="/static/images/browserconfig.xml?v=ngJW8jGAmR">
<meta name="theme-color" content="#ffffff">

{{#if is_landing}}
<!-- locales -->
Expand Down