diff options
author | Gaming4JC <g4jc@bulletmail.org> | 2018-05-28 13:41:57 -0400 |
---|---|---|
committer | Gaming4JC <g4jc@bulletmail.org> | 2018-05-28 13:41:57 -0400 |
commit | 81f34eef6964a1a6186dcb1f557d7c7672bfb1ed (patch) | |
tree | 038a9731737caf6621c814ec559dff04e0683e2e /themes | |
parent | 5cef659f6e487d73aaafe9db7f0c46b35e5c8d24 (diff) | |
download | iceweasel-uxp-81f34eef6964a1a6186dcb1f557d7c7672bfb1ed.tar.gz |
continue code cleanup of Social API
Diffstat (limited to 'themes')
-rw-r--r-- | themes/linux/browser.css | 50 | ||||
-rw-r--r-- | themes/linux/jar.mn | 2 | ||||
-rw-r--r-- | themes/osx/browser.css | 88 | ||||
-rw-r--r-- | themes/osx/jar.mn | 4 | ||||
-rw-r--r-- | themes/shared/aboutProviderDirectory.css | 30 | ||||
-rw-r--r-- | themes/shared/customizableui/panelUI.inc.css | 4 | ||||
-rw-r--r-- | themes/shared/jar.inc.mn | 3 | ||||
-rw-r--r-- | themes/shared/menuPanel-small.svg | 16 | ||||
-rw-r--r-- | themes/shared/menupanel.inc.css | 8 | ||||
-rw-r--r-- | themes/shared/notification-icons.inc.css | 22 | ||||
-rw-r--r-- | themes/shared/social/social.inc.css | 23 | ||||
-rw-r--r-- | themes/shared/toolbarbuttons.inc.css | 8 | ||||
-rw-r--r-- | themes/windows/browser.css | 75 | ||||
-rw-r--r-- | themes/windows/customizableui/panelUI.css | 8 | ||||
-rw-r--r-- | themes/windows/jar.mn | 2 |
15 files changed, 1 insertions, 342 deletions
diff --git a/themes/linux/browser.css b/themes/linux/browser.css index 4a48945..4676098 100644 --- a/themes/linux/browser.css +++ b/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/themes/linux/jar.mn b/themes/linux/jar.mn index 0bf023f..073bc2a 100644 --- a/themes/linux/jar.mn +++ b/themes/linux/jar.mn @@ -81,8 +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) diff --git a/themes/osx/browser.css b/themes/osx/browser.css index 9bd16e7..ab3dd7a 100644 --- a/themes/osx/browser.css +++ b/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/themes/osx/jar.mn b/themes/osx/jar.mn index 98ba4e6..2780284 100644 --- a/themes/osx/jar.mn +++ b/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/themes/shared/aboutProviderDirectory.css b/themes/shared/aboutProviderDirectory.css deleted file mode 100644 index 73e570a..0000000 --- a/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/themes/shared/customizableui/panelUI.inc.css b/themes/shared/customizableui/panelUI.inc.css index b0bb054..ba36da9 100644 --- a/themes/shared/customizableui/panelUI.inc.css +++ b/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/themes/shared/jar.inc.mn b/themes/shared/jar.inc.mn index dcc1e9d..0a7c9d1 100644 --- a/themes/shared/jar.inc.mn +++ b/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) diff --git a/themes/shared/menuPanel-small.svg b/themes/shared/menuPanel-small.svg deleted file mode 100644 index db28992..0000000 --- a/themes/shared/menuPanel-small.svg +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.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/. --> -<svg xmlns="http://www.w3.org/2000/svg" - width="96" height="16" viewBox="0 0 96 16" - class="fieldtext"> -#include icon-colors.inc.svg - - <path id="placeholder" d="M8,16a8,8,0,1,1,8-8A8,8,0,0,1,8,16ZM12,4H4v8h8V4ZM5,9.939V6.061L6.939,8ZM9.939,11H6.061L8,9.061ZM11,11h0Zm0-4.939V9.939L9.061,8ZM11,5h0ZM6.061,5H9.939L8,6.939Z"/> - <path id="cut" d="M29.63,15a2.426,2.426,0,0,1-2.282-1.277c-0.761-1.109-1.694-2.488-1.694-2.488S25,10.329,24.549,9.623a1.05,1.05,0,0,0-1.106-.538S20.6,4.437,20.124,3.706C19.465,2.689,20.7,1,20.7,1l4.4,7.044a19.333,19.333,0,0,0,1.867,2.286c0.519,0.4,1.382-.373,2.8.908C31.7,12.984,31.048,15,29.63,15ZM29.423,12.11c-0.933-1.042-1.728-.908-1.936-0.639a2.093,2.093,0,0,0,.38,1.748,1.612,1.612,0,0,0,1.383.74C29.838,13.959,30.356,13.153,29.423,12.11ZM25.582,7.372L24.4,5.6,27.276,1s1.233,1.69.575,2.708C27.568,4.142,26.445,5.967,25.582,7.372Zm-4.576,2.956A12.482,12.482,0,0,0,22.43,8.645l0.826,1.239c-0.428.65-.937,1.352-0.937,1.352s-0.933,1.378-1.694,2.488A2.426,2.426,0,0,1,18.344,15c-1.417,0-2.074-2.017-.138-3.765C19.624,9.956,20.487,10.732,21.006,10.329ZM18.551,12.11c-0.933,1.042-.415,1.849.173,1.849a1.612,1.612,0,0,0,1.383-.74,2.093,2.093,0,0,0,.38-1.748C20.28,11.2,19.485,11.068,18.551,12.11Z"/> - <path id="copy" d="M46,15H40a1,1,0,0,1-1-1V6a1,1,0,0,1,1-1h4.953C45,5,47,6.984,47,7.047V14A1,1,0,0,1,46,15ZM44,6V8h2ZM38,4.886V11H34a1,1,0,0,1-1-1V2a1,1,0,0,1,1-1h4.953C39,1,41,2.985,41,3.047v1.34H38.5A0.5,0.5,0,0,0,38,4.886ZM38,2V4h2Z"/> - <path id="paste" d="M59.5,15h-7A1.5,1.5,0,0,1,51,13.5v-9A1.5,1.5,0,0,1,52.5,3H54a2,2,0,1,1,4,0h1.5A1.5,1.5,0,0,1,61,4.5v9A1.5,1.5,0,0,1,59.5,15ZM58.682,4L57.61,3.5a1.613,1.613,0,0,0-3.219,0L53.318,4,52.781,5h6.437ZM58.82,5.688H54.074L51.059,7.428l2.849,4.935,6.574-3.8Z"/> - <rect id="zoomOut" x="67" y="7" width="10" height="2"/> - <path id="zoomIn" d="M93,9H89v4H87V9H83V7h4V3h2V7h4V9Z"/> -</svg> diff --git a/themes/shared/menupanel.inc.css b/themes/shared/menupanel.inc.css index 7517e4d..99fe483 100644 --- a/themes/shared/menupanel.inc.css +++ b/themes/shared/menupanel.inc.css @@ -174,10 +174,4 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button { #zoom-controls@inAnyPanel@ > #zoom-in-button, 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); -} - +}
\ No newline at end of file diff --git a/themes/shared/notification-icons.inc.css b/themes/shared/notification-icons.inc.css index 595e911..86dce73 100644 --- a/themes/shared/notification-icons.inc.css +++ b/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/themes/shared/social/social.inc.css b/themes/shared/social/social.inc.css deleted file mode 100644 index 31389b2..0000000 --- a/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/themes/shared/toolbarbuttons.inc.css b/themes/shared/toolbarbuttons.inc.css index b3b3ffc..c043b81 100644 --- a/themes/shared/toolbarbuttons.inc.css +++ b/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/themes/windows/browser.css b/themes/windows/browser.css index f833c42..ed6f19f 100644 --- a/themes/windows/browser.css +++ b/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/themes/windows/customizableui/panelUI.css b/themes/windows/customizableui/panelUI.css index 189a163..a01a2f3 100644 --- a/themes/windows/customizableui/panelUI.css +++ b/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/themes/windows/jar.mn b/themes/windows/jar.mn index 4101486..e8db7ee 100644 --- a/themes/windows/jar.mn +++ b/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) |