make-firefox: fixed aboutHome layout, removed Pocket, removed links to firefox mobile (136de3d3) · Commits · trisquel / package-helpers

helpers/DATA/firefox/aboutabrowser@trisquel.info/chrome/content/aboutAbrowser/aboutAbrowser.xhtml

+39 −8

Changes for helpers/DATA/firefox/aboutabrowser@trisquel.info/chrome/content/aboutAbrowser/aboutAbrowser.xhtml: 39 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -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,10 +341,11 @@ 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="box3">
		<div id="footer">
		<p ><a class="titlelink" href="https://trisquel.info">Trisquel GNU/Linux</a></p>
		<ul style="font-size:0.8em">
		@@ -326,6 +355,8 @@ function onSearchSubmit(){
		<li><a href="https://trisquel.info/donate">Donate</a></li>
		</ul>
		</div>
		</div>
		</div>


		</body>

helpers/DATA/firefox/abouthome/aboutHome.xhtml

+36 −4

Changes for helpers/DATA/firefox/abouthome/aboutHome.xhtml: 36 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -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>

helpers/DATA/firefox/bookmarks.html.in

+8 −2

Changes for helpers/DATA/firefox/bookmarks.html.in: 8 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		#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>

helpers/DATA/firefox/branding/locales/jar.mn

+3 −2

Changes for helpers/DATA/firefox/branding/locales/jar.mn: 3 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -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

helpers/DATA/firefox/searchplugins/searchplugins.conf

+8 −7

Changes for helpers/DATA/firefox/searchplugins/searchplugins.conf: 8 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		@@ -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"
		}

		]
		}