X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=a48dc0271c32e68a9eccb945c4152c309d8f0585;hp=778c8b8828733be1938adc31ddacff0862c8a9d4;hb=e2734cc744523d8adb0aa3d44644220b98d8201c;hpb=0142a07bfbc380cc6c485555737a59a7a401fcae

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 778c8b88..a48dc027 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -65,6 +65,9 @@ menubar {
   background-color: #8050B0;
   color: #FF9F00;
 }
+#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar > .tabbrowser-tabs > .tabbrowser-tab {
+  padding-top: 3px;
+}
 
 #main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
   visibility: hidden;
@@ -290,10 +293,23 @@ menubar {
   list-style-image: url("chrome://browser/skin/Privacy-16.png");
 }
 
+@media (min-resolution: 1.25dppx) {
+  #appmenu_privateBrowsing,
+  #appmenu_newPrivateWindow {
+    list-style-image: url("chrome://browser/skin/Privacy-32.png");
+  }
+}
+
 #appmenu_addons {
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
 }
 
+@media (min-resolution: 1.25dppx) {
+  #appmenu_addons {
+    list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  }
+}
+
 #BMB_bookmarkThisPage,
 #appmenu_bookmarkThisPage {
   list-style-image: url("chrome://browser/skin/places/bookmark.png");
@@ -379,6 +395,10 @@ menubar {
   height: 16px;
 }
 
+#PlacesToolbarItems > .bookmark-item:not([image]):not([label=""]):not([container]) > .toolbarbutton-icon {
+  display: none;
+}
+
 /* Prevent [mode="icons"] from hiding the label */
 .bookmark-item > .toolbarbutton-text {
   display: -moz-box !important;
@@ -792,8 +812,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   background-color: transparent;
 }
 
-/* stop button */
-
 #stop-button {
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
@@ -806,8 +824,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 54px, 54px, 36px);
 }
 
-/* reload button */
-
 #reload-button {
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
@@ -820,8 +836,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 72px, 54px, 54px);
 }
 
-/* home button */
-
 #home-button.bookmark-item {
   list-style-image: url("chrome://browser/skin/FxToolbar.png");
 }
@@ -837,55 +851,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 90px, 54px, 72px);
 }
 
-/* tabview button */
-
-#tabview-button,
-#menu_tabview {
-  list-style-image: url("chrome://browser/skin/tabview/tabview.png");
-}
-
-#tabview-button {
-  -moz-image-region: rect(0, 90px, 18px, 72px);
-}
-
-#tabview-button[groups="0"] {
-  -moz-image-region: rect(0, 18px, 18px, 0);
-}
-
-#tabview-button[groups="1"] {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
-}
-
-#tabview-button[groups="2"] {
-  -moz-image-region: rect(0, 54px, 18px, 36px);
-}
-
-#tabview-button[groups="3"] {
-  -moz-image-region: rect(0, 72px, 18px, 54px);
-}
-
-#menu_tabview {
-  -moz-image-region: rect(1px, 89px, 17px, 73px);
-}
-
-#menu_tabview[groups="0"] {
-  -moz-image-region: rect(1px, 17px, 17px, 1px);
-}
-
-#menu_tabview[groups="1"] {
-  -moz-image-region: rect(1px, 35px, 17px, 19px);
-}
-
-#menu_tabview[groups="2"] {
-  -moz-image-region: rect(1px, 53px, 17px, 37px);
-}
-
-#menu_tabview[groups="3"] {
-  -moz-image-region: rect(1px, 71px, 17px, 55px);
-}
-
-/* download manager button */
-
 #downloads-button {
   -moz-image-region: rect(0, 108px, 18px, 90px);
 }
@@ -902,9 +867,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   margin: 0;
 }
 
-/* history sidebar button */
-
-#webrtc-status-button /* temporary placeholder (bug 824825) */,
 #history-button {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
@@ -917,8 +879,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 126px, 54px, 108px);
 }
 
