commit cc73f75d99e5bd1b610e4a96e89b895ced72407b Author: Matthew Finkel <sysrqb@torproject.org> Date: Wed May 19 13:28:11 2021 +0000 Bug 40037: Announce v2 onion service deprecation on about:tor --- chrome/content/aboutTor/aboutTor.xhtml | 15 ++++++++++ chrome/skin/aboutTor.css | 49 +++++++++++++++++++++++++++++++++ chrome/skin/tor-banner-warning-icon.svg | 1 + 3 files changed, 65 insertions(+) diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index f3a9032f..7a50ebdf 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -65,6 +65,21 @@ </form> </div> + <div id="infoBanner"> + <img id="infoBannerImg" src="resource://torbutton-assets/tor-banner-warning-icon.svg" /> + <div id="infoBannerTextCol"> + <div id="infoBannerDescription"> + Tor is ending its support for version 2 (v2) Onion Services, and + v2 onion sites have since been deprecated. If + you're a <b>site administrator</b>, upgrade to a + v3 onion service immediately. + <a id="infoBannerLink" target="_blank" href="https://support.torproject.org/onionservices/#v2-deprecation"> + Learn more + </a> + </div> + </div> + </div> + <div id="bottom"> <p id="donate" class="moreInfoLink">&aboutTor.donationBanner.freeToUse; <a href="https://donate.torproject.org/">&aboutTor.donationBanner.buttonA; »</a> diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 38486241..65cc1d3b 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -220,6 +220,55 @@ body:not([showmanual]) .showForManual { background-color: rgba(12, 12, 13, 0.1); /* same as Firefox's about:home */ } +#infoBanner { + width: 690px; + padding: 20px 25px 25px; + background: rgba(0, 0, 0, 0.3); + border-radius: 6px; + margin: 35px auto 0px; + display: flex; + flex-direction: row; + align-items: flex-start; + position: static; +} + +@media only screen and (min-width: 900px) { + #infoBanner { + margin: 35px 0px 0px 135px; + } +} + +#infoBannerTextCol { + padding: 8px 0px 0px 15px; + font-size: 15px; + line-height: normal; + color: #FFFFFF; + width: 633px; +} + +#infoBannerHeader { + font-weight: bold; +} + +#infoBannerImg { + width: 32px; + height: 32px; + position: static; + border-radius: 32px; +} + +div.infoBannerDescription, div.infoBannerLink { + padding-top: 10px; +} + +a#infoBannerLink { + text-decoration: underline; +} + +a#infoBannerLink:hover { + text-decoration: none; +} + /* #search-text is the search input field */ #search-text { flex: 1; diff --git a/chrome/skin/tor-banner-warning-icon.svg b/chrome/skin/tor-banner-warning-icon.svg new file mode 100644 index 00000000..3686aba6 --- /dev/null +++ b/chrome/skin/tor-banner-warning-icon.svg @@ -0,0 +1 @@ +<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><rect fill="#fdd204" height="32" rx="16" width="32"/><path clip-rule="evenodd" d="m16 25c-4.9708 0-9-4.0295-9-9.0002 0-4.9706 4.0292-8.9998 9-8.9998 4.9705 0 9 4.0292 9 8.9998 0 4.9707-4.0295 9.0002-9 9.0002zm.0185-2.7279v1.091c4.0584-.01 7.3449-3.3024 7.3449-7.3633 0-4.0607-3.2865-7.35293-7.3449-7.36316v1.09101c3.4559.00997 6.2541 2.81395 6.2541 6.27215 0 3.4583-2.7982 6.2623-6.2541 6.2723zm3.527-6.2723c0 1.9519-1.5778 3.5344-3.527 3.5447v1.0907c2.552-.0099 4.618-2.0809 4.618-4.6354 0-2.5543-2.066-4.6253-4.618-4.6353v1.0908c1.9492.0102 3.527 1.5927 3.527 3.5445zm-3.527-1.9081c1.0456.01 1.8906.86 1.8906 1.908 0 1.0484-.845 1.8984-1.8906 1.9084z" fill="#240a3b" fill-rule="evenodd"/></svg> \ No newline at end of file