commit 20f104955c6b798c7452d7ee09ae45fbbc99c62d Author: Philipp Winter phw@nymity.ch Date: Thu May 28 13:50:02 2020 -0700

Add favicon to BridgeDB's web UI.

This fixes https://bugs.torproject.org/19774. --- CHANGELOG | 3 +++ .../https/templates/assets/images/favicon.ico | Bin 0 -> 4286 bytes bridgedb/distributors/https/templates/base.html | 1 + setup.py | 3 ++- 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG index 6dfa43c..754e2f0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ + * 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 diff --git a/bridgedb/distributors/https/templates/assets/images/favicon.ico b/bridgedb/distributors/https/templates/assets/images/favicon.ico new file mode 100644 index 0000000..2f24bf9 Binary files /dev/null and b/bridgedb/distributors/https/templates/assets/images/favicon.ico differ diff --git a/bridgedb/distributors/https/templates/base.html b/bridgedb/distributors/https/templates/base.html index 2f502a9..1f16ca0 100644 --- 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"> diff --git a/setup.py b/setup.py index 18c391b..74b6254 100644 --- 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: