summaryrefslogtreecommitdiffstats
path: root/browser/base
diff options
context:
space:
mode:
Diffstat (limited to 'browser/base')
-rw-r--r--browser/base/content/baseMenuOverlay.xul4
-rw-r--r--browser/base/content/browser-trackingprotection.js9
-rw-r--r--browser/base/content/browser.css65
-rwxr-xr-xbrowser/base/content/browser.js3
-rw-r--r--browser/base/content/browser.xul36
-rw-r--r--browser/base/content/utilityOverlay.js7
6 files changed, 0 insertions, 124 deletions
diff --git a/browser/base/content/baseMenuOverlay.xul b/browser/base/content/baseMenuOverlay.xul
index da74ca077..546103de1 100644
--- a/browser/base/content/baseMenuOverlay.xul
+++ b/browser/base/content/baseMenuOverlay.xul
@@ -52,10 +52,6 @@
#else
/>
#endif
- <menuitem id="menu_openTour"
- oncommand="openTourPage();"
- label="&helpShowTour2.label;"
- accesskey="&helpShowTour2.accesskey;"/>
<menuitem id="menu_keyboardShortcuts"
oncommand="openHelpLink('keyboard-shortcuts')"
onclick="checkForMiddleClick(this, event);"
diff --git a/browser/base/content/browser-trackingprotection.js b/browser/base/content/browser-trackingprotection.js
index cacb0522c..82743abbb 100644
--- a/browser/base/content/browser-trackingprotection.js
+++ b/browser/base/content/browser-trackingprotection.js
@@ -226,14 +226,5 @@ var TrackingProtection = {
style: "primary",
},
];
-
- let panelTarget = yield UITour.getTarget(window, "trackingProtection");
- UITour.initForBrowser(gBrowser.selectedBrowser, window);
- UITour.showInfo(window, panelTarget,
- gNavigatorBundle.getString("trackingProtection.intro.title"),
- gNavigatorBundle.getFormattedString("trackingProtection.intro.description2",
- [brandShortName]),
- undefined, buttons,
- { closeButtonCallback: () => this.dontShowIntroPanelAgain() });
}),
};
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index ac5bf9e9b..e951985dc 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -1152,71 +1152,6 @@ toolbarpaletteitem[place="palette"][hidden] {
display: none;
}
-/* UI Tour */
-
-@keyframes uitour-wobble {
- from {
- transform: rotate(0deg) translateX(3px) rotate(0deg);
- }
- 50% {
- transform: rotate(360deg) translateX(3px) rotate(-360deg);
- }
- to {
- transform: rotate(720deg) translateX(0px) rotate(-720deg);
- }
-}
-
-@keyframes uitour-zoom {
- from {
- transform: scale(0.8);
- }
- 50% {
- transform: scale(1.0);
- }
- to {
- transform: scale(0.8);
- }
-}
-
-@keyframes uitour-color {
- from {
- border-color: #5B9CD9;
- }
- 50% {
- border-color: #FF0000;
- }
- to {
- border-color: #5B9CD9;
- }
-}
-
-#UITourHighlightContainer,
-#UITourHighlight {
- pointer-events: none;
-}
-
-#UITourHighlight[active] {
- animation-delay: 2s;
- animation-fill-mode: forwards;
- animation-iteration-count: infinite;
- animation-timing-function: linear;
-}
-
-#UITourHighlight[active="wobble"] {
- animation-name: uitour-wobble;
- animation-delay: 0s;
- animation-duration: 1.5s;
- animation-iteration-count: 1;
-}
-#UITourHighlight[active="zoom"] {
- animation-name: uitour-zoom;
- animation-duration: 1s;
-}
-#UITourHighlight[active="color"] {
- animation-name: uitour-color;
- animation-duration: 2s;
-}
-
/* Combined context-menu items */
#context-navigation > .menuitem-iconic > .menu-iconic-text,
#context-navigation > .menuitem-iconic > .menu-accel-container {
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 4b8ec864b..e879f970f 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -48,7 +48,6 @@ Cu.import("resource://gre/modules/NotificationDB.jsm");
["Task", "resource://gre/modules/Task.jsm"],
["TelemetryStopwatch", "resource://gre/modules/TelemetryStopwatch.jsm"],
["Translation", "resource:///modules/translation/Translation.jsm"],
- ["UITour", "resource:///modules/UITour.jsm"],
["UpdateUtils", "resource://gre/modules/UpdateUtils.jsm"],
["Weave", "resource://services-sync/main.js"],
["fxAccounts", "resource://gre/modules/FxAccounts.jsm"],
@@ -984,7 +983,6 @@ var gBrowserInit = {
let mm = window.getGroupMessageManager("browsers");
mm.loadFrameScript("chrome://browser/content/tab-content.js", true);
mm.loadFrameScript("chrome://browser/content/content.js", true);
- mm.loadFrameScript("chrome://browser/content/content-UITour.js", true);
mm.loadFrameScript("chrome://global/content/manifestMessages.js", true);
// initialize observers and listeners
@@ -4474,7 +4472,6 @@ var XULBrowserWindow = {
gIdentityHandler.onLocationChange();
- UITour.onLocationChange(location);
gTabletModePageCounter.inc();
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 4f1b48349..028df609f 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -232,42 +232,6 @@
</hbox>
</panel>
- <!-- UI tour experience -->
- <panel id="UITourTooltip"
- type="arrow"
- hidden="true"
- noautofocus="true"
- noautohide="true"
- align="start"
- orient="vertical"
- role="alert">
- <vbox>
- <hbox id="UITourTooltipBody">
- <image id="UITourTooltipIcon"/>
- <vbox flex="1">
- <hbox id="UITourTooltipTitleContainer">
- <label id="UITourTooltipTitle" flex="1"/>
- <toolbarbutton id="UITourTooltipClose" class="close-icon"
- tooltiptext="&uiTour.infoPanel.close;"/>
- </hbox>
- <description id="UITourTooltipDescription" flex="1"/>
- </vbox>
- </hbox>
- <hbox id="UITourTooltipButtons" flex="1" align="center"/>
- </vbox>
- </panel>
- <!-- type="default" forces frames to be created so that the panel's size can be determined -->
- <panel id="UITourHighlightContainer"
- type="default"
- hidden="true"
- noautofocus="true"
- noautohide="true"
- flip="none"
- consumeoutsideclicks="false"
- mousethrough="always">
- <box id="UITourHighlight"></box>
- </panel>
-
<menupopup id="toolbar-context-menu"
onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
<menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index 4ea6d8f90..38ca82f55 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -809,13 +809,6 @@ function openFeedbackPage()
openUILinkIn(url, "tab");
}
-function openTourPage()
-{
- let scope = {}
- Components.utils.import("resource:///modules/UITour.jsm", scope);
- openUILinkIn(scope.UITour.url, "tab");
-}
-
function buildHelpMenu()
{
// Enable/disable the "Report Web Forgery" menu item.