summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaming4JC <g4jc@bulletmail.org>2018-05-17 22:43:13 -0400
committerGaming4JC <g4jc@bulletmail.org>2018-05-17 22:43:13 -0400
commit652460127fc2847a6874aa59a7bb168caec18bca (patch)
tree1443538c5c40d641f67a53414ec67f4971167c06
parentc4a763945657a357e883751a6e19ab5f316d366a (diff)
downloadiceweasel-uxp-652460127fc2847a6874aa59a7bb168caec18bca.tar.gz
various path fixes
-rw-r--r--branding/iceweasel/moz.build4
-rw-r--r--extensions/moz.build6
-rw-r--r--moz.configure2
-rw-r--r--themes/linux/browser.css4
-rw-r--r--themes/osx/browser.css4
-rw-r--r--themes/windows/browser.css4
6 files changed, 12 insertions, 12 deletions
diff --git a/branding/iceweasel/moz.build b/branding/iceweasel/moz.build
index 4e533f9..8cb9013 100644
--- a/branding/iceweasel/moz.build
+++ b/branding/iceweasel/moz.build
@@ -9,5 +9,5 @@ DIRS += ['content', 'locales']
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
-include('../branding-common.mozbuild')
-FirefoxBranding()
+include('../shared/branding.mozbuild')
+ApplicationBranding()
diff --git a/extensions/moz.build b/extensions/moz.build
index 3a9f112..c4b8a45 100644
--- a/extensions/moz.build
+++ b/extensions/moz.build
@@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-DIRS += [
- 'noscript',
-]
+#DIRS += [
+# 'noscript',
+#]
diff --git a/moz.configure b/moz.configure
index d5e7dba..7223625 100644
--- a/moz.configure
+++ b/moz.configure
@@ -4,4 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-include('../toolkit/moz.configure')
+include('../../toolkit/moz.configure')
diff --git a/themes/linux/browser.css b/themes/linux/browser.css
index 73d3844..4a48945 100644
--- a/themes/linux/browser.css
+++ b/themes/linux/browser.css
@@ -1510,8 +1510,8 @@ toolbarbutton.chevron > .toolbarbutton-icon {
%include ../shared/fullscreen/warning.inc.css
%include ../shared/ctrlTab.inc.css
-%include ../../../devtools/client/themes/responsivedesign.inc.css
-%include ../../../devtools/client/themes/commandline.inc.css
+%include ../../../../devtools/client/themes/responsivedesign.inc.css
+%include ../../../../devtools/client/themes/commandline.inc.css
%include ../shared/plugin-doorhanger.inc.css
notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:hover) {
diff --git a/themes/osx/browser.css b/themes/osx/browser.css
index e8ac916..9bd16e7 100644
--- a/themes/osx/browser.css
+++ b/themes/osx/browser.css
@@ -3152,8 +3152,8 @@ menulist.translate-infobar-element > .menulist-dropmarker {
%include ../shared/fullscreen/warning.inc.css
%include ../shared/ctrlTab.inc.css
-%include ../../../devtools/client/themes/responsivedesign.inc.css
-%include ../../../devtools/client/themes/commandline.inc.css
+%include ../../../../devtools/client/themes/responsivedesign.inc.css
+%include ../../../../devtools/client/themes/commandline.inc.css
%include ../shared/plugin-doorhanger.inc.css
%include downloads/indicator.css
diff --git a/themes/windows/browser.css b/themes/windows/browser.css
index a0cdabf..f833c42 100644
--- a/themes/windows/browser.css
+++ b/themes/windows/browser.css
@@ -2329,8 +2329,8 @@ notification[value="translation"] {
%include ../shared/fullscreen/warning.inc.css
%include ../shared/ctrlTab.inc.css
-%include ../../../devtools/client/themes/responsivedesign.inc.css
-%include ../../../devtools/client/themes/commandline.inc.css
+%include ../../../../devtools/client/themes/responsivedesign.inc.css
+%include ../../../../devtools/client/themes/commandline.inc.css
%include ../shared/plugin-doorhanger.inc.css
notification.pluginVulnerable > .notification-inner > .messageCloseButton {