make-firefox: fixed aboutHome layout, removed Pocket, removed links to firefox mobile
This commit is contained in:
Ruben Rodriguez
parent
641ef96dd7
commit
3477a339ac
7 changed files with 108 additions and 32 deletions
|
|
@ -28,6 +28,36 @@
|
|||
|
||||
<style>
|
||||
|
||||
body{
|
||||
margin:0;
|
||||
background-color:#f2f2f2;
|
||||
}
|
||||
#box{
|
||||
display: flex;
|
||||
flex-flow: column;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
align-content: center;
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
#topSection, #box3, #block-horizontal-margin{
|
||||
flex: 0 1 auto;
|
||||
align-self: auto;
|
||||
}
|
||||
#topSection {
|
||||
margin-top:10vh;
|
||||
order:1;
|
||||
}
|
||||
#block-horizontal-margin{
|
||||
order:2;
|
||||
}
|
||||
#box3{
|
||||
order:3;
|
||||
width:100vw;
|
||||
}
|
||||
|
||||
|
||||
label{
|
||||
position:relative;
|
||||
bottom:2px;
|
||||
|
|
@ -57,13 +87,8 @@ box-shadow: 0 0px 2px hsla(0,0%,0%,.3) inset;
|
|||
|
||||
.block-side-margin {
|
||||
min-width: 16px;
|
||||
-moz-box-flex: 1;
|
||||
}
|
||||
|
||||
#block-horizontal-margin {
|
||||
display: -moz-box;
|
||||
-moz-box-flex: 1;
|
||||
}
|
||||
|
||||
ul li {
|
||||
list-style:none;
|
||||
|
|
@ -288,7 +313,9 @@ function onSearchSubmit(){
|
|||
|
||||
<body dir="&locale.dir;" onload="prepare();">
|
||||
|
||||
<div class="spacer"/>
|
||||
|
||||
<div id="box">
|
||||
<div id="box1">
|
||||
<div id="topSection">
|
||||
<img src="chrome://branding/content/about-logo.png"/>
|
||||
<br/>
|
||||
|
|
@ -303,9 +330,10 @@ function onSearchSubmit(){
|
|||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="spacer"/>
|
||||
|
||||
<div id="box2">
|
||||
<div id="block-horizontal-margin">
|
||||
<div class="block-side-margin"></div>
|
||||
<div id="addonsform">
|
||||
|
|
@ -313,18 +341,21 @@ function onSearchSubmit(){
|
|||
<p><a target="_blank" href="https://trisquel.info/browser">Abrowser</a> protects your <a target="_blank" href="http://www.gnu.org/philosophy/free-sw.html">freedom</a> and your privacy!<br/><small>For a browser with an even bigger focus on privacy, <a href="apt:icecat">install GNU IceCat</a></small></p>
|
||||
</div>
|
||||
<div class="block-side-margin"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="spacer"/>
|
||||
|
||||
<div id="footer">
|
||||
<p ><a class="titlelink" href="https://trisquel.info">Trisquel GNU/Linux</a></p>
|
||||
<ul style="font-size:0.8em">
|
||||
<li><a href="https://trisquel.info/forum">Forum</a></li>
|
||||
<li><a href="https://trisquel.info/wiki">Wiki</a></li>
|
||||
<li><a href="http://store.trisquel.info/">Store</a></li>
|
||||
<li><a href="https://trisquel.info/donate">Donate</a></li>
|
||||
</ul>
|
||||
<div id="box3">
|
||||
<div id="footer">
|
||||
<p ><a class="titlelink" href="https://trisquel.info">Trisquel GNU/Linux</a></p>
|
||||
<ul style="font-size:0.8em">
|
||||
<li><a href="https://trisquel.info/forum">Forum</a></li>
|
||||
<li><a href="https://trisquel.info/wiki">Wiki</a></li>
|
||||
<li><a href="http://store.trisquel.info/">Store</a></li>
|
||||
<li><a href="https://trisquel.info/donate">Donate</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,36 @@
|
|||
|
||||
<style>
|
||||
|
||||
body{
|
||||
margin:0;
|
||||
background-color:#f2f2f2;
|
||||
}
|
||||
#box{
|
||||
display: flex;
|
||||
flex-flow: column;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
align-content: center;
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
#topSection, #box3, #block-horizontal-margin{
|
||||
flex: 0 1 auto;
|
||||
align-self: auto;
|
||||
}
|
||||
#topSection {
|
||||
margin-top:10vh;
|
||||
order:1;
|
||||
}
|
||||
#block-horizontal-margin{
|
||||
order:2;
|
||||
}
|
||||
#box3{
|
||||
order:3;
|
||||
width:100vw;
|
||||
}
|
||||
|
||||
|
||||
label{
|
||||
position:relative;
|
||||
bottom:2px;
|
||||
|
|
@ -84,8 +114,8 @@ min-height:100px;
|
|||
|
||||
<body dir="&locale.dir;">
|
||||
|
||||
|
||||
<div class="spacer"/>
|
||||
<div id="box">
|
||||
<div id="box1">
|
||||
<div id="topSection">
|
||||
<img src="chrome://branding/content/about-logo.png"/>
|
||||
|
||||
|
|
@ -99,9 +129,9 @@ min-height:100px;
|
|||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="spacer"/>
|
||||
|
||||
<div id="box2">
|
||||
<div id="footer" style=" display: -moz-box; -moz-box-align: center; -moz-box-pack: center; width: 100%; background-color: hsla(0,0%,0%,.03); border-top: 1px solid hsla(0,0%,0%,.03); box-shadow: 0 2px 5px hsla(0,0%,0%,.1) inset, 0 -1px 0 hsla(0,0%,100%,.25);">
|
||||
<p ><a class="titlelink" href="https://trisquel.info">Trisquel GNU/Linux</a>:</p>
|
||||
<ul style="font-size:0.8em">
|
||||
|
|
@ -110,6 +140,8 @@ min-height:100px;
|
|||
<li><a href="http://store.trisquel.info/">Store</a></li>
|
||||
<li><a href="https://trisquel.info/donate">Donate</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
#filter substitution
|
||||
#include @BOOKMARKS_INCLUDE_DIR@/bookmarks.inc
|
||||
#define ja_jp_mac ja-JP-mac
|
||||
#if AB_CD == ja_jp_mac
|
||||
#define AB_CD ja
|
||||
#endif
|
||||
<!DOCTYPE NETSCAPE-Bookmark-file-1>
|
||||
<!-- This is an automatically generated file.
|
||||
It will be read and overwritten.
|
||||
|
|
@ -7,8 +13,8 @@
|
|||
<H1>Bookmarks Menu</H1>
|
||||
|
||||
<DL><p>
|
||||
<DT><H3 ADD_DATE="1245542278" LAST_MODIFIED="1245543070" PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Toolbar</H3>
|
||||
<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
|
||||
<DT><H3 ADD_DATE="1245542278" LAST_MODIFIED="1245543070" PERSONAL_TOOLBAR_FOLDER="true">@bookmarks_toolbarfolder@</H3>
|
||||
<DD>@bookmarks_toolbarfolder_description@
|
||||
<DL><p>
|
||||
<HR>
|
||||
<DT><A HREF="http://trisquel.info/" ADD_DATE="1245542718" LAST_MODIFIED="1245542736" ICON_URI="http://trisquel.info/sites/default/themes/trisquel3/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACRklEQVQ4jY2SXU/SYRiHL9xwUzd7s80AzRmzmiKhgCKof0X4C4FHYZtOV2nMWZvTtFyNyQwrX1gwshTzDQQN8f0gD9w6ydo6aJ201Rfoc3Sgs+wg+Z3e9/Xcv117IOWUS1F7NJSNVYMrI3UOoGAgF/PCDg0LccyLK4jRPfTeouNLao+G+rkXWCLzCLNDXBssOJoJs0Po/Q5oy0LVW0jNq3s0LEaAtIMFY7AZMfEDMZLAshDFvvYT++p3TAEXALWhYQrdpwAJ5d5OFB1KbMmP5LrOA21ZWJf3qRipo/hRPjq/GfWgBnFlF/vqPuphDTp/FaZgD8ZAE9qRdozBZqyJHXBngrxVgTXynoJbp9E976ZitA7jxGO0z4w4Nj4gxt9x+aGM4p58Sr0l6HxV2FfjCNNPDurnt5zBEtumqEt+ZNcwOoDsdh7O9U2cW2s0rixhmRvFEglyfWMXcWkeefu5PwKNk/exRKeonrxBTagDw3gLeq8W59Yaju09HOtfsCW+IsY+0TDjO/RxLBLKPSoMAZFSbwkA9bMTODd/IYSfUuK+dCQxtbilNC5/RozGkblzqPT3YXjpQe/TpsZnu85iT37DFL6DKehGNVgIrgzqpsYo61Wm0iATcXkf4XUX1YG7qB5cAdKoCd1EmO5MrYX5rR9rLInMnYNmxEZxtxIh3I8p1HISKgHSyGuSYY0lMUdnqA25EML9iJEE8lYFB1/4v0IlQDoXrl7EONZL/ZsAleN9ZAtKIP0k+O9HpMhbFeh92sPL0n/h3yJfoqCu2Os+AAAAAElFTkSuQmCC">Trisquel GNU/Linux</A>
|
||||
|
|
|
|||
|
|
@ -7,5 +7,6 @@
|
|||
@AB_CD@.jar:
|
||||
% locale branding @AB_CD@ %locale/branding/
|
||||
locale/branding/brand.dtd (%brand.dtd)
|
||||
* locale/branding/brand.properties (%brand.properties)
|
||||
* locale/branding/browserconfig.properties (browserconfig.properties)
|
||||
locale/branding/brand.properties (%brand.properties)
|
||||
locale/branding/browserconfig.properties
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"overrides": [
|
||||
{
|
||||
"name": "Amazon",
|
||||
"include_locales": [ "af", "ar", "as", "az", "bg", "bn-IN", "br", "cy", "da", "de", "el", "en-GB", "en-US", "en-ZA", "eo", "es-AR", "eu", "fa", "fr", "ga-IE", "gd", "gl", "hr", "hsb", "hy-AM", "is", "it", "ja", "km", "kn", "ku", "lt", "mk", "mr", "ms", "nb-NO", "nn-NO", "or", "pt-PT", "ro", "si", "son", "sq", "sr", "te", "th", "uz", "zh-CN", "zu"],
|
||||
"include_locales": [ "af", "ar", "as", "az", "bg", "bn-IN", "br", "cak", "cy", "da", "de", "el", "en-GB", "en-US", "en-ZA", "eo", "es-AR", "eu", "fa", "fr", "ga-IE", "gd", "gl", "gn", "hr", "hsb", "hy-AM", "is", "it", "ja", "km", "kn", "ku", "lt", "mk", "mr", "ms", "nb-NO", "nn-NO", "or", "pt-PT", "ro", "si", "son", "sq", "sr", "te", "th", "uz", "zh-CN", "zu"],
|
||||
"exclude_locales": [],
|
||||
"match": "amazon*.xml",
|
||||
"source": "en-US/amazondotcom.xml",
|
||||
|
|
@ -39,6 +39,13 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Baidu",
|
||||
"include_locales": [ "zh-CN" ],
|
||||
"exclude_locales": [],
|
||||
"match": "baidu*.xml",
|
||||
"source": "zh-CN/baidu.xml"
|
||||
},
|
||||
{
|
||||
"name": "DuckDuckGo",
|
||||
"include_locales": [ "*" ],
|
||||
|
|
@ -63,11 +70,6 @@
|
|||
"match": "google.xml",
|
||||
"source": "en-ZA/google.xml"
|
||||
},
|
||||
{
|
||||
"locales": [ "ja" ],
|
||||
"match": "google-jp.xml",
|
||||
"source": "ja/google-jp.xml"
|
||||
},
|
||||
{
|
||||
"locales": [ "ku" ],
|
||||
"match": "google.xml",
|
||||
|
|
@ -89,6 +91,5 @@
|
|||
"exclude_locales": [],
|
||||
"source": "en-US/trisquel-packages.xml"
|
||||
}
|
||||
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -187,6 +187,7 @@ pref("security.ssl3.dhe_rsa_des_ede3_sha", false);
|
|||
|
||||
// Disable Pocket integration
|
||||
pref("browser.pocket.enabled", false);
|
||||
pref("extensions.pocket.enabled", false);
|
||||
|
||||
// disable xpi signing verification
|
||||
pref("xpinstall.signatures.required", false);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Copyright (C) 2008-2015 Ruben Rodriguez <ruben@trisquel.info>
|
||||
# Copyright (C) 2008-2016 Ruben Rodriguez <ruben@trisquel.info>
|
||||
# Copyright (C) 2015 Santiago Rodriguez <santi@trisquel.info>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -174,6 +174,7 @@ EOF
|
|||
rm browser/base/content/abouthome -rf
|
||||
cp $DATA/abouthome -a browser/base/content
|
||||
sed '/mozilla.*png/d' -i ./browser/base/jar.mn
|
||||
sed '/abouthome/s/*/ /' -i ./browser/base/jar.mn
|
||||
|
||||
# Delete stuff we don't use and that may contain trademaked logos
|
||||
rm -rf ./browser/metro ./addon-sdk/source/doc/static-files/media ./browser/themes/windows ./browser/themes/osx ./b2g
|
||||
|
|
@ -204,6 +205,9 @@ cat << EOF >> toolkit/mozapps/extensions/content/extensions.css
|
|||
}
|
||||
EOF
|
||||
|
||||
# Disable mobile promo
|
||||
sed '/fxaMobilePromo/,/label>$/d' -i browser/components/preferences/in-content/sync.xul
|
||||
|
||||
find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
|
||||
|
||||
for STRING in community.end3 community.exp.end community.start2 community.mozillaLink community.middle2 community.creditsLink community.end2 contribute.start contribute.getInvolvedLink contribute.end channel.description.start channel.description.end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue