summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-12-21 03:19:51 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-12-21 03:19:51 -0200
commit4cd20c776138e95fbbc2cb6ca52453913ad065b7 (patch)
tree681799b955589cb7eb15d3f306921a34b816bcc8
parenta3082f417e5b303a10b0dde92ca8498e49f0237e (diff)
downloadabslibre-4cd20c776138e95fbbc2cb6ca52453913ad065b7.tar.gz
abslibre-4cd20c776138e95fbbc2cb6ca52453913ad065b7.tar.bz2
abslibre-4cd20c776138e95fbbc2cb6ca52453913ad065b7.zip
iceweasel-libre: add more fixes on libre.patch
-rw-r--r--libre/iceweasel-libre/PKGBUILD2
-rw-r--r--libre/iceweasel-libre/libre.patch89
2 files changed, 50 insertions, 41 deletions
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 6b7ee920d..56d83e225 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -64,7 +64,7 @@ md5sums=('219cf21e0642e8a364365286f23d0624'
'2001d0477bcefd0eeaab584402133691'
'023120a970670dc85cea19393f0b94b6'
'df08eaa1ac3bc6c2356be4fbf8ec8932'
- '0debcc1c5515ce174cf3d3c8e934b42c'
+ '02a8b86b3d528770de28276cc98afa17'
'b03a979a78484503ba8dddad4f2c96d1'
'7b9e5996dd9fe0b186a43a297db1c6b5'
'6620e724ec9a1be74e65089d81d802f7'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index aca8983b9..7555cc8c4 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -18,7 +18,7 @@ index 331edc8..e18bd20 100644
pref("security.csp.speccompliant", true);
diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
-index c270318..c67d112 100644
+index c270318..5175eaa 100644
--- a/browser/base/content/abouthome/aboutHome.css
+++ b/browser/base/content/abouthome/aboutHome.css
@@ -49,11 +49,6 @@ a {
@@ -92,24 +92,17 @@ index c270318..c67d112 100644
#launcher {
display: -moz-box;
-moz-box-align: center;
-@@ -335,28 +287,23 @@ body[narrow] #restorePreviousSession::before {
+@@ -335,7 +287,7 @@ body[narrow] #restorePreviousSession::before {
width: 32px;
}
-#aboutMozilla {
+#aboutGNU {
-+ background: url("chrome://browser/content/abouthome/gnu_headshadow.png");
display: block;
-- position: relative; /* pin wordmark to edge of document, not of viewport */
-+ position: absolute;
-+ top: 12px;
-+ right: 12px;
-+ width: 200px;
-+ height: 110px;
+ position: relative; /* pin wordmark to edge of document, not of viewport */
-moz-box-ordinal-group: 0;
- opacity: .5;
-- transition: opacity 150ms;
-+ transition:opacity 150ms;
+@@ -343,18 +295,18 @@ body[narrow] #restorePreviousSession::before {
+ transition: opacity 150ms;
}
-#aboutMozilla:hover {
@@ -119,18 +112,20 @@ index c270318..c67d112 100644
-#aboutMozilla::before {
- content: url("chrome://browser/content/abouthome/mozilla.png");
-- display: block;
-- position: absolute;
-- top: 12px;
-- right: 12px;
++#aboutGNU::before {
++ content: url("chrome://browser/content/abouthome/gnu_headshadow.png");
+ display: block;
+ position: absolute;
+ top: 12px;
+ right: 12px;
- width: 69px;
- height: 19px;
--}
--
++ width: 200px;
++ height: 110px;
+ }
+
/* [HiDPI]
- * At resolutions above 1dppx, prefer downscaling the 2x Retina graphics
- * rather than upscaling the original-size ones (bug 818940).
-@@ -366,26 +313,7 @@ body[narrow] #restorePreviousSession::before {
+@@ -366,22 +318,8 @@ body[narrow] #restorePreviousSession::before {
background-image: url("chrome://branding/content/about-logo@2x.png");
}
@@ -150,21 +145,19 @@ index c270318..c67d112 100644
-
.launchButton::before,
- #aboutMozilla::before {
-- transform: scale(.5);
-- transform-origin: 0 0;
-- }
--
- #downloads::before {
- content: url("chrome://browser/content/abouthome/downloads@2x.png");
++ #aboutGNU::before {
+ transform: scale(.5);
+ transform-origin: 0 0;
}
-@@ -421,9 +349,5 @@ body[narrow] #restorePreviousSession::before {
- body[narrow] #restorePreviousSession::before {
+@@ -422,8 +360,8 @@ body[narrow] #restorePreviousSession::before {
content: url("chrome://browser/content/abouthome/restore@2x.png");
}
--
+
- #aboutMozilla::before {
- content: url("chrome://browser/content/abouthome/mozilla@2x.png");
-- }
++ #aboutGNU::before {
++ content: url("chrome://browser/content/abouthome/gnu_headshadow.png");
+ }
}
diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
@@ -734,10 +727,10 @@ index 432fcdc..8e85f1f 100644
function fitToWidth() {
diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
-index 1d03d38..5555f72 100644
+index 1d03d38..4f9b6b2 100644
--- a/browser/base/content/abouthome/aboutHome.xhtml
+++ b/browser/base/content/abouthome/aboutHome.xhtml
-@@ -43,19 +43,10 @@
+@@ -43,15 +43,6 @@
<input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
</form>
</div>
@@ -753,21 +746,37 @@ index 1d03d38..5555f72 100644
</div>
<div class="spacer"/>
-- <div id="launcher">
-+ <div id="launcher" session="true">
- <button class="launchButton" id="downloads">&abouthome.downloadsButton.label;</button>
- <button class="launchButton" id="bookmarks">&abouthome.bookmarksButton.label;</button>
- <button class="launchButton" id="history">&abouthome.historyButton.label;</button>
-@@ -66,7 +57,7 @@
+@@ -66,7 +57,6 @@
<div id="restorePreviousSessionSeparator"/>
<button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>
</div>
-
- <a id="aboutMozilla" href="https://www.mozilla.org/about/?utm_source=about-home&amp;utm_medium=Referral"/>
-+ <a href="http://directory.fsf.org/wiki/GNU_IceCat">Help GNU and FSF: Help add free addons to the directory!</a>
+ <a id="aboutGNU" href="http://gnu.org"></a>
</body>
</html>
+diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
+index e84341f..5476d32 100644
+--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd
++++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd
+@@ -13,17 +13,6 @@
+
+ <!ENTITY abouthome.searchEngineButton.label "Search">
+
+-<!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
+- text in <a/> will be linked to the Firefox features page on mozilla.com
+--->
+-<!ENTITY abouthome.defaultSnippet1.v1 "Thanks for choosing Firefox! To get the most out of your browser, learn more about the <a>latest features</a>.">
+-<!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
+- text in <a/> will be linked to the featured add-ons on addons.mozilla.org
+--->
+-<!ENTITY abouthome.defaultSnippet2.v1 "It's easy to customize your Firefox exactly the way you want it. <a>Choose from thousands of add-ons</a>.">
+-<!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights -->
+-<!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>">
+-
+ <!ENTITY abouthome.bookmarksButton.label "Bookmarks">
+ <!ENTITY abouthome.historyButton.label "History">
+ <!ENTITY abouthome.settingsButton.label "Settings">
diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
index 087cc50..5654eb9 100644
--- a/browser/locales/en-US/chrome/browser-region/region.properties