Merge branch 'enhancement/19774' into develop

6d3e8999 · Philipp Winter · c45439ce · 20f10495 · 6d3e8999 · 6d3e8999
Unverified Commit 6d3e8999 authored Jun 4, 2020 by Philipp Winter
--- a/CHANGELOG
+++ b/CHANGELOG
+    * FIXES https://bugs.torproject.org/19774
+    Add a favicon to BridgeDB's web UI.
+
 Changes in version 0.10.1 - 2020-05-27

    * FIXES https://bugs.torproject.org/33945

--- a/bridgedb/distributors/https/templates/assets/images/favicon.ico
+++ b/bridgedb/distributors/https/templates/assets/images/favicon.ico
--- a/bridgedb/distributors/https/templates/base.html
+++ b/bridgedb/distributors/https/templates/base.html
@@ -13,6 +13,7 @@
    <meta name="description" content="Tor Bridges">
    <meta name="author" content="The Tor Project">

+    <link rel="icon" type="image/x-icon" href="/assets/images/favicon.ico">
    <link rel="stylesheet" href="/assets/css/bootstrap.min.css">
    <link rel="stylesheet" href="/assets/css/font-awesome.min.css">
    <link rel="stylesheet" href="/assets/css/main.css">

--- a/setup.py
+++ b/setup.py
@@ -175,7 +175,8 @@ def get_template_files():
                        'assets/font/*.svg',
                        'assets/font/*.eot',
                        'assets/js/*.js',
-                        'assets/images/*.svg']
+                        'assets/images/*.svg',
+                        'assets/images/*.ico']
    template_files = []

    for include_pattern in include_patterns: