commit aa1140a3bd0c59ffbe41909165a91893b4a81c7b Author: emma peel emma.peel@riseup.net Date: Wed Mar 3 15:47:48 2021 +0100

updates since last year in images and templates --- assets/static/images/android-censored.png | Bin 74940 -> 177136 bytes assets/static/images/android-configure.png | Bin 69892 -> 237088 bytes assets/static/images/android-connect.png | Bin 69965 -> 239210 bytes assets/static/images/android-new-identity.png | Bin 105151 -> 263142 bytes assets/static/images/android-provide-a-bridge.png | Bin 109572 -> 159176 bytes assets/static/images/android-provided-a-bridge.png | Bin 98794 -> 142112 bytes assets/static/images/android-security-settings.gif | Bin 1345090 -> 714378 bytes assets/static/images/android-select-a-bridge.png | Bin 109560 -> 150983 bytes assets/static/images/android-selected-a-bridge.png | Bin 124065 -> 162159 bytes assets/static/images/circuit_full.png | Bin 39012 -> 51207 bytes assets/static/images/new_identity.png | Bin 59280 -> 100975 bytes assets/static/images/security-settings-anim.gif | Bin 1119741 -> 592873 bytes assets/static/images/security-settings-safest.png | Bin 136500 -> 78518 bytes templates/layout.html | 7 +++++-- templates/sidenav.html | 5 ++--- 15 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/assets/static/images/android-censored.png b/assets/static/images/android-censored.png index 43faa8d..40d9961 100644 Binary files a/assets/static/images/android-censored.png and b/assets/static/images/android-censored.png differ diff --git a/assets/static/images/android-configure.png b/assets/static/images/android-configure.png index c457cca..d02a14e 100644 Binary files a/assets/static/images/android-configure.png and b/assets/static/images/android-configure.png differ diff --git a/assets/static/images/android-connect.png b/assets/static/images/android-connect.png index 8a6c1db..021ca27 100644 Binary files a/assets/static/images/android-connect.png and b/assets/static/images/android-connect.png differ diff --git a/assets/static/images/android-new-identity.png b/assets/static/images/android-new-identity.png index 69f9f9c..8961b8b 100644 Binary files a/assets/static/images/android-new-identity.png and b/assets/static/images/android-new-identity.png differ diff --git a/assets/static/images/android-provide-a-bridge.png b/assets/static/images/android-provide-a-bridge.png index 5241821..c048fb1 100644 Binary files a/assets/static/images/android-provide-a-bridge.png and b/assets/static/images/android-provide-a-bridge.png differ diff --git a/assets/static/images/android-provided-a-bridge.png b/assets/static/images/android-provided-a-bridge.png index 754f2cd..a2606ba 100644 Binary files a/assets/static/images/android-provided-a-bridge.png and b/assets/static/images/android-provided-a-bridge.png differ diff --git a/assets/static/images/android-security-settings.gif b/assets/static/images/android-security-settings.gif index de2f796..f34c689 100644 Binary files a/assets/static/images/android-security-settings.gif and b/assets/static/images/android-security-settings.gif differ diff --git a/assets/static/images/android-select-a-bridge.png b/assets/static/images/android-select-a-bridge.png index c322898..75a10d6 100644 Binary files a/assets/static/images/android-select-a-bridge.png and b/assets/static/images/android-select-a-bridge.png differ diff --git a/assets/static/images/android-selected-a-bridge.png b/assets/static/images/android-selected-a-bridge.png index 2a1cb9d..6e0d456 100644 Binary files a/assets/static/images/android-selected-a-bridge.png and b/assets/static/images/android-selected-a-bridge.png differ diff --git a/assets/static/images/circuit_full.png b/assets/static/images/circuit_full.png old mode 100644 new mode 100755 index 291a419..43f53c1 Binary files a/assets/static/images/circuit_full.png and b/assets/static/images/circuit_full.png differ diff --git a/assets/static/images/new_identity.png b/assets/static/images/new_identity.png old mode 100644 new mode 100755 index ea1bbf3..378ba37 Binary files a/assets/static/images/new_identity.png and b/assets/static/images/new_identity.png differ diff --git a/assets/static/images/security-settings-anim.gif b/assets/static/images/security-settings-anim.gif old mode 100644 new mode 100755 index f8ee989..f1361e9 Binary files a/assets/static/images/security-settings-anim.gif and b/assets/static/images/security-settings-anim.gif differ diff --git a/assets/static/images/security-settings-safest.png b/assets/static/images/security-settings-safest.png old mode 100644 new mode 100755 index fdbf061..d6cf34e Binary files a/assets/static/images/security-settings-safest.png and b/assets/static/images/security-settings-safest.png differ diff --git a/templates/layout.html b/templates/layout.html index c5929cc..d383701 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -4,9 +4,12 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}"> <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/css/eoy.css'|asseturl }}">

<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> +<!-- Standard favicon --> +<link rel="icon" type="image/x-icon" href="{{ '/static/images/favicon.ico'|asseturl }}"> +<!-- Recommended favicon format --> +<link rel="icon" type="image/png" href="{{ '/static/images/favicon.png'|asseturl }}">

<title>{% block title %}{{ this.title }}{% endblock %} | {{ _("Tor Project | Tor Browser Manual") }}</title> <body class="no-gutters" data-spy="scroll" data-target="#sidenav-topics" id="topics" data-children=".item"> @@ -22,7 +25,7 @@ </div> <div class="container-fluid"> <div class="row flex-xl-nowrap"> - {% include 'sidenav.html' %} + {% if this.title != _('Tor Browser User Manual') %} {% include 'sidenav.html' %} {% endif %} <main role="main" class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}"> {% block body %}{% endblock %} </main> diff --git a/templates/sidenav.html b/templates/sidenav.html index 9fab4c0..272365c 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -4,9 +4,8 @@ {{ _('Topics') }} </a> <label class="side-toggler" for="menu-toggle"> - <a class="btn btn-lg outline-primary text-primary navbar-toggler chevron" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> - <span class="oi oi-chevron-top chevron-up"></span> - <span class="oi oi-chevron-bottom chevron-down"></span> + <a class="btn btn-lg outline-primary text-primary navbar-toggler collapsed" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> + <i class="fas"></i> </a> </label> <input type="checkbox" id="menu-toggle"/>