summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-09-14 19:14:16 +0200
committeranonym <anonym@riseup.net>2015-09-16 20:59:39 +0200
commit8bd660401963b2faca3d9aaa5ea497efb7d2ad49 (patch)
tree9ed5b94736433cc3b958820a9ad2596f660e59e5
parent36016e8748588d2adce7b4ff92a09471f983b4ee (diff)
Abstract the chroot browser userChrome.css configurations.
I.e. move the common parts to a shared userChrome.css used for all chroot browser files. Will-fix: #9896
-rw-r--r--config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh3
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browser/userChrome.css25
-rw-r--r--config/chroot_local-includes/usr/share/tails/i2p-browser/userChrome.css27
-rw-r--r--config/chroot_local-includes/usr/share/tails/unsafe-browser/userChrome.css24
4 files changed, 31 insertions, 48 deletions
diff --git a/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh b/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
index 74600cc..9e98b35 100644
--- a/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
+++ b/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
@@ -166,7 +166,8 @@ configure_chroot_browser_profile () {
# appending to the camouflage config.
local browser_chrome="${browser_profile}/chrome/userChrome.css"
mkdir -p "$(dirname "${browser_chrome}")"
- cat "/usr/share/tails/${browser_name}/userChrome.css" >> "${browser_chrome}"
+ cat "/usr/share/tails/chroot-browser/userChrome.css" \
+ "/usr/share/tails/${browser_name}/userChrome.css" >> "${browser_chrome}"
set_chroot_browser_permissions "${chroot}" "${browser_name}" "${browser_user}"
}
diff --git a/config/chroot_local-includes/usr/share/tails/chroot-browser/userChrome.css b/config/chroot_local-includes/usr/share/tails/chroot-browser/userChrome.css
new file mode 100644
index 0000000..cf4822c
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browser/userChrome.css
@@ -0,0 +1,25 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Hide the Tools -> Apps link to the Firefox Marketplace, and
+ Tools -> Add-ons link to the Add-ons manager. We do not want to
+ encourage installing such things as it's not part of the supported
+ use-cases and may have privacy issues. Also they will not persist a
+ restart, which is just confusing. In the I2P Browser, many of these
+ features will not work any way. */
+#menu_openApps,
+#menu_openAddons, /* traditional menu */
+#add-ons-button, /* new style Firefox menu */
+#wrapper-add-ons-button, /* Customize toolbar */
+
+/* Hide the "Share this page" button in the Tool bar, which encourages
+ the use of social (= tracking) networks. These will not work in the
+ I2P browser any way. */
+#social-share-button,
+
+/* Hide TorBrowser Health Report and its configuration option */
+#appmenu_healthReport,
+#dataChoicesTab,
+#healthReport
+
+/* Do the actual hiding. */
+{display: none !important}
diff --git a/config/chroot_local-includes/usr/share/tails/i2p-browser/userChrome.css b/config/chroot_local-includes/usr/share/tails/i2p-browser/userChrome.css
index 1fac475..3dce6d6 100644
--- a/config/chroot_local-includes/usr/share/tails/i2p-browser/userChrome.css
+++ b/config/chroot_local-includes/usr/share/tails/i2p-browser/userChrome.css
@@ -1,4 +1,3 @@
-/* Required, do not remove */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* Hide access to the bookmarks to try to prevent "data loss" due to users
@@ -24,17 +23,6 @@
#wrapper-history-button,
#wrapper-bookmarks-button,
-/* Hide the Tools -> Apps link to the Firefox Marketplace, and
- Tools -> Add-ons link to the Add-ons manager. We do not want to
- encourage installing such things as it's not part of the supported
- use-cases and may have privacy issues. Also they will not persist a
- restart, which is just confusing. In the I2P Browser, many of these
- features will not work any way. */
-#menu_openApps,
-#menu_openAddons, /* traditional menu */
-#add-ons-button, /* new style Firefox menu */
-#wrapper-add-ons-button, /* Customize toolbar */
-
/* Hide the sidebar menu (underneath View) since the default sidebars consist
* of history and bookmarks. Also disable the bookmark toolbar.
*/
@@ -76,12 +64,6 @@ menuitem[command="Browser:SendLink"],
#sync-syncnowitem-appmenu,
#wrapper-sync-button,
-/* Hide the "Share this page" button in the Tool bar, which encourages
- the use of social (= tracking) networks. These will not work in the
- I2P browser any way. Note that this one likely will be removed
- upstream in the final Tor Browser 5.0 release. */
-#social-share-button,
-
/* Hide the "Keyboard shortcuts" and "Tour" options from
from the Help menu */
#menu_keyboardShortcuts,
@@ -107,12 +89,7 @@ from the Help menu */
/* Hide the TorButton button from the toolbar */
#torbutton-button,
-#wrapper-torbutton-button,
-
-/* Hide TorBrowser Health Report and its configuration option */
-#appmenu_healthReport,
-#dataChoicesTab,
-#healthReport
+#wrapper-torbutton-button
-/* Now the actual hiding */
+/* Do the actual hiding. */
{display: none !important}
diff --git a/config/chroot_local-includes/usr/share/tails/unsafe-browser/userChrome.css b/config/chroot_local-includes/usr/share/tails/unsafe-browser/userChrome.css
index 2b0c041..e0185e7 100644
--- a/config/chroot_local-includes/usr/share/tails/unsafe-browser/userChrome.css
+++ b/config/chroot_local-includes/usr/share/tails/unsafe-browser/userChrome.css
@@ -1,4 +1,3 @@
-/* Required, do not remove */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* Hide Firefox Sync options. Sync hasn't been audited by the
@@ -12,26 +11,7 @@
#sync-setup-appmenu,
#sync-status-button,
#sync-syncnowitem-appmenu,
-#wrapper-sync-button,
-
-/* Hide the Tools -> Apps link to the Firefox Marketplace, and
- Tools -> Add-ons link to the Add-ons manager. We do not want to
- encourage installing such things as it's not part of the supported
- use-cases and may have privacy issues. Also they will not persist a
- restart, which is just confusing. */
-#menu_openApps,
-#menu_openAddons, /* traditional menu */
-#add-ons-button, /* new style Firefox menu */
-#wrapper-add-ons-button, /* Customize toolbar */
-
-/* Hide the "Share this page" button in the Tool bar, which encourages
- the use of social (= tracking) networks. Note that this one likely
- will be removed upstream in the final Tor Browser 5.0 release. */
-#social-share-button,
-
-/* Hide TorBrowser Health Report and its configuration option */
-#appmenu_healthReport,
-#dataChoicesTab,
-#healthReport
+#wrapper-sync-button
+/* Do the actual hiding. */
{display: none !important}