Bug 1289549 P4 socialapi remove unused css, r=florian
☠☠ backed out by c60886d5c003 ☠ ☠
authorShane Caraveo <scaraveo@mozilla.com>
Thu, 04 Aug 2016 09:24:22 -0700
changeset 308226 40d5477b89606ca1c56e99b668a7fe669f5cce89
parent 308225 af2c234795a96b578ba94f3d372d676b2d70e95d
child 308227 27e2621947f26a189743243acfa75ed0d7753409
push id31092
push usercbook@mozilla.com
push dateFri, 05 Aug 2016 10:16:59 +0000
treeherderautoland@b97dd7dd3cb9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian
bugs1289549
milestone51.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1289549 P4 socialapi remove unused css, r=florian MozReview-Commit-ID: CwKWWP4V5Yz
browser/base/content/browser.css
browser/themes/linux/browser.css
browser/themes/osx/browser.css
browser/themes/shared/jar.inc.mn
browser/themes/shared/social/chat-icons.svg
browser/themes/shared/social/chat.inc.css
browser/themes/shared/social/social.inc.css
browser/themes/windows/browser-aero.css
browser/themes/windows/browser.css
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -883,20 +883,16 @@ html|*#gcli-output-frame,
 .browserStack[responsivemode] {
   transition-property: min-width, max-width, min-height, max-height;
 }
 
 .browserStack[responsivemode][notransition] {
   transition: none;
 }
 
-toolbarbutton[type="socialmark"] {
-  -moz-binding: url("chrome://browser/content/socialmarks.xml#toolbarbutton-marks");
-}
-
 panelview > .social-panel-frame {
   width: auto;
   height: auto;
 }
 
 /* Translation */
 notification[value="translation"] {
   -moz-binding: url("chrome://browser/content/translation-infobar.xml#translationbar");
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1359,16 +1359,17 @@ html|span.ac-emphasize-text-url {
 }
 
 #reader-mode-button:hover:active,
 #reader-mode-button[readeractive] {
   -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 {
@@ -1407,22 +1408,16 @@ html|span.ac-emphasize-text-url {
   display: none;
 }
 .share-provider-button > .toolbarbutton-icon {
   width: 16px;
   min-height: 16px;
   max-height: 16px;
 }
 
-/* social recommending panel */
-
-#social-mark-button {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
 /* bookmarks menu-button */
 
 #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker {
   -moz-appearance: none !important;
   -moz-box-align: center;
 }
 
 #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
@@ -1807,40 +1802,16 @@ notification.pluginVulnerable > .notific
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
   margin-inline-end: 2px;
 }
 
-/* social toolbar provider menu */
-#social-statusarea-popup {
-  margin-top: 0;
-  margin-left: -12px;
-  margin-right: -12px;
-}
-
-.social-statusarea-user {
-  list-style-image:url("chrome://global/skin/icons/information-32.png");
-}
-
-.social-statusarea-user-portrait {
-  width: 32px;
-  height: 32px;
-  border-radius: 2px;
-  margin: 10px;
-}
-
-.social-panel > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0;
-}
-
-%include ../shared/social/chat.inc.css
-
 /* Customization mode */
 
 %include ../shared/customizableui/customizeMode.inc.css
 
 #main-window[customize-entered] > #tab-view-deck {
   background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"),
                     linear-gradient(to bottom, #bcbcbc, #b5b5b5);
   background-attachment: fixed;
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -1987,34 +1987,31 @@ html|span.ac-emphasize-text-url {
   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-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;
 }
 
-#manage-share-providers,
-#social-sidebar-button:hover,
-#social-sidebar-button:hover:active {
+#manage-share-providers {
   -moz-image-region: rect(18px, 468px, 36px, 450px);
 }
 
 .social-share-toolbar {
   border-bottom: 1px solid #dedede;
   padding: 2px;
 }
 
@@ -2033,22 +2030,16 @@ html|span.ac-emphasize-text-url {
 }
 
 .share-provider-button > .toolbarbutton-icon {
   width: 16px;
   min-height: 16px;
   max-height: 16px;
 }
 
-/* social recommending panel */
-
-#social-mark-button {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
 /* BOOKMARKING PANEL */
 #editBookmarkPanelStarIcon {
   list-style-image: url("chrome://browser/skin/places/starred48.png");
   width: 48px;
   height: 48px;
 }
 
 #editBookmarkPanelStarIcon[unstarred] {
@@ -2959,20 +2950,16 @@ menuitem:hover > hbox > .alltabs-endimag
 
 %include ../shared/notification-icons.inc.css
 
 .notification-anchor-icon:-moz-focusring {
   box-shadow: 0 0 2px 1px -moz-mac-focusring inset,
               0 0 3px 2px -moz-mac-focusring;
 }
 
-#social-notification-icon > .toolbarbutton-icon {
-  height: 16px;
-}
-
 /* Translation */
 
 %include ../shared/translation/infobar.inc.css
 
 notification[value="translation"] {
   color: #484848;
   background-color: #EFEFEF;
   background-image: none;
@@ -3218,39 +3205,18 @@ menulist.translate-infobar-element > .me
 #developer-toolbar-toolbox-button[error-count]:before {
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
 }
 
-/* === end of social toolbar button === */
-
-/* === social toolbar provider menu  === */
-
-.social-statusarea-user {
-  list-style-image:url("chrome://global/skin/icons/information-32.png");
-}
-
-.social-statusarea-user-portrait {
-  width: 32px;
-  height: 32px;
-  margin: 4px;
-  margin-inline-start: 0;
-}
-
-.social-panel > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0;
-}
-
-/* fixup rounded corners for osx panels */
-.social-panel > .social-panel-frame {
-  border-radius: inherit;
-}
+/* 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,
@@ -3266,20 +3232,16 @@ menulist.translate-infobar-element > .me
   border-top-right-radius: inherit;
 }
 
 #social-share-provider-buttons {
   border-top-left-radius: inherit;
   border-top-right-radius: inherit;
 }
 
-/* === end of social toolbar provider menu === */
-
-%include ../shared/social/chat.inc.css
-
 /* Customization mode */
 
 %include ../shared/customizableui/customizeMode.inc.css
 
 #main-window[customizing] {
   background-color: rgb(178,178,178);
 }
 
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -94,17 +94,16 @@
   skin/classic/browser/badge-add-engine.png                    (../shared/search/badge-add-engine.png)
   skin/classic/browser/badge-add-engine@2x.png                 (../shared/search/badge-add-engine@2x.png)
   skin/classic/browser/search-indicator-badge-add.png          (../shared/search/search-indicator-badge-add.png)
   skin/classic/browser/search-indicator-badge-add@2x.png       (../shared/search/search-indicator-badge-add@2x.png)
   skin/classic/browser/search-history-icon.svg                 (../shared/search/history-icon.svg)
   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/chat-icons.svg                   (../shared/social/chat-icons.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)
   skin/classic/browser/tabbrowser/pendingpaint.png             (../shared/tabbrowser/pendingpaint.png)
 * skin/classic/browser/tabbrowser/tab-audio.svg                (../shared/tabbrowser/tab-audio.svg)
   skin/classic/browser/tabbrowser/tab-audio-small.svg          (../shared/tabbrowser/tab-audio-small.svg)
