Skip to content
GitLab
Commit 469de7f6 authored by Richard Pospesel's avatar Richard Pospesel
Browse files

Bug 40758: Remove YEC takeover from about:tor in next release 

- reverts YEC-specific additions to about:tor
- fixes tor-browser#40758
parent af4a2440
Expand all Hide whitespace changes
Inline Side-by-side
LICENSE
View file @ 469de7f6
......@@ -27,200 +27,3 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
===========================================================================
"Corben" font embedded in chrome/skin/corben-font.css is licensed under:
Copyright (c) 2010, 2011 by vernon adams (vern@newtypography.co.uk),
with Reserved Font Name Corben.
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
===========================================================================
"Sniglet" font embedded in chrome/skin/yec-placard.svg is licensed under:
Copyright (c) 2008, Haley Fiege (haley@kingdomofawesome.com),
Copyright (c) 2012, Brenda Gallo (gbrenda1987@gmail.com),
Copyright (c) 2013, Pablo Impallari (www.impallari.com|impallari@gmail.com)
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
chrome/content/aboutTor/aboutTor-content.js
View file @ 469de7f6
......@@ -116,10 +116,6 @@ var AboutTorListener = {
"https://tb-manual.torproject.org/" + aLocale;
content.document.getElementById("getInvolvedLink").href =
"https://community.torproject.org/" + aLocale;
content.document.getElementById("slogan-layer").src =
"resource://torbutton-assets/yec-placard.svg#" + aLocale;
content.document.getElementById("donateButton").href =
"https://www.torproject.org/donate/donate-phr-bp1-" + aLocale;
// Display the Tor Browser product name and version.
try {
......
chrome/content/aboutTor/aboutTor.xhtml
View file @ 469de7f6
......@@ -20,11 +20,10 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Security-Policy" content="default-src resource:; font-src data:; object-src 'none'" />
<meta http-equiv="Content-Security-Policy" content="default-src resource:; object-src 'none'" />
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>&aboutTor.title;</title>
<link rel="stylesheet" href="chrome://browser/skin/onionPattern.css" type="text/css" media="all" />
<link rel="stylesheet" href="resource://torbutton-assets/corben-font.css" type="text/css" media="all" />
<link rel="stylesheet" href="resource://torbutton-assets/aboutTor.css" type="text/css" media="all" />
<script type="text/javascript" src="resource://torbutton-abouttor/aboutTor.js"></script>
</head>
......@@ -36,12 +35,6 @@
</div>
<img class="torcontent-logo" src="resource://torbutton-assets/torbrowser_mobile_logo.png"/>
<div id="torstatus" class="top">
<div class="hideIfTorOff header-container">
<div class="header-layered">
<img id="base-layer" src="resource://torbutton-assets/yec-activist.svg"/>
<img id="slogan-layer" src="resource://torbutton-assets/yec-placard.svg#en-US"/>
</div>
</div>
<div class="hideIfTorOff hideIfHasBeenUpdated torstatus-container">
<div class="heading1">&aboutTor.ready.label;</div>
<br/>
......@@ -72,14 +65,6 @@
</form>
</div>
<div id="donateMessageBox" class="hideIfTorOff">
<div id="motto">&aboutTor.yec.motto;</div>
<div id="donationBox">
<div id="donationMatch">&aboutTor.yec.donationMatch;</div>
<a id="donateButton" href="https://donate.torproject.org/" target="_blank">&aboutTor.donationBanner.buttonA;</a>
</div>
</div>
<div id="bottom">
<p id="donate" class="moreInfoLink">&aboutTor.donationBanner.freeToUse;
<a href="https://donate.torproject.org/" target="_blank">&aboutTor.donationBanner.buttonA; &#187;</a>
......
chrome/locale/en-US/aboutTor.dtd
View file @ 469de7f6
......@@ -29,31 +29,3 @@
<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you.">
<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
<!-- Year end campaign strings -->
<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
with a similar theme:
- DON'T TOUCH MY DATA
- DON'T SPY ON MY DATA
- MY DATA IS PRIVATE
- KEEP OFF MY DATA
Please place newline characters (\n) between words or phrases which can be placed in separate lines
so we can word-wrap our final assets correctly.
Thank you!
-->
<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
<!ENTITY aboutTor.yec.motto "Privacy is a human right">
<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
also format it like the name of an organization in whichever way that is appropriate for your locale.
Please keep the currency in USD.
Thank you!
-->
<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
chrome/skin/aboutTor.css
View file @ 469de7f6
......@@ -6,13 +6,8 @@
*/
:root {
--abouttor-link-color: #e98346;
--abouttor-donate-button-bg: #efb149;
--abouttor-donate-button-bg-hover: #e5b6e3;
--abouttor-donate-button-bg-active: #b28db0;
--abouttor-donate-button-color: #0C0C0D;
--abouttor-text-color: #faf5df;
--abouttor-bg-toron-color: #05161c;
--abouttor-text-color: white;
--abouttor-bg-toron-color: #420C5D;
--abouttor-bg-toroff-color: #A4000F;
--onion-opacity: 0.2;
--onion-color: #fff;
......@@ -57,14 +52,14 @@ body:not([initialized]) {
}
.torcontent-container {
margin: 80px 20px 28px 20px;
margin: 40px 20px 28px 20px;
display: flex;
flex-direction: column;
}
@media only screen and (min-width: 900px) {
.torcontent-container {
margin-inline: auto;
margin: 40px auto 28px auto;
max-width: 1000px;
}
}
......@@ -91,10 +86,11 @@ body:not([updatechannel="release"]):not([updatechannel="alpha"]) #torbrowser-cha
}
a {
color: var(--abouttor-link-color);
color: var(--abouttor-text-color);
}
#torstatus {
margin-top: 135px;
display: flex;
flex-direction: column;
align-content: center;
......@@ -127,7 +123,6 @@ a {
margin-inline-start: -100%;
}
.torstatus-container {
display: none;
text-align: center;
}
......@@ -161,80 +156,6 @@ body:not([showmanual]) .showForManual {
margin-bottom: 20px;
}
#donateMessageBox {
max-width: 730px;
margin-top: 2em;
margin-inline: auto;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
font-family: serif;
}
#donateMessageBox > * {
width: 50%;
}
#motto {
/* dynamically scale motto text based on window width */
font-size: clamp(24px, calc(100vw / 768 * 36) , 36px);
line-height: clamp(32px, calc(100vw / 768 * 48) , 48px);
flex-grow: 1;
font-family: Corben, sans-serif;
font-weight: 700;
}
#donationBox {
margin-inline-start: 2em;
flex-grow: 1;
display: flex;
flex-direction: column;
}
#donationMatch {
font-size: 1.1em;
font-family: Corben, sans-serif;
font-weight: 400;
line-height: 1.3em;
}
#donateButton {
margin-block-start: 1em;
margin-inline-end: auto;
background-color: var(--abouttor-donate-button-bg);
outline-color: var(--abouttor-donate-button-bg);
outline-style: none;
color: var(--abouttor-donate-button-color);
font-family: sans-serif;
font-weight: bold;
font-size: 0.9em;
box-sizing: border-box;
border-radius: 1.5em;
padding-inline: 1.25em;
text-decoration: none;
max-height: 3em;
height: 3em;
line-height: 3em;
}
#donateButton:hover {
background-color: var(--abouttor-donate-button-bg-hover);
outline-color: var(--abouttor-donate-button-bg-hover);
}
#donateButton:active {
background-color: var(--abouttor-donate-button-bg-active);
outline-color: var(--abouttor-donate-button-bg-active);
}
#donateButton:focus-visible {
outline-style: dotted;
outline-width: 1px;
outline-offset: 2px;
}
#bottom {
margin-top: 10vh;
margin-inline: auto;
......
chrome/skin/corben-font.css deleted 100644 → 0
View file @ af4a2440
This source diff could not be displayed because it is too large. You can view the blob instead.
chrome/skin/yec-activist.svg deleted 100644 → 0
View file @ af4a2440
This diff is collapsed.
chrome/skin/yec-placard.svg deleted 100644 → 0
View file @ af4a2440
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment