diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 6f969ed47f..5e7f04724a 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -42,6 +42,9 @@ margin-right: 6px; width: 12px; display: inline-block; + svg { + max-height: 14px; + } i, path, ellipse { @include opacity(0.5); &.online--icon, &.away--icon { diff --git a/web/static/config/manifest.json b/web/static/config/manifest.json index 8f29460b3b..dd95d917e4 100644 --- a/web/static/config/manifest.json +++ b/web/static/config/manifest.json @@ -1,13 +1,40 @@ { - "name": "Mattermost", - "icons": [ - { - "src": "../static/iamges/icon50x50.png", - "sizes": "50x50", - "type": "image/png" - } - ], - "start_url": "/", - "display": "standalone", - "orientation": "portrait" + "name": "Mattermost", + "icons": [{ + "src": "/static/images/favicon/android-chrome-36x36.png", + "type": "image/png", + "sizes": "36x36" + }, { + "src": "/static/images/favicon/android-chrome-48x48.png", + "type": "image/png", + "sizes": "48x48" + }, { + "src": "/static/images/favicon/android-chrome-72x72.png", + "type": "image/png", + "sizes": "72x72" + }, { + "src": "/static/images/favicon/android-chrome-96x96.png", + "type": "image/png", + "sizes": "96x96" + }, { + "src": "/static/images/favicon/android-chrome-144x144.png", + "type": "image/png", + "sizes": "144x144" + }, { + "src": "/static/images/favicon/android-chrome-192x192.png", + "type": "image/png", + "sizes": "192x192" + }, { + "src": "/static/images/favicon/android-chrome-256x256.png", + "type": "image/png", + "sizes": "256x256" + }, { + "src": "/static/images/favicon/android-chrome-384x384.png", + "type": "image/png", + "sizes": "384x384" + }, { + "src": "/static/images/favicon/android-chrome-512x512.png", + "type": "image/png", + "sizes": "512x512" + }] } \ No newline at end of file diff --git a/web/static/images/favicon/android-chrome-144x144.png b/web/static/images/favicon/android-chrome-144x144.png new file mode 100644 index 0000000000..b4cb16a207 Binary files /dev/null and b/web/static/images/favicon/android-chrome-144x144.png differ diff --git a/web/static/images/favicon/android-chrome-192x192.png b/web/static/images/favicon/android-chrome-192x192.png new file mode 100644 index 0000000000..43b64dee20 Binary files /dev/null and b/web/static/images/favicon/android-chrome-192x192.png differ diff --git a/web/static/images/favicon/android-chrome-256x256.png b/web/static/images/favicon/android-chrome-256x256.png new file mode 100644 index 0000000000..17d5683142 Binary files /dev/null and b/web/static/images/favicon/android-chrome-256x256.png differ diff --git a/web/static/images/favicon/android-chrome-36x36.png b/web/static/images/favicon/android-chrome-36x36.png new file mode 100644 index 0000000000..a46f34b26f Binary files /dev/null and b/web/static/images/favicon/android-chrome-36x36.png differ diff --git a/web/static/images/favicon/android-chrome-384x384.png b/web/static/images/favicon/android-chrome-384x384.png new file mode 100644 index 0000000000..6a3fde9d3d Binary files /dev/null and b/web/static/images/favicon/android-chrome-384x384.png differ diff --git a/web/static/images/favicon/android-chrome-48x48.png b/web/static/images/favicon/android-chrome-48x48.png new file mode 100644 index 0000000000..6beb5bb2a8 Binary files /dev/null and b/web/static/images/favicon/android-chrome-48x48.png differ diff --git a/web/static/images/favicon/android-chrome-512x512.png b/web/static/images/favicon/android-chrome-512x512.png new file mode 100644 index 0000000000..b9229a3b70 Binary files /dev/null and b/web/static/images/favicon/android-chrome-512x512.png differ diff --git a/web/static/images/favicon/android-chrome-72x72.png b/web/static/images/favicon/android-chrome-72x72.png new file mode 100644 index 0000000000..9f6afec0de Binary files /dev/null and b/web/static/images/favicon/android-chrome-72x72.png differ diff --git a/web/static/images/favicon/android-chrome-96x96.png b/web/static/images/favicon/android-chrome-96x96.png new file mode 100644 index 0000000000..b6ae0c7a7e Binary files /dev/null and b/web/static/images/favicon/android-chrome-96x96.png differ diff --git a/web/static/images/favicon/apple-touch-icon-114x114.png b/web/static/images/favicon/apple-touch-icon-114x114.png new file mode 100644 index 0000000000..b4cb16a207 Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-114x114.png differ diff --git a/web/static/images/favicon/apple-touch-icon-120x120.png b/web/static/images/favicon/apple-touch-icon-120x120.png new file mode 100644 index 0000000000..29a96291d5 Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-120x120.png differ diff --git a/web/static/images/favicon/apple-touch-icon-144x144.png b/web/static/images/favicon/apple-touch-icon-144x144.png new file mode 100644 index 0000000000..b4cb16a207 Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-144x144.png differ diff --git a/web/static/images/favicon/apple-touch-icon-152x152.png b/web/static/images/favicon/apple-touch-icon-152x152.png new file mode 100644 index 0000000000..be3f49d996 Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-152x152.png differ diff --git a/web/static/images/favicon/apple-touch-icon-57x57.png b/web/static/images/favicon/apple-touch-icon-57x57.png new file mode 100644 index 0000000000..5e7e3d3668 Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-57x57.png differ diff --git a/web/static/images/favicon/apple-touch-icon-60x60.png b/web/static/images/favicon/apple-touch-icon-60x60.png new file mode 100644 index 0000000000..6f6c5e6bff Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-60x60.png differ diff --git a/web/static/images/favicon/apple-touch-icon-72x72.png b/web/static/images/favicon/apple-touch-icon-72x72.png new file mode 100644 index 0000000000..9f6afec0de Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-72x72.png differ diff --git a/web/static/images/favicon/apple-touch-icon-76x76.png b/web/static/images/favicon/apple-touch-icon-76x76.png new file mode 100644 index 0000000000..adb504eabd Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-76x76.png differ diff --git a/web/static/images/favicon.ico b/web/static/images/favicon/favicon-16x16.png similarity index 76% rename from web/static/images/favicon.ico rename to web/static/images/favicon/favicon-16x16.png index af55053316..777a605461 100644 Binary files a/web/static/images/favicon.ico and b/web/static/images/favicon/favicon-16x16.png differ diff --git a/web/static/images/favicon/favicon-32x32.png b/web/static/images/favicon/favicon-32x32.png new file mode 100644 index 0000000000..36c4a12e03 Binary files /dev/null and b/web/static/images/favicon/favicon-32x32.png differ diff --git a/web/static/images/favicon/favicon-96x96.png b/web/static/images/favicon/favicon-96x96.png new file mode 100644 index 0000000000..4f6c6d1b29 Binary files /dev/null and b/web/static/images/favicon/favicon-96x96.png differ diff --git a/web/static/images/favicon/iTunesArtwork@2x.png b/web/static/images/favicon/iTunesArtwork@2x.png new file mode 100644 index 0000000000..10321f3a17 Binary files /dev/null and b/web/static/images/favicon/iTunesArtwork@2x.png differ diff --git a/web/static/images/icon50x50.png b/web/static/images/icon50x50.png index 7ac6ce1c97..4791e755fe 100644 Binary files a/web/static/images/icon50x50.png and b/web/static/images/icon50x50.png differ diff --git a/web/static/images/logo-email.png b/web/static/images/logo-email.png index c16978ba89..d0a38e21de 100644 Binary files a/web/static/images/logo-email.png and b/web/static/images/logo-email.png differ diff --git a/web/static/images/logo.png b/web/static/images/logo.png index 423d4d2704..1a35cdf019 100644 Binary files a/web/static/images/logo.png and b/web/static/images/logo.png differ diff --git a/web/static/images/logoWhite.png b/web/static/images/logoWhite.png index 11bbd46322..3166c974c5 100644 Binary files a/web/static/images/logoWhite.png and b/web/static/images/logoWhite.png differ diff --git a/web/static/images/logo_compact.png b/web/static/images/logo_compact.png index b861b7c6da..a4bce62818 100644 Binary files a/web/static/images/logo_compact.png and b/web/static/images/logo_compact.png differ diff --git a/web/templates/head.html b/web/templates/head.html index 689c69d3ca..b5eb3a9b36 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -15,6 +15,19 @@ + + + + + + + + + + + + + @@ -27,9 +40,6 @@ - - - diff --git a/web/web_test.go b/web/web_test.go index 8d40810b5e..97e5ff1544 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -45,7 +45,7 @@ func TestStatic(t *testing.T) { // add a short delay to make sure the server is ready to receive requests time.Sleep(1 * time.Second) - resp, err := http.Get(URL + "/static/images/favicon.ico") + resp, err := http.Get(URL + "/static/images/favicon/favicon-16x16.png") if err != nil { t.Fatalf("got error while trying to get static files %v", err)