deleted file mode 100644
--- a/browser/themes/shared/social/chat-icons.svg
+++ /dev/null
@@ -1,51 +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" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-3 -3 16 16">
-  <style>
-    use:not(:target) {
-      display: none;
-    }
-    use {
-      fill: #666;
-    }
-    use[id$="-hover"] {
-      fill: #4a4a4a;
-    }
-    use[id$="-active"] {
-      fill: #4a4a4a;
-    }
-    use[id$="-disabled"] {
-      fill: #666;
-    }
-    use[id$="-white"] {
-      fill: #fff;
-    }
-  </style>
-  <defs>
-    <polygon id="close-shape" points="10,1.717 8.336,0.049 5.024,3.369 1.663,0 0,1.668 3.36,5.037 0.098,8.307 1.762,9.975 5.025,6.705 8.311,10 9.975,8.332 6.688,5.037"/>
-    <path id="dropdown-shape" fill-rule="evenodd" d="M9,3L4.984,7L1,3H9z"/>
-    <g id="expand-shape">
-      <path fill-rule="evenodd" d="M9.429,7.072v2.143c0,0.531-0.188,0.985-0.566,1.363c-0.377,0.377-0.832,0.565-1.363,0.565H1.929 c-0.531,0-0.986-0.188-1.363-0.565C0.188,10.2,0,9.746,0,9.214V3.643c0-0.531,0.188-0.985,0.566-1.362 c0.377-0.378,0.832-0.566,1.363-0.566h4.714c0.062,0,0.114,0.021,0.154,0.061s0.06,0.092,0.06,0.154v0.428 c0,0.063-0.02,0.114-0.06,0.154S6.705,2.572,6.643,2.572H1.929c-0.295,0-0.547,0.104-0.757,0.314S0.857,3.348,0.857,3.643v5.571 c0,0.295,0.105,0.547,0.315,0.757s0.462,0.314,0.757,0.314H7.5c0.294,0,0.547-0.104,0.757-0.314 c0.209-0.21,0.314-0.462,0.314-0.757V7.072c0-0.062,0.02-0.114,0.061-0.154c0.04-0.04,0.091-0.061,0.154-0.061h0.428 c0.062,0,0.114,0.021,0.154,0.061S9.429,7.009,9.429,7.072z"/>
-      <path fill-rule="evenodd" d="M7.07,5.82L6.179,4.93C6.127,4.878,6.101,4.818,6.101,4.75s0.026-0.128,0.079-0.18l2.594-2.594L7.648,0.852 C7.549,0.753,7.5,0.636,7.5,0.5s0.049-0.252,0.148-0.351S7.864,0,8,0h3.5c0.136,0,0.252,0.05,0.351,0.149S12,0.365,12,0.5V4 c0,0.136-0.05,0.253-0.149,0.351C11.752,4.451,11.635,4.5,11.5,4.5c-0.136,0-0.253-0.05-0.352-0.149l-1.124-1.125L7.429,5.82 c-0.052,0.052-0.112,0.079-0.18,0.079"/>
-    </g>
-    <rect id="minimize-shape" y="7.5" width="10" height="2.2"/>
-    <path id="exit-shape" fill-rule="evenodd" d="M5.01905144,3.00017279 C5.01277908,3.00005776 5.0064926,3 5.00019251,3 L1.99980749,3 C1.44371665,3 1,3.44762906 1,3.99980749 L1,7.00019251 C1,7.55628335 1.44762906,8 1.99980749,8 L5.00019251,8 C5.00649341,8 5.01277988,7.99994253 5.01905144,7.99982809 L5.01905144,8.5391818 C5.01905144,10.078915 5.37554713,10.2645548 5.81530684,9.9314625 L10.8239665,6.13769619 C11.2653143,5.80340108 11.2637262,5.26455476 10.8239665,4.93146254 L5.81530684,1.13769619 C5.37395904,0.80340108 5.01905144,0.98023404 5.01905144,1.52997693 L5.01905144,3.00017279 Z M-1,1 L4,1 L4,2 L0,2 L0,9 L4,9 L4,10.0100024 L-1,10.0100021 L-1,1 Z" />
-  </defs>
-  <use id="close" xlink:href="#close-shape"/>
-  <use id="close-active" xlink:href="#close-shape"/>
-  <use id="close-disabled" xlink:href="#close-shape"/>
-  <use id="close-hover" xlink:href="#close-shape"/>
-  <use id="exit-white" xlink:href="#exit-shape"/>
-  <use id="expand" xlink:href="#expand-shape"/>
-  <use id="expand-active" xlink:href="#expand-shape"/>
-  <use id="expand-disabled" xlink:href="#expand-shape"/>
-  <use id="expand-hover" xlink:href="#expand-shape"/>
-  <use id="expand-white" xlink:href="#expand-shape"/>
-  <use id="minimize" xlink:href="#minimize-shape"/>
-  <use id="minimize-active" xlink:href="#minimize-shape"/>
-  <use id="minimize-disabled" xlink:href="#minimize-shape"/>
-  <use id="minimize-hover" xlink:href="#minimize-shape"/>
-  <use id="minimize-white" xlink:href="#minimize-shape"/>
-</svg>
deleted file mode 100644
--- a/browser/themes/shared/social/chat.inc.css
+++ /dev/null
@@ -1,238 +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
-
-#social-sidebar-header {
-  padding: 3px;
-}
-
-#manage-share-providers,
-#social-sidebar-button {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
-  -moz-image-region: rect(0, 468px, 18px, 450px);
-}
-
-#social-sidebar-button {
-  -moz-appearance: none;
-  border: none;
-  padding: 0;
-  margin: 2px;
-}
-#manage-share-providers > .toolbarbutton-icon,
-#social-sidebar-button > .toolbarbutton-icon {
-  min-height: 18px;
-  min-width: 18px;
-}
-
-#social-sidebar-button > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
-#social-sidebar-button[loading="true"] {
-  list-style-image: url("chrome://global/skin/icons/loading.png");
-}
-
-#social-sidebar-favico {
-  max-height: 16px;
-  max-width: 16px;
-  padding: 0;
-  margin: 2px;
-}
-
-.chat-status-icon {
-  max-height: 16px;
-  max-width: 16px;
-  padding: 0;
-}
-
-.chat-toolbarbutton {
-  -moz-appearance: none;
-  border: none;
-  padding: 0 3px;
-  margin: 0;
-  background: none;
-}
-
-.chat-toolbarbutton > .toolbarbutton-text {
-  display: none;
-}
-
-.chat-toolbarbutton > .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}
-
-.chat-close-button {
-  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close");
-}
-
-.chat-close-button:hover {
-  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-hover");
-}
-
-.chat-close-button:hover:active {
-  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-active");
-}
-
-.chat-minimize-button {
-  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize");
-}
-
-.chat-minimize-button:hover {
-  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-hover");
-}
-
-.chat-minimize-button:hover:active {
-  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-active");
-}
-
-.chat-swap-button {
-  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand");
-  transform: rotate(180deg);
-}
-
-.chat-swap-button:hover {
-  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-hover");
-}
-
-.chat-swap-button:hover:active {
-  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-active");
-}
-
-chatbar > chatbox > .chat-titlebar > .chat-swap-button {
-  transform: none;
-}
-
-.chat-title {
-  color: #666;
-  text-shadow: none;
-  cursor: inherit;
-}
-
-.chat-titlebar {
-  height: 26px;
-  min-height: 26px;
-  width: 100%;
-  margin: 0;
-  padding: 5px 4px;
-  border: 1px solid #ebebeb;
-  border-bottom: 0;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-  cursor: pointer;
-  background-color: #ebebeb;
-}
-
-.chat-titlebar[selected] {
-  background-color: #f0f0f0;
-}
-
-.chat-titlebar > .notification-anchor-icon {
-  margin-left: 2px;
-  margin-right: 2px;
-}
-
-.chat-titlebar[minimized="true"] {
-  border-bottom: none;
-}
-
-.chat-titlebar[activity] {
-  background-image: radial-gradient(ellipse closest-side at center, rgb(255,255,255), transparent);
-  background-repeat: no-repeat;
-  background-size: 100% 20px;
-  background-position: 0 -10px;
-}
-
-.chat-frame {
-  padding: 0;
-  margin: 0;
-  overflow: hidden;
-}
-
-.chatbar-button {
-  list-style-image: url("chrome://browser/skin/social/services-16.png");
-  margin: 0;
-  padding: 2px;
-  height: 21px;
-  width: 21px;
-  border: 1px solid #ccc;
-  border-bottom: none;
-  background-color: #d9d9d9;
-  background-image: linear-gradient(rgba(255,255,255,.43), transparent);
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-}
-
-@media (min-resolution: 2dppx) {
-  .chatbar-button {
-    list-style-image: url("chrome://browser/skin/social/services-16@2x.png");
-  }
-}
-
-.chatbar-button:hover,
-.chatbar-button[open="true"] {
-  background-color: #f0f0f0;
-}
-
-.chatbar-button[activity]:not([open]) {
-  background-image: radial-gradient(circle farthest-corner at center 2px, rgb(254,254,255) 3%, rgba(210,235,255,0.9) 12%, rgba(148,205,253,0.6) 30%, rgba(148,205,253,0.2) 70%);
-}
-
-.chatbar-button > .toolbarbutton-icon {
-  width: 16px;
-}
-
-.chatbar-button > menupopup > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
-  width: auto;
-  height: auto;
-  max-height: 16px;
-  max-width: 16px;
-}
-
-.chatbar-button[open="true"] {
-  box-shadow: inset 0 2px 5px rgba(0,0,0,0.6), 0 1px rgba(255,255,255,0.2);
-}
-
-.chatbar-button > .toolbarbutton-text,
-.chatbar-button > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
-.chatbar-button > menupopup > menuitem[activity] {
-  font-weight: bold;
-}
-
-.chatbar-innerbox {
-  background: transparent;
-  overflow: hidden;
-}
-
-chatbar {
-  margin-inline-end: 20px;
-}
-
-chatbox {
-  margin-inline-start: 4px;
-  background-color: transparent;
-}
-
-chatbar > chatbox {
-  /* Apply the same border-radius as the .chat-titlebar to make the box-shadow
-     go round nicely. */
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-  box-shadow: 0 0 5px rgba(0,0,0,.3);
-  /* Offset the chatbox the same amount as the box-shadows' spread, to make it
-     visible. */
-  margin-inline-end: 5px;
-}
-
-window > chatbox {
-  margin-inline-start: 0px;
-  margin: 0px;
-  border: none;
-  padding: 0px;
-  border-radius: 4px;
-}
new file mode 100644
--- /dev/null
+++ b/browser/themes/shared/social/social.inc.css
@@ -0,0 +1,23 @@
+%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;
+}
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -49,19 +49,17 @@
   @media (-moz-os-version: windows-vista),
          (-moz-os-version: windows-win7) {
     .sidebar-header:not(:-moz-lwtheme),
     #sidebar-header:not(:-moz-lwtheme) {
       background-color: #EEF3FA;
     }
 
     .sidebar-splitter,
