From 3a9d1b5351f275ae49a93ea36934c4a8a65ad93b Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Thu, 24 May 2018 16:29:56 -0400 Subject: Remove the Social API --- browser/themes/shared/aboutProviderDirectory.css | 30 --------------------- browser/themes/shared/browser.inc | 2 +- .../themes/shared/customizableui/panelUI.inc.css | 4 --- browser/themes/shared/jar.inc.mn | 5 ---- browser/themes/shared/menuPanel-small.svg | 16 ----------- browser/themes/shared/menupanel.inc.css | 10 ------- browser/themes/shared/notification-icons.inc.css | 22 --------------- browser/themes/shared/social/gear_clicked.png | Bin 1262 -> 0 bytes browser/themes/shared/social/gear_default.png | Bin 1271 -> 0 bytes browser/themes/shared/social/social.inc.css | 23 ---------------- browser/themes/shared/toolbarbuttons.inc.css | 8 ------ 11 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 browser/themes/shared/aboutProviderDirectory.css delete mode 100644 browser/themes/shared/menuPanel-small.svg delete mode 100644 browser/themes/shared/social/gear_clicked.png delete mode 100644 browser/themes/shared/social/gear_default.png delete mode 100644 browser/themes/shared/social/social.inc.css (limited to 'browser/themes/shared') diff --git a/browser/themes/shared/aboutProviderDirectory.css b/browser/themes/shared/aboutProviderDirectory.css deleted file mode 100644 index 73e570aad..000000000 --- a/browser/themes/shared/aboutProviderDirectory.css +++ /dev/null @@ -1,30 +0,0 @@ -%include aboutSocialError.css - -body { - width: 310px; - margin: 1em auto; -} - -#message-box { - margin-top: 2em; - background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px; - padding-inline-start: 30px; -} - -#activation-frame { - border: none; - margin: 0; - width: 310px; - height: 200px; -} -#activation > p { - width: 100%; - text-align: center; - margin: 0; - line-height: 2em; -} -.link { - text-decoration: none; - color: -moz-nativehyperlinktext; - cursor: pointer; -} diff --git a/browser/themes/shared/browser.inc b/browser/themes/shared/browser.inc index c57b59237..81caf94d6 100644 --- a/browser/themes/shared/browser.inc +++ b/browser/themes/shared/browser.inc @@ -2,7 +2,7 @@ % Note that zoom-reset-button is a bit different since it doesn't use an image and thus has the image with display: none. %define nestedButtons #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button -%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, @nestedButtons@, #e10s-button, #panic-button, #webide-button, #containers-panelmenu +%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, @nestedButtons@, #e10s-button, #panic-button, #webide-button, #containers-panelmenu %ifdef XP_MACOSX % Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button to exit fullscreen diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index b0bb05415..ba36da995 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -951,7 +951,6 @@ panelview .toolbarbutton-1, .subviewbutton, .widget-overflow-list .toolbarbutton-1, .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button, -.share-provider-button, .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton { -moz-appearance: none; padding: 0 6px; @@ -964,7 +963,6 @@ panelview .toolbarbutton-1, panelview .toolbarbutton-1, .subviewbutton, .widget-overflow-list .toolbarbutton-1, -.share-provider-button, .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton { border-width: 1px; } @@ -1038,7 +1036,6 @@ panelview .toolbarbutton-1@buttonStateHover@, toolbarbutton.subviewbutton@buttonStateHover@, menu.subviewbutton@menuStateHover@, menuitem.subviewbutton@menuStateHover@, -.share-provider-button@buttonStateHover@:not([checked="true"]), .widget-overflow-list .toolbarbutton-1@buttonStateHover@, .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton@buttonStateHover@ { background-color: var(--arrowpanel-dimmed); @@ -1053,7 +1050,6 @@ panelview .toolbarbutton-1:-moz-any(@buttonStateActive@,[checked=true]), toolbarbutton.subviewbutton@buttonStateActive@, menu.subviewbutton@menuStateActive@, menuitem.subviewbutton@menuStateActive@, -.share-provider-button:-moz-any(@buttonStateActive@,[checked=true]), .widget-overflow-list .toolbarbutton-1@buttonStateActive@, .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton@buttonStateActive@ { background-color: var(--arrowpanel-dimmed-further); diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index dcc1e9dd9..b5cdf246a 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -10,9 +10,7 @@ skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css) skin/classic/browser/blockedSite.css (../shared/blockedSite.css) skin/classic/browser/error-pages.css (../shared/error-pages.css) -* skin/classic/browser/aboutProviderDirectory.css (../shared/aboutProviderDirectory.css) * skin/classic/browser/aboutSessionRestore.css (../shared/aboutSessionRestore.css) - skin/classic/browser/aboutSocialError.css (../shared/aboutSocialError.css) skin/classic/browser/aboutTabCrashed.css (../shared/aboutTabCrashed.css) skin/classic/browser/aboutWelcomeBack.css (../shared/aboutWelcomeBack.css) skin/classic/browser/content-contextmenu.svg (../shared/content-contextmenu.svg) @@ -65,7 +63,6 @@ * skin/classic/browser/identity-icon.svg (../shared/identity-block/identity-icon.svg) skin/classic/browser/info.svg (../shared/info.svg) * skin/classic/browser/menuPanel.svg (../shared/menuPanel.svg) -* skin/classic/browser/menuPanel-small.svg (../shared/menuPanel-small.svg) * skin/classic/browser/notification-icons.svg (../shared/notification-icons.svg) * skin/classic/browser/tracking-protection-16.svg (../shared/identity-block/tracking-protection-16.svg) skin/classic/browser/newtab/close.png (../shared/newtab/close.png) @@ -100,8 +97,6 @@ skin/classic/browser/search-indicator-magnifying-glass.svg (../shared/search/search-indicator-magnifying-glass.svg) skin/classic/browser/search-arrow-go.svg (../shared/search/search-arrow-go.svg) skin/classic/browser/gear.svg (../shared/search/gear.svg) - skin/classic/browser/social/gear_default.png (../shared/social/gear_default.png) - skin/classic/browser/social/gear_clicked.png (../shared/social/gear_clicked.png) skin/classic/browser/tabbrowser/connecting.png (../shared/tabbrowser/connecting.png) skin/classic/browser/tabbrowser/connecting@2x.png (../shared/tabbrowser/connecting@2x.png) skin/classic/browser/tabbrowser/crashed.svg (../shared/tabbrowser/crashed.svg) diff --git a/browser/themes/shared/menuPanel-small.svg b/browser/themes/shared/menuPanel-small.svg deleted file mode 100644 index db28992e2..000000000 --- a/browser/themes/shared/menuPanel-small.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - -#include icon-colors.inc.svg - - - - - - - - diff --git a/browser/themes/shared/menupanel.inc.css b/browser/themes/shared/menupanel.inc.css index 7517e4df0..266e1c83e 100644 --- a/browser/themes/shared/menupanel.inc.css +++ b/browser/themes/shared/menupanel.inc.css @@ -63,11 +63,6 @@ toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 416px, 32px, 384px); } -#social-share-button[cui-areatype="menu-panel"], -toolbarpaletteitem[place="palette"] > #social-share-button { - -moz-image-region: rect(0px, 448px, 32px, 416px); -} - #characterencoding-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #characterencoding-button { -moz-image-region: rect(0px, 480px, 32px, 448px); @@ -176,8 +171,3 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { -moz-image-region: rect(0px, 96px, 16px, 80px); } -#add-share-provider { - list-style-image: url(chrome://browser/skin/menuPanel-small.svg); - -moz-image-region: rect(0px, 96px, 16px, 80px); -} - diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css index 595e911b6..86dce73a1 100644 --- a/browser/themes/shared/notification-icons.inc.css +++ b/browser/themes/shared/notification-icons.inc.css @@ -271,28 +271,6 @@ html|*#webRTC-previewVideo { } } -/* SOCIAL API */ - -.popup-notification-icon[popupid="servicesInstall"] { - list-style-image: url(chrome://browser/skin/social/services-64.png); -} - -.service-icon { - list-style-image: url(chrome://browser/skin/social/services-16.png); -} - -%ifdef XP_MACOSX -@media (min-resolution: 1.1dppx) { - .popup-notification-icon[popupid="servicesInstall"] { - list-style-image: url(chrome://browser/skin/social/services-64@2x.png); - } - - .service-icon { - list-style-image: url(chrome://browser/skin/social/services-16@2x.png); - } -} -%endif - /* TRANSLATION */ .translation-icon { diff --git a/browser/themes/shared/social/gear_clicked.png b/browser/themes/shared/social/gear_clicked.png deleted file mode 100644 index 7c93aa767..000000000 Binary files a/browser/themes/shared/social/gear_clicked.png and /dev/null differ diff --git a/browser/themes/shared/social/gear_default.png b/browser/themes/shared/social/gear_default.png deleted file mode 100644 index 2a9c8e198..000000000 Binary files a/browser/themes/shared/social/gear_default.png and /dev/null differ diff --git a/browser/themes/shared/social/social.inc.css b/browser/themes/shared/social/social.inc.css deleted file mode 100644 index 31389b215..000000000 --- a/browser/themes/shared/social/social.inc.css +++ /dev/null @@ -1,23 +0,0 @@ -%if 0 -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ -%endif - -#manage-share-providers { - list-style-image: url("chrome://browser/skin/Toolbar.png"); - -moz-image-region: rect(0, 468px, 18px, 450px); -} - -#manage-share-providers > .toolbarbutton-icon { - min-height: 18px; - min-width: 18px; -} - -.social-panel > .panel-arrowcontainer > .panel-arrowcontent { - padding: 0; -} -/* fixup corners for share panel */ -.social-panel > .social-panel-frame { - border-radius: inherit; -} diff --git a/browser/themes/shared/toolbarbuttons.inc.css b/browser/themes/shared/toolbarbuttons.inc.css index b3b3ffcf8..c043b8192 100644 --- a/browser/themes/shared/toolbarbuttons.inc.css +++ b/browser/themes/shared/toolbarbuttons.inc.css @@ -64,10 +64,6 @@ toolbar[brighttext] #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarke -moz-image-region: rect(0, 288px, 18px, 270px); } -#social-share-button[cui-areatype="toolbar"] { - -moz-image-region: rect(0px, 306px, 18px, 288px); -} - #characterencoding-button[cui-areatype="toolbar"]{ -moz-image-region: rect(0, 324px, 18px, 306px); } @@ -242,10 +238,6 @@ toolbar[brighttext] #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarke -moz-image-region: rect(0, 576px, 36px, 540px); } - #social-share-button[cui-areatype="toolbar"] { - -moz-image-region: rect(0, 612px, 36px, 576px); - } - #characterencoding-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 648px, 36px, 612px); } -- cgit v1.2.3