Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout d924e89139c2 (bug 1199354) for landing string changes without changing their id.

Browse Source
This commit is contained in:
Mark Hammond 2015-10-30 21:19:26 +11:00
parent 5c435de429
commit 5f6c33e48f
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
browser/components/preferences/in-content/sync.xul
View File

@ -212,15 +212,12 @@
</hbox>
<label class="fxaMobilePromo">
&mobilePromo.start;<!-- We put these comments to avoid inserting white spaces
--><label class="androidLink text-link"
href="https://www.mozilla.org/firefox/android/?utm_source=firefox-browser&amp;utm_medium=firefox-browser&amp;utm_campaign=sync-preferences"><!--
--><image class="androidLogo"/><!--
--><label class="androidLink text-link" href="https://www.mozilla.org/firefox/android/"><!--
-->&mobilePromo.androidLink;</label><!--
-->&mobilePromo.iOSBefore;<!--
--><label class="iOSLink text-link"
href="https://www.mozilla.org/firefox/ios/?utm_source=firefox-browser&amp;utm_medium=firefox-browser&amp;utm_campaign=sync-preferences"><!--
-->&mobilePromo.iOSLink;</label><!--
-->&mobilePromo.end;
</label>
<label class="androidAttribution">&androidAttribution;</label>
</vbox>
<vbox id="hasFxaAccount">
@ -345,18 +342,15 @@
</hbox>
</hbox>
</groupbox>
<spacer class="separator"/>
<label class="fxaMobilePromo">
&mobilePromo.start;<!-- We put these comments to avoid inserting white spaces
--><label class="androidLink text-link"
href="https://www.mozilla.org/firefox/android/?utm_source=firefox-browser&amp;utm_medium=firefox-browser&amp;utm_campaign=sync-preferences"><!--
--><image class="androidLogo"/><!--
--><label class="androidLink text-link" href="https://www.mozilla.org/firefox/android/"><!--
-->&mobilePromo.androidLink;</label><!--
-->&mobilePromo.iOSBefore;<!--
--><label class="iOSLink text-link"
href="https://www.mozilla.org/firefox/ios/?utm_source=firefox-browser&amp;utm_medium=firefox-browser&amp;utm_campaign=sync-preferences"><!--
-->&mobilePromo.iOSLink;</label><!--
-->&mobilePromo.end;
</label>
<spacer class="separator" flex="1"/>
<spacer flex="1"/>
<vbox id="tosPP-small" align="start">
<label id="tosPP-small-ToS" class="text-link">
&prefs.tosLink.label;
@ -365,5 +359,6 @@
&fxaPrivacyNotice.link.label;
</label>
</vbox>
<label class="androidAttribution">&androidAttribution;</label>
</vbox>
</deck>

18
browser/locales/en-US/chrome/browser/preferences/sync.dtd
View File

@ -91,18 +91,8 @@ both, to better adapt this sentence to their language.
<!ENTITY signedIn.engines.label "Sync across all devices">
<!-- LOCALIZATION NOTE (mobilePromo.*): the following strings will be used to
create a single sentence with active links.
The resulting sentence in English is: "Sync to your mobile device.
Download Firefox for Android or Firefox for iOS." -->
<!ENTITY mobilePromo.start "Sync to your mobile device. Download ">
<!ENTITY mobilePromo.start "Download Firefox for ">
<!-- LOCALIZATION NOTE (mobilePromo.androidLink): This is a link title that links to https://www.mozilla.org/firefox/android/ -->
<!ENTITY mobilePromo.androidLink "Firefox for Android">
<!-- LOCALIZATION NOTE (mobilePromo.iOSBefore): This is text displayed between mobilePromo.androidLink and mobilePromo.iosLink -->
<!ENTITY mobilePromo.iOSBefore " or ">
<!-- LOCALIZATION NOTE (mobilePromo.iOSLink): This is a link title that links to https://www.mozilla.org/firefox/ios/ -->
<!ENTITY mobilePromo.iOSLink "Firefox for iOS">
<!ENTITY mobilePromo.end ".">
<!ENTITY mobilePromo.androidLink "Android™">
<!ENTITY mobilePromo.end " to sync with your mobile device.">
<!ENTITY androidAttribution "Android is a trademark of Google Inc.">

24
browser/themes/shared/incontentprefs/preferences.inc.css
View File

@ -624,7 +624,8 @@ description > html|a {
}
.fxaMobilePromo {
margin-bottom: 31px;
margin-top: 14px;
margin-bottom: 41px;
}
#fxaLoginRejectedWarning {
@ -637,16 +638,28 @@ description > html|a {
margin-bottom: 27.5px;
}
.androidLink,
.iOSLink {
.androidLogo {
list-style-image: url(chrome://browser/skin/fxa/android.png);
max-width: 24px;
position: relative;
top: 8px;
margin: 0px;
margin-inline-end: 5px;
}
.androidLink {
margin: 0;
}
#tosPP-small {
margin-top: 20px;
margin-bottom: 20px;
}
.androidAttribution {
font-size: 12px;
color: #D1D2D3;
}
@media (min-resolution: 1.1dppx) {
.fxaSyncIllustration {
list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png)
@ -654,6 +667,9 @@ description > html|a {
.fxaFirefoxLogo {
list-style-image: url(chrome://browser/skin/fxa/logo@2x.png);
}
.androidLogo {
list-style-image: url(chrome://browser/skin/fxa/android@2x.png);
}
#fxaProfileImage {
list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png);
}