-    #appcontent ~ .sidebar-splitter,
-    .chatbar-button,
-    chatbar > chatbox {
+    #appcontent ~ .sidebar-splitter {
       border-color: #A9B7C9;
     }
 
     #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme),
     #browser-bottombox:not(:-moz-lwtheme),
     .browserContainer > findbar {
       background-color: @customToolbarColor@;
     }
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1799,16 +1799,21 @@ html|span.ac-emphasize-text-url {
 }
 
 #reader-mode-button:hover:active,
 #reader-mode-button[readeractive] {
   -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;
@@ -1845,22 +1850,16 @@ html|span.ac-emphasize-text-url {
   display: none;
 }
 .share-provider-button > .toolbarbutton-icon {
   width: 16px;
   min-height: 16px;
   max-height: 16px;
 }
 
-
-/* fixup corners for share panel */
-.social-panel > .social-panel-frame {
-  border-radius: inherit;
-}
-
 #social-share-panel {
   min-height: 100px;
   min-width: 766px;
 }
 
 #share-container,
 .social-share-frame {
   border-top-left-radius: 0;
@@ -1874,22 +1873,16 @@ html|span.ac-emphasize-text-url {
   border-top-right-radius: inherit;
 }
 
 #social-share-provider-buttons {
   border-top-left-radius: inherit;
   border-top-right-radius: inherit;
 }
 