-/* bookmark sidebar & menu buttons */
-
 #bookmarks-button,
 #bookmarks-menu-button {
   list-style-image: url("chrome://browser/skin/FxToolbar.png") !important; /* for making the palette work */
@@ -944,8 +904,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 144px, 54px, 126px);
 }
 
-/* print button */
-
 #print-button {
   -moz-image-region: rect(0, 162px, 18px, 144px);
 }
@@ -958,8 +916,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 162px, 54px, 144px);
 }
 
-/* toolbar new tab button */
-
 #new-tab-button {
   -moz-image-region: rect(0, 180px, 18px, 162px);
 }
@@ -972,8 +928,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 180px, 54px, 162px);
 }
 
-/* new window button */
-
 #new-window-button {
   -moz-image-region: rect(0, 198px, 18px, 180px);
 }
@@ -986,8 +940,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 198px, 54px, 180px);
 }
 
-/* cut button */
-
 #cut-button {
   -moz-image-region: rect(0, 216px, 18px, 198px);
 }
@@ -1000,8 +952,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 216px, 54px, 198px);
 }
 
-/* copy button */
-
 #copy-button {
   -moz-image-region: rect(0, 234px, 18px, 216px);
 }
@@ -1014,8 +964,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 234px, 54px, 216px);
 }
 
-/* paste button */
-
 #paste-button {
   -moz-image-region: rect(0, 252px, 18px, 234px);
 }
@@ -1028,8 +976,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 252px, 54px, 234px);
 }
 
-/* fullscreen button */
-
 #fullscreen-button {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
@@ -1042,8 +988,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 270px, 54px, 252px);
 }
 
-/* zoom controls */
-
 #zoom-out-button {
   -moz-image-region: rect(0, 288px, 18px, 270px);
   -moz-margin-end: 0;
@@ -1069,8 +1013,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 306px, 54px, 288px);
 }
 
-/* sync button */
-
 #sync-button:not([status]) {
   list-style-image: url("chrome://browser/skin/FxToolbar.png") !important; /* for making the palette work */
   -moz-image-region: rect(0, 324px, 18px, 306px);
@@ -1085,8 +1027,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 324px, 54px, 306px);
 }
 
-/* feed button */
-
 #feed-button {
   -moz-image-region: rect(0, 342px, 18px, 324px);
 }
@@ -1095,6 +1035,66 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 342px, 54px, 324px);
 }
 
+#webrtc-status-button {
+  -moz-image-region: rect(0, 360px, 18px, 342px);
+}
+
+#webrtc-status-button:not([disabled="true"]):hover,
+#webrtc-status-button[open="true"] {
+  -moz-image-region: rect(18px, 360px, 36px, 342px);
+}
+
+#webrtc-status-button[disabled="true"] {
+  -moz-image-region: rect(36px, 360px, 54px, 342px);
+}
+
+/* tabview button & menu item */
+
+#tabview-button,
+#menu_tabview {
+  list-style-image: url("chrome://browser/skin/tabview/tabview.png");
+}
+
+#tabview-button {
+  -moz-image-region: rect(0, 90px, 18px, 72px);
+}
+
+#tabview-button[groups="0"] {
+  -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+#tabview-button[groups="1"] {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+#tabview-button[groups="2"] {
+  -moz-image-region: rect(0, 54px, 18px, 36px);
+}
+
+#tabview-button[groups="3"] {
+  -moz-image-region: rect(0, 72px, 18px, 54px);
+}
+
+#menu_tabview {
+  -moz-image-region: rect(1px, 89px, 17px, 73px);
+}
+
+#menu_tabview[groups="0"] {
+  -moz-image-region: rect(1px, 17px, 17px, 1px);
+}
+
+#menu_tabview[groups="1"] {
+  -moz-image-region: rect(1px, 35px, 17px, 19px);
+}
+
+#menu_tabview[groups="2"] {
+  -moz-image-region: rect(1px, 53px, 17px, 37px);
+}
+
+#menu_tabview[groups="3"] {
+  -moz-image-region: rect(1px, 71px, 17px, 55px);
+}
+
 /* ::::: fullscreen window controls ::::: */
 
 #window-controls {
