From 5f89c3da66862d82fa27092986c4065aba3574ff Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Wed, 30 May 2018 17:45:05 -0400 Subject: Remove Social API. --- browser/themes/linux/browser.css | 50 ------------ browser/themes/linux/customizableui/panelUI.css | 8 -- browser/themes/linux/jar.mn | 4 - browser/themes/osx/browser.css | 88 --------------------- browser/themes/osx/jar.mn | 4 - 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 | 4 - 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 -- browser/themes/windows/browser.css | 75 ------------------ browser/themes/windows/customizableui/panelUI.css | 8 -- browser/themes/windows/jar.mn | 2 - 18 files changed, 1 insertion(+), 341 deletions(-) delete mode 100644 browser/themes/shared/aboutProviderDirectory.css 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') diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index 73d3844a2..3e6b81512 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -1172,56 +1172,6 @@ html|span.ac-emphasize-text-url { -moz-image-region: rect(0, 48px, 16px, 32px); } -/* social share panel */ -%include ../shared/social/social.inc.css - -.social-share-frame { - border-top: 1px solid #f8f8f8; - width: 756px; - height: 150px; -} - -#share-container { - min-width: 756px; - background-color: white; - background-repeat: no-repeat; - background-position: center center; -} -#share-container[loading] { - background-image: url(chrome://browser/skin/tabbrowser/pendingpaint.png); -} -#share-container > browser { - transition: opacity 150ms ease-in-out; - opacity: 1; -} -#share-container[loading] > browser { - opacity: 0; -} - -.social-share-toolbar { - border-bottom: 1px solid #dedede; - padding: 2px; -} - -#social-share-provider-buttons { - padding: 0; - margin: 0; -} - -.share-provider-button { - padding: 5px; - margin: 2px; -} - -.share-provider-button > .toolbarbutton-text { - display: none; -} -.share-provider-button > .toolbarbutton-icon { - width: 16px; - min-height: 16px; - max-height: 16px; -} - /* bookmarks menu-button */ #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker { diff --git a/browser/themes/linux/customizableui/panelUI.css b/browser/themes/linux/customizableui/panelUI.css index 289faa085..0037b5634 100644 --- a/browser/themes/linux/customizableui/panelUI.css +++ b/browser/themes/linux/customizableui/panelUI.css @@ -49,14 +49,6 @@ padding-inline-start: 0; } -/* subviewbutton entries for social sidebars have images that come from external -/* sources, and are not guaranteed to be the size we want, so force the size on -/* those icons. */ -toolbarbutton.social-provider-menuitem > .toolbarbutton-icon { - width: 16px; - height: 16px; -} - .subviewbutton:-moz-any([image],[targetURI],.cui-withicon, .restoreallitem, .bookmark-item)[checked="true"] > .toolbarbutton-icon { visibility: hidden; } diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 0bf023f35..189027812 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -81,10 +81,6 @@ browser.jar: * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) * skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) - skin/classic/browser/social/services-16.png (social/services-16.png) - skin/classic/browser/social/services-64.png (social/services-64.png) - skin/classic/browser/social/share-button.png (social/share-button.png) - skin/classic/browser/social/share-button-active.png (social/share-button-active.png) skin/classic/browser/tabbrowser/alltabs.png (tabbrowser/alltabs.png) skin/classic/browser/tabbrowser/alltabs-inverted.png (tabbrowser/alltabs-inverted.png) skin/classic/browser/tabbrowser/newtab.svg (tabbrowser/newtab.svg) diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index e8ac9163e..5a83c74b2 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -808,10 +808,6 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-ic -moz-image-region: rect(18px, 288px, 36px, 270px); } - #social-share-button@toolbarButtonPressed@ { - -moz-image-region: rect(18px, 306px, 36px, 288px); - } - #characterencoding-button@toolbarButtonPressed@ { -moz-image-region: rect(18px, 324px, 36px, 306px); } @@ -967,10 +963,6 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-ic -moz-image-region: rect(36px, 576px, 72px, 540px); } - #social-share-button@toolbarButtonPressed@ { - -moz-image-region: rect(36px, 612px, 72px, 576px); - } - #characterencoding-button@toolbarButtonPressed@ { -moz-image-region: rect(36px, 648px, 72px, 612px); } @@ -2029,59 +2021,6 @@ html|span.ac-emphasize-text-url { -moz-image-region: rect(0, 48px, 16px, 32px); } -/* social share panel */ -.social-share-frame { - border-top: 1px solid #f8f8f8; - min-width: 756px; - height: 150px; - /* we resize our panels dynamically, make it look nice */ -} - -#share-container { - min-width: 756px; - background-repeat: no-repeat; - background-position: center center; -} -#share-container[loading] { - background-image: url(chrome://browser/skin/tabbrowser/pendingpaint.png); -} -#share-container > browser { - transition: opacity 150ms ease-in-out; - opacity: 1; -} -#share-container[loading] > browser { - opacity: 0; -} - -#manage-share-providers { - -moz-image-region: rect(18px, 468px, 36px, 450px); -} - -.social-share-toolbar { - border-bottom: 1px solid #dedede; - padding: 2px; -} - -#social-share-provider-buttons { - padding: 0; - margin: 0; -} - -.share-provider-button { - padding: 5px; - margin: 2px; -} - -.share-provider-button > .toolbarbutton-text { - display: none; -} - -.share-provider-button > .toolbarbutton-icon { - width: 16px; - min-height: 16px; - max-height: 16px; -} - /* BOOKMARKING PANEL */ #editBookmarkPanelStarIcon { list-style-image: url("chrome://browser/skin/places/starred48.png"); @@ -3182,33 +3121,6 @@ menulist.translate-infobar-element > .menulist-dropmarker { border-radius: 1px; } -/* Share */ -%include ../shared/social/social.inc.css - -#social-share-panel { - min-height: 100px; - min-width: 300px; - transition: height .3s ease-in-out, width .3s ease-in-out; -} - -#share-container, -.social-share-frame { - border-top-left-radius: 0; - border-bottom-left-radius: inherit; - border-top-right-radius: 0; - border-bottom-right-radius: inherit; -} - -#social-share-panel > .social-share-toolbar { - border-top-left-radius: inherit; - border-top-right-radius: inherit; -} - -#social-share-provider-buttons { - border-top-left-radius: inherit; - border-top-right-radius: inherit; -} - /* Customization mode */ %include ../shared/customizableui/customizeMode.inc.css diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index 98ba4e6ea..27802843d 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -124,10 +124,6 @@ browser.jar: * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) * skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) - skin/classic/browser/social/services-16.png (social/services-16.png) - skin/classic/browser/social/services-16@2x.png (social/services-16@2x.png) - skin/classic/browser/social/services-64.png (social/services-64.png) - skin/classic/browser/social/services-64@2x.png (social/services-64@2x.png) skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon.png (tabbrowser/alltabs-box-bkgnd-icon.png) skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon-inverted.png (tabbrowser/alltabs-box-bkgnd-icon-inverted.png) skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png (tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png) 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..588cf5364 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) @@ -100,8 +98,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.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); } diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index a0cdabfb2..b364dbc36 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -1784,81 +1784,6 @@ html|span.ac-emphasize-text-url { -moz-image-region: rect(0, 48px, 16px, 32px); } -/* social share panel */ -%include ../shared/social/social.inc.css - -.social-panel-frame { - border-radius: inherit; -} - -.social-share-frame { - min-width: 756px; - height: 150px; -} -#share-container { - min-width: 756px; - background-color: white; - background-repeat: no-repeat; - background-position: center center; -} -#share-container[loading] { - background-image: url(chrome://browser/skin/tabbrowser/pendingpaint.png); -} -#share-container > browser { - transition: opacity 150ms ease-in-out; - opacity: 1; -} -#share-container[loading] > browser { - opacity: 0; -} - -.social-share-toolbar { - border-bottom: 1px solid #e2e5e8; - padding: 2px; -} - -#social-share-provider-buttons { - padding: 0; - margin: 0; -} - -.share-provider-button { - padding: 5px; - margin: 2px; -} - -.share-provider-button > .toolbarbutton-text { - display: none; -} -.share-provider-button > .toolbarbutton-icon { - width: 16px; - min-height: 16px; - max-height: 16px; -} - -#social-share-panel { - min-height: 100px; - min-width: 766px; -} - -#share-container, -.social-share-frame { - border-top-left-radius: 0; - border-bottom-left-radius: inherit; - border-top-right-radius: 0; - border-bottom-right-radius: inherit; -} - -#social-share-panel > .social-share-toolbar { - border-top-left-radius: inherit; - border-top-right-radius: inherit; -} - -#social-share-provider-buttons { - border-top-left-radius: inherit; - border-top-right-radius: inherit; -} - /* bookmarks menu-button */ #nav-bar #bookmarks-menu-button[cui-areatype="toolbar"]:not([overflowedItem=true]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { diff --git a/browser/themes/windows/customizableui/panelUI.css b/browser/themes/windows/customizableui/panelUI.css index 189a163f3..a01a2f3e3 100644 --- a/browser/themes/windows/customizableui/panelUI.css +++ b/browser/themes/windows/customizableui/panelUI.css @@ -97,14 +97,6 @@ menuitem[type="checkbox"].subviewbutton { padding-inline-start: 0; } -/* subviewbutton entries for social sidebars have images that come from external -/* sources, and are not guaranteed to be the size we want, so force the size on -/* those icons. */ -toolbarbutton.social-provider-menuitem > .toolbarbutton-icon { - width: 16px; - height: 16px; -} - .subviewbutton:-moz-any([image],[targetURI],.cui-withicon, .restoreallitem, .bookmark-item)[checked="true"] > .toolbarbutton-icon { visibility: hidden; } diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 410148645..e8db7eed2 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -109,8 +109,6 @@ browser.jar: * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) * skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) - skin/classic/browser/social/services-16.png (social/services-16.png) - skin/classic/browser/social/services-64.png (social/services-64.png) skin/classic/browser/tabbrowser/newtab.svg (tabbrowser/newtab.svg) skin/classic/browser/tabbrowser/newtab-win7.svg (tabbrowser/newtab-win7.svg) skin/classic/browser/tabbrowser/newtab-inverted.svg (tabbrowser/newtab-inverted.svg) -- cgit v1.2.3