-/* social recommending panel */
-
-#social-mark-button {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
 /* bookmarks menu-button */
 
 #nav-bar #bookmarks-menu-button[cui-areatype="toolbar"]:not([overflowedItem=true]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   padding-top: var(--toolbarbutton-vertical-inner-padding);
   padding-bottom: var(--toolbarbutton-vertical-inner-padding);
 }
 
 #BMB_bookmarksPopup[side="top"],
@@ -2459,63 +2452,16 @@ notification.pluginVulnerable > .notific
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
   margin-inline-end: 5px;
 }
 
-/* social toolbar provider menu */
-.social-statusarea-popup {
-  margin-top: 0;
-  margin-left: -12px;
-  margin-right: -12px;
-}
-
-.social-statusarea-user {
-  -moz-appearance: none;
-  border-bottom: 1px solid rgb(221,221,221);
-  background-color: -moz-Dialog;
-  position: relative;
-  cursor: pointer;
-  list-style-image:url("chrome://global/skin/icons/information-32.png");
-}
-
-.social-statusarea-user-portrait {
-  width: 32px;
-  height: 32px;
-  border-radius: 2px;
-  margin: 10px;
-}
-
-.social-statusarea-loggedInStatus {
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
-  color: -moz-nativehyperlinktext;
-  min-width: 0;
-  margin: 0 6px;
-  list-style-image: none;
-}
-
-.social-statusarea-user[_moz-menuactive] > vbox > .social-statusarea-loggedInStatus {
-  text-decoration: underline;
-}
-
-.social-panel > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0;
-}
-
-.social-panel-frame {
-  border-radius: inherit;
-}
-
-%include ../shared/social/chat.inc.css
-
 /* Customization mode */
 
 %include ../shared/customizableui/customizeMode.inc.css
 
 /**
  * This next rule is a hack to disable subpixel anti-aliasing on all
  * labels during the customize mode transition. Subpixel anti-aliasing
  * on Windows with Direct2D layers acceleration is particularly slow to