@@ -1261,11 +1261,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   padding: 0;
 }
 
-.urlbar-icon:-moz-system-metric(touch-enabled) {
-  -moz-margin-end: 1px !important;
-  padding: 0 3px !important;
-}
-
 .urlbar-icon:hover {
 }
 
@@ -1420,6 +1415,10 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://browser/skin/identity-icons-https-ev.png");
 }
 
+.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-active.png");
+}
+
 #identity-box:hover > #page-proxy-favicon {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
@@ -1431,11 +1430,13 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 #identity-box:hover {
   background-color: #FFCF00;
+  color: #000000;
 }
 
 #identity-box:hover:active,
 #identity-box[open=true] {
   background-color: #FF9F00;
+  color: #000000;
 }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:hover,
@@ -1605,48 +1606,113 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
-/* social recommending panel */
+/* social share panel */
+
+#social-share-panel > iframe {
+/*  background: linear-gradient(to bottom, #f0f4f7, #fafbfc);*/
+  width: 300px;
+  height: 150px;
+}
 
-#share-button {
+#social-share-button {
+  list-style-image: url("chrome://browser/skin/social/share-button.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-#socialUserPortrait {
-  width: 48px;
-  height: 48px;
+.social-share-toolbar {
+  border-right: 1px solid #9C9CFF;
+/*  background-color: #000000; */
 }
 
-#socialUserDisplayName,
-#socialUserPortrait {
-  cursor: pointer;
+#social-share-provider-buttons {
+  padding: 6px;
 }
 
-#socialUserDisplayName {
+#social-share-provider-buttons > .share-provider-button {
+  -moz-appearance: none;
+  padding: 5px;
+  margin: 1px;
   border: none;
-  background-color: transparent;
-  margin-top: 0;
-  padding-top: 0;
-  font-size: 130%;
-  font-weight: bold;
+  background: none;
+  border-radius: 2px;
 }
 
-#socialUserDisplayName > .button-box {
-  -moz-padding-start: 0;
-  padding-top: 0;
-  border-top-width: 0;
+#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]),
+#social-share-provider-buttons > .share-provider-button:hover,
+#social-share-provider-buttons > .share-provider-button:active {
+  padding: 4px;
 }
 
-#socialUserDisplayName:hover {
-  color: #9C9CFF;
-  text-decoration: underline;
+#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]) {
 }
 
-#unsharePopupText {
-  height: 48px;
+#social-share-provider-buttons > .share-provider-button > .toolbarbutton-text {
+  display: none;
+}
+#social-share-provider-buttons > .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 {
+  max-height: 600px;
+  min-height: 100px;
+  max-width: 800px;
+  min-width: 300px;
+}
+
+.social-share-frame {
+/*  background: linear-gradient(to bottom, #f0f4f7, #fafbfc); */
+  width: 330px;
+  height: 150px;
+  /* we resize our panels dynamically, make it look nice */
+  transition: height 100ms ease-out, width 100ms ease-out;
+}
+
+.social-share-frame:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-top-right-radius: inherit;
+  border-bottom-right-radius: inherit;
+}
+
+.social-share-frame:-moz-locale-dir(rtl) {
+  border-top-left-radius: inherit;
+  border-bottom-left-radius: inherit;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#social-share-panel > .social-share-toolbar:-moz-locale-dir(ltr) {
+  border-top-left-radius: inherit;
+  border-bottom-left-radius: inherit;
+}
+
+#social-share-panel > .social-share-toolbar:-moz-locale-dir(rtl) {
+  border-top-right-radius: inherit;
+  border-bottom-right-radius: inherit;
+}
+
+#social-share-provider-buttons:-moz-locale-dir(ltr) {
+  border-top-left-radius: inherit;
+  border-bottom-left-radius: inherit;
 }
 
