summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-01-22 16:22:29 -0600
committerCorey Hulen <corey@hulen.com>2016-01-22 16:22:29 -0600
commitd352c5b64dddfb8e46b18edbd7352c41495078a1 (patch)
treef07486c23a304692012e7c692f3065f8128c0f55
parent336f0389deaca58ed4d45d96affa95f40666455f (diff)
parentb9fb855c6c8bf86a0f3730b892dda2131380b3ff (diff)
downloadchat-d352c5b64dddfb8e46b18edbd7352c41495078a1.tar.gz
chat-d352c5b64dddfb8e46b18edbd7352c41495078a1.tar.bz2
chat-d352c5b64dddfb8e46b18edbd7352c41495078a1.zip
Merge pull request #1959 from asaadmahmoodspin/ui-improvements
Updating favicon stuff
-rw-r--r--api/templates/error.html4
-rw-r--r--web/react/components/sidebar.jsx4
-rw-r--r--web/static/images/favicon/redfavicon-16x16.pngbin0 -> 18484 bytes
3 files changed, 4 insertions, 4 deletions
diff --git a/api/templates/error.html b/api/templates/error.html
index 6944f6c68..9fb2da1ba 100644
--- a/api/templates/error.html
+++ b/api/templates/error.html
@@ -11,8 +11,8 @@
<script src="/static/js/bootstrap-3.3.5.min.js"></script>
<script src="/static/js/react-bootstrap-0.25.1.min.js"></script>
- <link id="favicon" rel="icon" href="/static/images/favicon.ico" type="image/x-icon">
- <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon">
+ <link id="favicon" rel="icon" href="/static/images/favicon/favicon-16x16.png" type="image/x-icon">
+ <link rel="shortcut icon" href="/static/images/favicon/favicon-16x16.png" type="image/x-icon">
<link href='/static/css/google-fonts.css' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/static/css/styles.css">
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index eaeb7bb91..c902731c9 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -506,9 +506,9 @@ export default class Sidebar extends React.Component {
link.rel = 'shortcut icon';
link.id = 'favicon';
if (this.badgesActive) {
- link.href = '/static/images/redfavicon.ico';
+ link.href = '/static/images/favicon/redfavicon-16x16.png';
} else {
- link.href = '/static/images/favicon.ico';
+ link.href = '/static/images/favicon/favicon-16x16.png';
}
var head = document.getElementsByTagName('head')[0];
var oldLink = document.getElementById('favicon');
diff --git a/web/static/images/favicon/redfavicon-16x16.png b/web/static/images/favicon/redfavicon-16x16.png
new file mode 100644
index 000000000..9645113ef
--- /dev/null
+++ b/web/static/images/favicon/redfavicon-16x16.png
Binary files differ