diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index dc8d9d97..f99be5b0 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -17,7 +17,6 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; -const k_tb_tornews_banner_countdown = "extensions.torbutton.tornews_banner_countdown"; var m_tb_prefs = Services.prefs; @@ -222,14 +221,6 @@ function torbutton_init_toolbutton() } } -// Show the Sign Up for Tor News banner a finite number of times. -function torbutton_tornews_banner_countdown() { - let count = m_tb_prefs.getIntPref(k_tb_tornews_banner_countdown, 0); - if (count > 0) { - m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, count - 1); - } -} - function torbutton_is_mobile() { return Services.appinfo.OS === "Android"; } @@ -342,10 +333,6 @@ function torbutton_init() { // Add about:tor IPC message listener. window.messageManager.addMessageListener("AboutTor:Loaded", torbutton_abouttor_message_handler); - window.messageManager.addMessageListener("AboutTor:HideTorNewsBanner", - torbutton_abouttor_message_handler); - - torbutton_tornews_banner_countdown(); setupPreferencesForMobile(); @@ -433,10 +420,6 @@ var torbutton_abouttor_message_handler = { aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", this.chromeData); break; - case "AboutTor:HideTorNewsBanner": - torbutton_log(5, "message AboutTor:HideTorNewsBanner received"); - m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, 0); - break; } }, diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 8560124b..982b147a 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -282,78 +282,6 @@ body:not([showmanual]) .showForManual { border-radius: 50px 50px 0 0; } -/* Tor News Signup Banner - * While this banner is present, we need to - * offset the elements normally at the top of - * the window. - */ - -#tornews-banner { - display: flex; - align-items: center; - background-color: white; - color: var(--abouttor-bg-toron-color); - font-size: 16px; - height: 60px; - justify-content: space-between; - left: 0px; - right: 0px; - top: 0px; - transform: translateY(-60px); - transition: transform 200ms; -} - -body[show-tornews-banner="true"] #tornews-banner { - transform: translateY(0px); - transition: transform 0ms; -} - -#tornews-banner-message { - align-items: center; - display: flex; - justify-content: center; -} - -#tornews-banner-message a { - color: var(--abouttor-bg-toron-color); -} - -#tornews-banner-icon { - background: url('chrome://torbutton/skin/newsletter_3x.png') no-repeat center center; - background-size: cover; - height: 32px; - margin: 0px 16px; - width: 32px; -} - -#tornews-banner-closer { - display: flex; - align-items: center; - font-size: 20px; - height: 22px; - justify-content: center; - margin: 4px 20px; - padding: 4px; - width: 22px; - -moz-user-select: none; -} - -#tornews-banner-closer:hover { - background-color: gray; - cursor: pointer; -} - -body[show-tornews-banner="false"] #torstatus-version, -body[show-tornews-banner="false"] #onboarding-overlay-button { - transition: transform 200ms; -} - -body[show-tornews-banner="true"] #torstatus-version, -body[show-tornews-banner="true"] #onboarding-overlay-button { - transform: translateY(60px); - transition: transform 0ms; -} - /* * Mobile specific css */ diff --git a/src/chrome/skin/newsletter_3x.png b/src/chrome/skin/newsletter_3x.png deleted file mode 100644 index 821572fa2cdf7970f34da28a68f5d37381fb0cc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 6735 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