-#unsharePopupBottomButtons {
-  margin-top: 1em;
+#social-share-provider-buttons:-moz-locale-dir(rtl) {
+  border-top-right-radius: inherit;
+  border-bottom-right-radius: inherit;
+}
+
+/* social recommending panel */
+
+#social-mark-button {
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 /* star button */
@@ -1882,10 +1948,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
 
-.tab-close-button:-moz-system-metric(touch-enabled) {
-  transform: scale(1.2);
-}
-
 .tab-close-button:hover,
 .tab-close-button:hover[selected="true"] {
   list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
@@ -1898,22 +1960,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 /* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
 
-@media (-moz-touch-enabled) {
-  .tabbrowser-arrowscrollbox > .scrollbutton-up,
-  .tabbrowser-arrowscrollbox > .scrollbutton-down,
-  #TabsToolbar .toolbarbutton-1 {
-    min-width: 8.1mozmm;
-  }
-
-  .tabs-newtab-button {
-    min-width: 10mozmm;
-  }
-
-  .tab-content {
-    min-height: calc(6.8mozmm - 7px); /* subtract borders from the desired height */
-  }
-}
-
 .tabbrowser-arrowscrollbox > .scrollbutton-up,
 .tabbrowser-arrowscrollbox > .scrollbutton-down {
   margin: 0;
@@ -1952,29 +1998,17 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 }
 
 #alltabs-button {
-  list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png");
-  -moz-image-region: rect(0, 14px, 16px, 0);
-}
-
-#alltabs-button:hover,
-#alltabs-button:hover:active {
-  -moz-image-region: rect(0, 28px, 16px, 14px);
-}
-
-#alltabs-button[type="menu"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
-  -moz-image-region: auto;
 }
 
-#alltabs-button[type="menu"] > .toolbarbutton-menu-dropmarker {
+#alltabs-button > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
-#alltabs-button[type="menu"]:hover,
-#alltabs-button[type="menu"]:hover:active,
-#alltabs-button[type="menu"][open="true"] {
+#alltabs-button:hover,
+#alltabs-button:hover:active,
+#alltabs-button[open="true"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
-  -moz-image-region: auto;
 }
 
 /* All tabs menupopup */
@@ -2172,6 +2206,14 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked-64.png");
 }
 
+.popup-notification-icon[popupid="plugins-not-found"] {
+  list-style-image: url("chrome://browser/skin/pluginInstall-64.png");
+}
+
+.popup-notification-icon[popupid="web-notifications"] {
+  list-style-image: url("chrome://browser/skin/notification-64.png");
+}
+
 .addon-progress-description {
   width: 350px;
   max-width: 350px;
@@ -2204,7 +2246,9 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
-.popup-notification-icon[popupid="indexedDB-quota-prompt"] {
+.popup-notification-icon[popupid="indexedDB-quota-prompt"],
+.popup-notification-icon[popupid*="offline-app-requested"],
+.popup-notification-icon[popupid="offline-app-usage"] {
   list-style-image: url("chrome://global/skin/icons/alert-question.gif");
 }
 
@@ -2217,11 +2261,19 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/webapps-64.png");
 }
 
+.popup-notification-icon[popupid="mixed-content-blocked"] {
+  list-style-image: url("chrome://browser/skin/mixed-content-blocked-64.png");
+}
+
 .popup-notification-icon[popupid="webRTC-sharingDevices"],
 .popup-notification-icon[popupid="webRTC-shareDevices"] {
   list-style-image: url("chrome://browser/skin/webRTC-shareDevice-64.png");
 }
 
+.popup-notification-icon[popupid="pointerLock"] {
+  list-style-image: url("chrome://browser/skin/pointerLock-64.png");
+}
+
 /* Notification icon box */
 #notification-popup-box {
   position: relative;
@@ -2230,7 +2282,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   padding-left: 3px;
   padding-right: 8px;
   border-radius: 3px 0 0 3px;
-  -moz-border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 / 0 8px 0 0;
+  border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 / 0 8px 0 0;
   -moz-margin-end: -8px;
   border-right-width: 8px;
 }
