From 28fb6b69487d13da4c844086f164bd07375ce9ec Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Sat, 4 Mar 2017 22:57:32 -0500
Subject: [PATCH] Updated IceCat for v45
---
helpers/DATA/icecat/aboutHome.xhtml | 59 ++++++----
helpers/DATA/icecat/aboutIceCat.xhtml | 162 +++++++++++++++++---------
helpers/make-icecat | 4 +-
3 files changed, 147 insertions(+), 78 deletions(-)
diff --git a/helpers/DATA/icecat/aboutHome.xhtml b/helpers/DATA/icecat/aboutHome.xhtml
index f1eae07a..f2e76b8f 100644
--- a/helpers/DATA/icecat/aboutHome.xhtml
+++ b/helpers/DATA/icecat/aboutHome.xhtml
@@ -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;
@@ -44,12 +74,6 @@ color:#004998
.block-side-margin {
min-width: 16px;
- -moz-box-flex: 1;
-}
-
-#block-horizontal-margin {
- display: -moz-box;
- -moz-box-flex: 1;
}
ul li {
@@ -84,34 +108,21 @@ 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"/>
<div id="searchContainer">
<form name="searchForm" id="searchForm" action="https://duckduckgo.com/html/">
- <input type="hidden" name="t" value="trisquel"/>
<input type="text" name="q" value="" id="searchText" maxlength="256"
autofocus="autofocus"/>
- <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label; DuckDuckGO"/>
+ <input id="searchSubmit" type="submit" value="Search"/>
</form>
</div>
-
+ </div>
</div>
-
- <div class="spacer"/>
-
-<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">
-<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>
</body>
</html>
diff --git a/helpers/DATA/icecat/aboutIceCat.xhtml b/helpers/DATA/icecat/aboutIceCat.xhtml
index 3df5f5c1..d0425008 100644
--- a/helpers/DATA/icecat/aboutIceCat.xhtml
+++ b/helpers/DATA/icecat/aboutIceCat.xhtml
@@ -28,21 +28,44 @@
<style>
-.titlelink{
-font-weight:bold;
-color: #678;
-text-shadow: 0px 1px 0px white;
-}
+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;
-left:2px;
+bottom:0.25em;
+left:0.25em;
}
#addonsform form{
position:relative;
-left:10px;
+left:1em;
}
em {
@@ -55,20 +78,14 @@ color:#004998
#addonsform{
background-color:#fff;
-font-size:14px;
-padding:10px 30px 20px 30px;
-border-radius: 10px;
-box-shadow: 0px 0px 5px #888888;
+font-size:0.8em;
+padding:1em 3em 2em 2.5em;
+border-radius: 0.5em;
+box-shadow: 0px 0px 5px #888888 inset;
}
.block-side-margin {
- min-width: 16px;
- -moz-box-flex: 1;
-}
-
-#block-horizontal-margin {
- display: -moz-box;
- -moz-box-flex: 1;
+ min-width: 1em;
}
ul li {
@@ -95,7 +112,43 @@ box-shadow: 0px 2px 0 #aaa;
}
#footer{
-min-height:100px;
+min-height:4em;
+display: -moz-box;
+-moz-box-align: center;
+-moz-box-pack: center;
+width: 100%;
+background-color: hsla(0,0%,0%,.03);
+box-shadow: 0 2px 5px hsla(0,0%,0%,.1) inset, 0 -1px 0 hsla(0,0%,100%,.25);
+}
+
+.titlelink{
+font-weight:bold;
+color: #678;
+text-shadow: 0px 1px 0px white;
+}
+
+#searchLogoContainer{
+background:#ddd;
+padding-left:10px;
+font-size:0.8em;
+border-radius: 3px 0px 0px 3px;
+text-shadow:0px 1px 0px #fff;
+border:1px solid ;
+border-right:none;
+
+border-color: rgba(51, 166, 255, 0.6) rgba(39, 145, 225, 0.6) rgba(0, 122, 204, 0.6);
+ border-top-color: rgba(51, 166, 255, 0.6);
+ border-right-color-value: rgba(39, 145, 225, 0.6);
+ border-bottom-color: rgba(0, 122, 204, 0.6);
+ border-left-color-value: rgba(39, 145, 225, 0.6);
+ border-left-color-ltr-source: physical;
+ border-left-color-rtl-source: physical;
+ border-right-color-ltr-source: physical;
+ border-right-color-rtl-source: physical;
+}
+
+input{
+border-radius:0px!important;
}
</style>
@@ -276,43 +329,48 @@ 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"/>
+ <img src="chrome://icecathome/content/aboutIceCat/about-logo.png"/><br/><br/>
- <div id="searchContainer">
- <form name="searchForm" id="searchForm" onsubmit="onSearchSubmit(); return false">
- <div id="searchLogoContainer"></div>
- <input type="text" name="q" value="" id="searchText" maxlength="256"
+ <div id="searchContainer">
+ <form name="searchForm" id="searchForm" onsubmit="onSearchSubmit(); return false">
+ <div id="searchLogoContainer"></div>
+ <input type="text" name="q" value="" id="searchText" maxlength="256"
autofocus="autofocus" dir="auto"/>
- <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
- </form>
+ <input id="searchSubmit" type="submit" value="Search"/>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <div id="box2">
+ <div id="block-horizontal-margin">
+ <div class="block-side-margin"></div>
+ <div id="addonsform">
+ <h3>Enabled privacy features:</h3>
+ <p>The <a target="_blank" href="http://www.gnu.org/software/gnuzilla/">GNU IceCat</a> web browser protects your <a target="_blank" href="http://www.gnu.org/philosophy/free-sw.html">freedom</a> and your privacy!</p>
</div>
-
+ <div class="block-side-margin"></div>
</div>
-
- <div class="spacer"/>
-
-<div id="block-horizontal-margin">
-<div class="block-side-margin"></div>
-<div id="addonsform">
-<h3>Enabled privacy features:</h3>
-<p>The <a target="_blank" href="http://www.gnu.org/software/gnuzilla/">GNU IceCat</a> web browser protects your <a target="_blank" href="http://www.gnu.org/philosophy/free-sw.html">freedom</a> and your privacy!</p>
-</div>
-<div class="block-side-margin"></div>
-</div>
-
- <div class="spacer"/>
-
-<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">
-<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 id="box3">
+ <div id="footer">
+ <p ><a class="titlelink" href="https://www.gnu.org">GNU's not UNIX!</a></p>
+ <ul style="font-size:0.8em">
+ <li><a href="https://gnu.org/gnu/gnu.html">About GNU</a></li>
+ <li><a href="https://gnu.org/philosophy/philosophy.html">Philosophy</a></li>
+ <li><a href="https://gnu.org/licenses/licenses.html">Licenses</a></li>
+ <li><a href="https://gnu.org/education/education.html">Education</a></li>
+ <li><a href="https://gnu.org/software/software.html">Software</a></li>
+ <li><a href="https://gnu.org/doc/doc.html">Documentation</a></li>
+ <li><a href="https://gnu.org/help/help.html">Help GNU</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
</body>
</html>
diff --git a/helpers/make-icecat b/helpers/make-icecat
index b9622a95..aae59d4d 100644
--- a/helpers/make-icecat
+++ b/helpers/make-icecat
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2015 Ruben Rodriguez <ruben@trisquel.info>
+# Copyright (C) 2015-2017 Ruben Rodriguez <ruben@trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=2
EXTERNAL='deb-src http://devel.trisquel.info/repos/packages/icecat/ GNU main'
SIGNKEY="D7E04784"
REPOKEY="3C76EED7D7E04784"
--
GitLab