@@ -2257,14 +2309,17 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 /*  outline-offset: -3px; */
 }
 
+.default-notification-icon,
 #default-notification-icon {
   list-style-image: url("chrome://global/skin/icons/information-16.png");
 }
 
+.identity-notification-icon,
 #identity-notification-icon {
   list-style-image: url("chrome://mozapps/skin/profile/profileicon.png");
 }
 
+.geo-notification-icon,
 #geo-notification-icon {
   list-style-image: url("chrome://browser/skin/Geolocation-16.png");
 }
@@ -2273,6 +2328,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
 }
 
+.indexedDB-notification-icon,
 #indexedDB-notification-icon {
   list-style-image: url("chrome://global/skin/icons/question-16.png");
 }
@@ -2293,6 +2349,17 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://mozapps/skin/plugins/notifyPluginBlocked.png");
 }
 
+#plugin-install-notification-icon {
+  list-style-image: url("chrome://browser/skin/pluginInstall-16.png");
+}
+
+#notification-popup-box[hidden] {
+  /* Override display:none to make the pluginBlockedNotification animation work
+     when showing the notification repeatedly. */
+  display: -moz-box;
+  visibility: collapse;
+}
+
 #blocked-plugins-notification-icon[showing] {
   animation: pluginBlockedNotification 500ms ease 0s 5 alternate both;
 }
@@ -2306,11 +2373,33 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   }
 }
 
-#webRTC-sharingDevices-notification-icon,
+.mixed-content-blocked-notification-icon,
+#mixed-content-blocked-notification-icon {
+  list-style-image: url("chrome://browser/skin/mixed-content-blocked-16.png");
+}
+
+.webRTC-shareDevices-notification-icon,
 #webRTC-shareDevices-notification-icon {
   list-style-image: url("chrome://browser/skin/webRTC-shareDevice-16.png");
 }
 
+.webRTC-sharingDevices-notification-icon,
+#webRTC-sharingDevices-notification-icon {
+  list-style-image: url("chrome://browser/skin/webRTC-sharingDevice-16.png");
+}
+
+.web-notifications-notification-icon,
+#web-notifications-notification-icon {
+  list-style-image: url("chrome://browser/skin/notification-16.png");
+}
+
+#pointerLock-notification-icon {
+  list-style-image: url("chrome://browser/skin/pointerLock-16.png");
+}
+#pointerLock-cancel {
+  margin: 0px;
+}
+
 #identity-popup-container {
   min-width: 280px;
 }
@@ -2355,20 +2444,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   /*background-color: rgba(27%,27%,27%,.65);*/
 }
 
-.KUI-panel-closebutton {
-  list-style-image: url("KUI-close.png");
-  width: 24px;
-  height: 24px;
-}
-
-.KUI-panel-closebutton:not(:hover) {
-}
-
-.KUI-panel-closebutton > .toolbarbutton-icon {
-}
-
-/* ::::: Ctrl-Tab and All Tabs Panels ::::: */
-
 /* Ctrl-Tab */
 
 #ctrlTab-panel {
@@ -2417,53 +2492,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   margin-top: .5em;
 }
 
-/* All Tabs */
-
-#allTabs-panel {
-  padding-bottom: 10px;
-}
-
-#allTabs-meta {
-  margin: 10px;
-}
-
-#allTabs-filter {
-  -moz-margin-start: 24px;
-  -moz-margin-end: 0;
-}
-
-#allTabs-tab-close-button > .toolbarbutton-icon {
-  margin: 0;
-}
-
-.allTabs-favicon[src] {
-  width: 22px;
-  height: 22px;
-  padding-top: 1px;
-  padding-bottom: 5px;
-  -moz-padding-start: 1px;
-  -moz-padding-end: 5px;
-  margin-top: -2px;
-  -moz-margin-start: -2px;
-  border-bottom-right-radius: 4px;
-}
-
-.allTabs-favicon[src]:-moz-locale-dir(rtl) {
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 4px;
-}
-
-.allTabs-preview-inner > .tabPreview-canvas {
-  background-color: #E7ADE7;
-}
-
-.allTabs-preview:not(:hover):not([closebuttonhover]) > html|canvas {
-}
-
-.allTabs-preview:focus > * > .allTabs-preview-inner {
-  outline: 1px dotted #008484;
-}
-
 /* Add-on bar */
 
 #addon-bar {
@@ -2865,6 +2893,10 @@ html|*#gcli-output-frame {
   display: none;
 }
 
+#developer-toolbar-toolbox-button > .toolbarbutton-icon {
+  -moz-margin-end: 0;
+}
+
 .developer-toolbar-button {
   min-width: 78px;
   min-height: 21px;
@@ -2899,34 +2931,38 @@ html|*#gcli-output-frame {
 
 #social-provider-button {
   -moz-image-region: rect(0, 16px, 16px, 0);
+  list-style-image: url("chrome://browser/skin/social/services-16.png");
 }
 
 #social-provider-button > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
-#social-toolbar-item > .toolbarbutton-1 {
-}
-
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .toolbarbutton-1 {
+.toolbarbutton-badge-container {
+  margin: 0;
+  padding: 0;
+  position: relative;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .toolbarbutton-1:first-child {
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {
+  padding: 2px 2px;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .toolbarbutton-1:last-child {
+.toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon {
+  position: absolute;
+  top: 2px;
+  right: 2px;
 }
 
-.social-notification-icon-hbox {
-  pointer-events: none;
+.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) {
+  -moz-margin-end: 0;
 }
 
-.social-notification-icon-stack > image {
-  max-height: 20px;
+.toolbarbutton-badge[badge=""] {
+  display: none;
 }
-
-.social-notification-icon-label {
-  text-align: end;
+.toolbarbutton-badge[badge]:not([badge=""])::after {
+  /* The |content| property is set in the content stylesheet. */
   font-size: 9px;
   font-weight: bold;
   padding: 0 1px;
@@ -2934,14 +2970,24 @@ html|*#gcli-output-frame {
   background-color: #000000;
   border: 1px solid #9C9CFF;
   border-radius: 2px;
+  position: absolute;
+  top: 0;
+  right: 0;
 }
 
-.social-notification-icon-label[value=""] {
-  display: none;
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
+  top: 1px;
+  right: 1px;
 }
 
-.social-notification-icon-image {
-  -moz-image-region: rect(0, 16px, 16px, 0);
+.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+  left: 0;
+  right: auto;
+}
+
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+  left: 1px;
+  right: auto;
 }
 
 #social-notification-icon-mentions {
@@ -2962,6 +3008,36 @@ html|*#gcli-output-frame {
   border: 0;
 }
 
+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url("chrome://browser/skin/social/services-64.png");
+}
+#servicesInstall-notification-icon {
+  list-style-image: url("chrome://browser/skin/social/services-16.png");
+}
+#social-undoactivation-button,
+#servicesInstall-learnmore-link {
+  -moz-margin-start: 0; /* override default label margin to match description margin */
+}
+
+#socialActivatedNotification .popup-notification-button-container {
+  margin-left: 6px;
+}
+
+.social-activation-icon {
+  width: auto;
+  height: auto;
+  max-height: 64px;
+  max-width: 64px;
+}
+
+#social-activation-message {
+  max-width: 250px;
+}
+
+#social-activation-message > label {
+  margin: 0;
+}
+
 /* social toolbar provider menu */
 .social-statusarea-popup {
   margin-top: 0;
@@ -3024,7 +3100,7 @@ html|*#gcli-output-frame {
 }
 
 .chat-close-button {
-  list-style-image: url('chrome://browser/skin/social/chat-close.png');
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
   -moz-image-region: rect(0, 14px, 14px, 0);
 }
 
@@ -3033,6 +3109,36 @@ html|*#gcli-output-frame {
   -moz-image-region: rect(14px, 14px, 28px, 0);
 }
 
+.chat-minimize-button {
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(0, 28px, 14px, 14px);
+}
+
+.chat-minimize-button:hover:active,
+.chat-minimize-button:hover {
+  -moz-image-region: rect(14px, 28px, 28px, 14px);
+}
+
+.chat-swap-button {
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(0, 42px, 14px, 28px);
+}
+
+.chat-swap-button:hover:active,
+.chat-swap-button:hover {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
+}
+
+chatbar > chatbox > .chat-titlebar > .chat-swap-button {
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(0, 56px, 14px, 42px);
+}
+
+chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active,
+chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover {
+  -moz-image-region: rect(14px, 56px, 28px, 42px);
+}
+
 .chat-title {
   font-weight: bold;
   font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
@@ -3054,6 +3160,11 @@ html|*#gcli-output-frame {
   cursor: pointer;
 }
 
+.chat-titlebar > .notification-anchor-icon {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
 .chat-titlebar[minimized="true"] {
   border-bottom: none;
 }
@@ -3073,8 +3184,7 @@ html|*#gcli-output-frame {
 }
 
 .chatbar-button {
-  /* XXX get a real image for this */
-  list-style-image: url("chrome://browser/skin/social/social.png");
+  list-style-image: url("chrome://browser/skin/social/services-16.png");
   background-color: #000000;
   border: none;
   margin: 0;
@@ -3085,6 +3195,12 @@ html|*#gcli-output-frame {
   -moz-border-end: 1px solid #008484;
 }
 
+@media (min-resolution: 2dppx) {
+  .chatbar-button {
+    list-style-image: url("chrome://browser/skin/social/services-16@2x.png");
+  }
+}
+
 .chatbar-button > menupopup > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
   width: auto;
   height: auto;
@@ -3101,6 +3217,7 @@ html|*#gcli-output-frame {
   opacity: 1;
 }
 
+.chatbar-button:hover,
 .chatbar-button[open="true"] {
 }
 
@@ -3143,6 +3260,13 @@ chatbox[minimized="true"] {
   height: 20px;
 }
 
+window > chatbox {
+  -moz-margin-start: 0px;
+  margin: 0px;
+  border: none;
+  padding: 0px;
+}
+
 .click-to-play-plugins-notification-content {
   margin: -10px;
   border-radius: 4px;
@@ -3170,13 +3294,9 @@ chatbox[minimized="true"] {
 }
 
 .click-to-play-plugins-notification-separator {
-  /*-moz-border-start: 1px solid #9C9CFF;
-  border-top: 1px solid #9C9CFF;*/
 }
 
 .click-to-play-plugins-notification-description-box {
-  /*border-bottom: 1px solid #9C9CFF;
-  -moz-border-start: 1px solid #9C9CFF;*/
   padding-top: 12px;
   -moz-padding-end: 11px;
   padding-bottom: 9px;
@@ -3186,14 +3306,11 @@ chatbox[minimized="true"] {
 .click-to-play-plugins-notification-center-box {
   border-top: 1px solid #FF9F00;
   border-bottom: 1px solid #FF9F00;
-  /*-moz-border-start: 1px solid #9C9CFF;*/
   background-color: #000000;
   -moz-margin-end: 4px;
 }
 
 .click-to-play-plugins-notification-button-container {
-  /*border-top: 1px solid #9C9CFF;
-  -moz-border-start: 1px solid #9C9CFF;*/
   margin: 0px;
   padding: 16px;
 }
@@ -3266,6 +3383,8 @@ chatbox[minimized="true"] {
   background-position: top left;
 }
 
-#main-window[privatebrowsingmode=temporary] #appmenu-button {
+#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .box-inherit > .button-icon {
   list-style-image: url("chrome://browser/skin/privatebrowsing-light.png");
+  width: 20px;
+  height: 16px;
 }