X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=19f6841e7db2f053504dd554312d77992e0d5c92;hp=db21aa455da22e75fc51fd325325ed49414ff1b5;hb=fe524e0c0e2035af794e8183b25693f847fb12ce;hpb=6adbc9a6eeca29d3da3ca7d12ae845818e045eaa

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index db21aa45..19f6841e 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");
@@ -1325,17 +1341,18 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   padding-right: 2.01px;
 }
 
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI,
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
-  color: #008484;
-  -moz-border-end: 1px solid #008484;
   -moz-margin-end: 3px;
 }
 
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:-moz-locale-dir(ltr),
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:-moz-locale-dir(ltr) {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
 
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:-moz-locale-dir(rtl),
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
@@ -1380,11 +1397,36 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 /* page proxy icon */
 
+/* === BEGIN identity-block.inc.css === */
+
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI {
+  /* Default theme does different color per channel, we can't as they do it build-time. */
+  color: #9C9CFF;
+  -moz-border-end: 1px solid #9C9CFF;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
+  color: #008484;
+  -moz-border-end: 1px solid #008484;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI,
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
+  background-position: right;
+  background-size: 1px;
+  background-repeat: no-repeat;
+}
+
+/* page proxy icon */
+
 #page-proxy-favicon {
   width: 16px;
   height: 16px;
   list-style-image: url("chrome://browser/skin/identity-icons-generic.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.chromeUI > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://branding/content/identity-icons-brand.png");
 }
 
 .verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] {
@@ -1395,6 +1437,43 @@ 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");
+}
+
+.mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-display.png");
+}
+
+.mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-display.png");
+}
+
+#page-proxy-favicon[pageproxystate="invalid"] {
+  opacity: 0.3;
+}
+
+#identity-popup.chromeUI > #identity-popup-container > #identity-popup-icon {
+  list-style-image: url("chrome://branding/content/icon64.png");
+}
+
+#identity-popup-brandName {
+  font-weight: bold;
+  font-size: 1.25em;
+  margin-top: .5em;
+  margin-bottom: .5em;
+}
+
+#identity-popup-content-box {
+  max-width: 50ch;
+}
+
+/* === END identity-block.inc.css === */
+
+#page-proxy-favicon {
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
 #identity-box:hover > #page-proxy-favicon {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
@@ -1406,11 +1485,20 @@ 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.chromeUI:hover,
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:hover:active,
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI[open=true] {
+  background-color: #9C9CFF;
+  color: #000000;
 }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:hover,
@@ -1420,10 +1508,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   color: #000000;
 }
 
-#page-proxy-favicon[pageproxystate="invalid"] {
-  opacity: 0.3;
-}
-
 /* autocomplete */
 
 #treecolAutoCompleteImage {
@@ -1580,48 +1664,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;
 }
 
-#unsharePopupBottomButtons {
-  margin-top: 1em;
+#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;
+}
+
+#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 */
@@ -1719,6 +1868,13 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-padding-start: 0px;
 }
 
+.browserContainer > findbar {
+/*
+  background-color: -moz-dialog;
+  color: -moz-DialogText;
+*/
+}
+
 /* ::::: throbber ::::: */
 
 #navigator-throbber {
@@ -1775,6 +1931,10 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   background-color: #C09070;
 }
 
+.tabbrowser-tab[remote] {
+  text-decoration: underline;
+}
+
 .tabbrowser-tab:hover,
 .tabs-newtab-button:hover {
 }
@@ -1907,29 +2067,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 */
@@ -2102,6 +2250,21 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   -moz-margin-end: 0;
 }
 
+#identity-popup > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+}
+
+#identity-popup-container {
+  min-width: 280px;
+  padding: 10px;
+}
+
+#identity-popup-button-container {
+/*  background: linear-gradient(to bottom, rgba(0,0,0,0.04) 60%, transparent);*/
+  padding: 10px;
+  margin-top: 5px;
+}
+
 .popup-notification-icon {
   width: 64px;
   height: 64px;
@@ -2127,6 +2290,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;
@@ -2159,7 +2330,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");
 }
 
@@ -2169,7 +2342,11 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 .popup-notification-icon[popupid="webapps-install"] {
-  list-style-image: url("chrome://browser/skin/webapps-64.png");
+  list-style-image: url("chrome://global/skin/icons/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"],
@@ -2177,6 +2354,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   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;
@@ -2185,7 +2366,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;
 }
@@ -2212,14 +2393,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");
 }
@@ -2228,6 +2412,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");
 }
@@ -2237,15 +2422,35 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 }
 
 #webapps-notification-icon {
-  list-style-image: url("chrome://browser/skin/webapps-16.png");
+  list-style-image: url("chrome://gobal/skin/icons/webapps-16.png");
 }
 
 #plugins-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+  list-style-image: url("chrome://browser/skin/notification-pluginNormal.png");
+}
+
+#alert-plugins-notification-icon {
+  list-style-image: url("chrome://browser/skin/notification-pluginAlert.png");
 }
 
 #blocked-plugins-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/plugins/notifyPluginBlocked.png");
+  list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png");
+}
+
+#plugins-notification-icon,
+#alert-plugins-notification-icon,
+#blocked-plugins-notification-icon {
+/*  -moz-image-region: rect(0, 16px, 16px, 0);*/
+}
+
+#plugins-notification-icon:hover,
+#alert-plugins-notification-icon:hover,
+#blocked-plugins-notification-icon:hover {
+/*  -moz-image-region: rect(0, 32px, 16px, 16px);*/
+}
+
+#plugin-install-notification-icon {
+  list-style-image: url("chrome://browser/skin/pluginInstall-16.png");
 }
 
 #notification-popup-box[hidden] {
@@ -2268,16 +2473,31 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=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");
 }
 
-#identity-popup-container {
-  min-width: 280px;
+.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;
 }
 
 #download-monitor {
@@ -2320,20 +2540,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 {
@@ -2382,53 +2588,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 {
@@ -2526,28 +2685,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   outline-color: rgba(255,255,255,0.7);
 }
 
-/* Developer toolbar */
-
-#developer-toolbar {
-  border-top: 3px solid #000000;
-  border-bottom: none;
-}
-
-#developer-toolbar .toolbar-holder {
-  background-color: #8050B0;
-  color: #FFCF00;
-}
-
-#developer-toolbar .toolbar-holder {
-  background-color: #8050B0;
-  color: #FFCF00;
-}
-
-#developer-toolbar .toolbar-startcap,
-#developer-toolbar .toolbar-endcap{
-  background-color: #6000CF;
-}
-
 /* Highlighter - Node Infobar */
 
 .highlighter-nodeinfobar {
@@ -2676,6 +2813,66 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   font-size: 120%;
 }
 
+/* === BEGIN commandline.inc.css === */
+
+/* Developer toolbar */
+
+#developer-toolbar {
+  border-top: 3px solid #000000;
+  border-bottom: none;
+}
+
+#developer-toolbar .toolbar-holder {
+  background-color: #8050B0;
+  color: #FFCF00;
+}
+
+#developer-toolbar .toolbar-holder {
+  background-color: #8050B0;
+  color: #FFCF00;
+}
+
+#developer-toolbar .toolbar-startcap,
+#developer-toolbar .toolbar-endcap{
+  background-color: #6000CF;
+}
+
+#developer-toolbar {
+/*  padding: 0;
+  min-height: 32px; */
+}
+
+.developer-toolbar-button {
+/*  margin: 0;
+  padding: 0 10px;
+  width: 32px; */
+}
+
+.developer-toolbar-button > image {
+/*  margin: auto 10px; */
+}
+
+#developer-toolbar-toolbox-button > label {
+  display: none;
+}
+
+#developer-toolbar-toolbox-button {
+  list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+#developer-toolbar-toolbox-button > label {
+  display: none;
+}
+
+#developer-toolbar-toolbox-button:hover,
+#developer-toolbar-toolbox-button:hover:active,
+#developer-toolbar-toolbox-button[checked=true] {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+/* GCLI */
+
 html|*#gcli-tooltip-frame,
 html|*#gcli-output-frame {
   padding: 0;
@@ -2687,24 +2884,27 @@ html|*#gcli-output-frame {
 #gcli-tooltip {
   border-width: 0;
   background-color: transparent;
-  margin-bottom: -2px;
 }
 
 .gclitoolbar-input-node,
-.gclitoolbar-complete-node,
-.gclitoolbar-prompt {
+.gclitoolbar-complete-node {
   margin: 1px 3px;
   -moz-box-align: center;
   padding-top: 0;
   padding-bottom: 0;
-  padding-right: 4px;
+  padding-right: 8px;
   background-color: transparent;
-  border-radius: 3px;
-  text-shadow: none;
 }
 
 .gclitoolbar-input-node {
   padding-left: 20px;
+/*  line-height: 32px;
+  outline-style: none; */
+  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 16, 16, 0);
+}
+
+.gclitoolbar-input-node[focused="true"] {
+  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
 }
 
 .gclitoolbar-input-node:not([focused="true"]) {
@@ -2721,18 +2921,10 @@ html|*#gcli-output-frame {
   padding-left: 21px;
   background-color: transparent;
   color: transparent;
+  z-index: 100;
+  pointer-events: none;
 }
 
-.gclitoolbar-prompt {
-  padding-left: 4px;
-  padding-bottom: 2px;
-  font-size: 150%;
-  font-weight: bold;
-  color: #E7ADE7;
-  background-color: #000000;
-}
-
-.gclitoolbar-prompt-label,
 .gcli-in-incomplete,
 .gcli-in-error,
 .gcli-in-ontab,
@@ -2764,6 +2956,10 @@ html|*#gcli-output-frame {
   color: #8050B0;
 }
 
+/* === END commandline.inc.css === */
+
+/* === BEGIN responsivedesign.inc.css === */
+
 /* Responsive Mode */
 
 .browserContainer[responsivemode] {
@@ -2786,73 +2982,78 @@ html|*#gcli-output-frame {
 .devtools-responsiveui-toolbar > menulist,
 .devtools-responsiveui-toolbar > toolbarbutton {
   min-width: 22px;
-  border-radius: 0;
+/*  border-radius: 0; */
 }
 
 .devtools-responsiveui-toolbar:-moz-locale-dir(ltr) > *:first-child,
 .devtools-responsiveui-toolbar:-moz-locale-dir(rtl) > *:last-child {
-  margin-left: 0;
+  margin-left: 3px;
 }
 
-.devtools-responsiveui-resizebar {
-  width: 7px;
-  height: 24px;
-  cursor: ew-resize;
-  transform: translate(12px, -12px);
-  background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png");
+.devtools-responsiveui-close {
+  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
 }
 
-.devtools-responsiveui-resizehandle {
-  width: 16px;
-  height: 16px;
-  cursor: se-resize;
-  transform: translate(12px, 12px);
-  background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png");
+.devtools-responsiveui-close:hover {
+  -moz-image-region: rect(0px,32px,16px,16px);
 }
 
-/* Web Console */
-
-.web-console-frame {
-  /* border-bottom: 3px solid #000000; */
+.devtools-responsiveui-rotate {
+  list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
 }
 
-.web-console-frame[animated] {
-  transition: height 100ms;
+.devtools-responsiveui-rotate:hover {
+  -moz-image-region: rect(0px,32px,16px,16px);
 }
 
-/* Developer Toolbar */
-
-#developer-toolbar-toolbox-button {
-  min-width: 18px;
+.devtools-responsiveui-touch {
+  list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
 }
 
-#developer-toolbar-toolbox-button > .toolbarbutton-text {
-  display: none;
+.devtools-responsiveui-touch:hover,
+.devtools-responsiveui-touch[checked],
+.devtools-responsiveui-touch[checked]:hover {
+  -moz-image-region: rect(0px,32px,16px,16px);
 }
 
-#developer-toolbar-toolbox-button > .toolbarbutton-icon {
-  -moz-margin-end: 0;
+.devtools-responsiveui-screenshot {
+  list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
 }
 
-.developer-toolbar-button {
-  min-width: 78px;
-  min-height: 21px;
-  margin: 0 1px;
-  list-style-image: url("chrome://browser/skin/devtools/tools-icons-small.png");
+.devtools-responsiveui-screenshot:hover {
+  -moz-image-region: rect(0px,32px,16px,16px);
 }
 
-.developer-toolbar-button[open=true],
-.developer-toolbar-button:active:hover,
-.developer-toolbar-button[checked=true] {
+.devtools-responsiveui-resizebarV {
+  width: 7px;
+  height: 24px;
+  cursor: ew-resize;
+  transform: translate(12px, -12px);
+  background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png");
 }
 
-.developer-toolbar-button[checked=true] {
+.devtools-responsiveui-resizebarH {
+  width: 24px;
+  height: 7px;
+  cursor: ns-resize;
+  transform: translate(-12px, 12px);
+  background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png");
 }
 
-#developer-toolbar-toolbox-button {
-  -moz-image-region: rect(64px, 16px, 80px, 0);
+.devtools-responsiveui-resizehandle {
+  width: 16px;
+  height: 16px;
+  cursor: se-resize;
+  transform: translate(12px, 12px);
+  background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png");
 }
 
+/* === END responsivedesign.inc.css === */
+
 /* Error counter */
 
 #developer-toolbar-toolbox-button[error-count]:before {
@@ -2868,32 +3069,37 @@ 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;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .toolbarbutton-1,
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .social-notification-container > .toolbarbutton-1 {
-  padding-left: 0;
-  padding-right: 0;
+.toolbarbutton-badge-container {
+  margin: 0;
+  padding: 0;
+  position: relative;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item {
-  margin-left: 5px;
-  margin-right: 5px;
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {
+  padding: 2px 2px;
 }
 
-.social-notification-container {
-  /* position:relative on .toolbarbutton-1 does not get position:absolute
-     to work as expected on .toolbarbutton-1 generated content. Placing a
-     simple container outside of .toolbarbutton-1 and setting position:relative
-     on the simple container however will work. */
-  position: relative;
+.toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon {
+  position: absolute;
+  top: 2px;
+  right: 2px;
+}
+
+.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) {
+  -moz-margin-end: 0;
 }
 
-.social-notification-container > .toolbarbutton-1[badge]:not([badge=""])::after {
+.toolbarbutton-badge[badge=""] {
+  display: none;
+}
+.toolbarbutton-badge[badge]:not([badge=""])::after {
   /* The |content| property is set in the content stylesheet. */
   font-size: 9px;
   font-weight: bold;
@@ -2903,16 +3109,22 @@ html|*#gcli-output-frame {
   border: 1px solid #9C9CFF;
   border-radius: 2px;
   position: absolute;
-  top: 2px;
-  right: 2px;
+  top: 0;
+  right: 0;
+}
+
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
+  top: 1px;
+  right: 1px;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > *|* > .social-notification-container > .toolbarbutton-1[badge]:not([badge=""])::after {
-  top: 7px;
+.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+  left: 0;
+  right: auto;
 }
 
-.social-notification-container > .toolbarbutton-1[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-  left: 2px;
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+  left: 1px;
   right: auto;
 }
 
@@ -2934,6 +3146,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;
@@ -2977,6 +3219,8 @@ html|*#gcli-output-frame {
   border-radius: inherit;
 }
 
+/* === BEGIN chat.inc.css === */
+
 .chat-status-icon {
   max-height: 16px;
   max-width: 16px;
@@ -2989,20 +3233,60 @@ html|*#gcli-output-frame {
   padding: 0;
   margin: 0;
   background: none;
+  width: 16px;
 }
 
 .chat-toolbarbutton > .toolbarbutton-text {
   display: none;
 }
 
+.chat-toolbarbutton > .toolbarbutton-icon {
+  width: inherit;
+}
+
+.chat-toolbarbutton.notification-anchor-icon > .toolbarbutton-icon {
+  width: inherit;
+  margin-top: -2px;
+}
+
 .chat-close-button {
-  list-style-image: url('chrome://browser/skin/social/chat-close.png');
-  -moz-image-region: rect(0, 14px, 14px, 0);
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .chat-close-button:hover,
 .chat-close-button:hover:active {
-  -moz-image-region: rect(14px, 14px, 28px, 0);
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.chat-minimize-button {
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(16px, 16px, 32px, 0);
+}
+
+.chat-minimize-button:hover:active,
+.chat-minimize-button:hover {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+.chat-swap-button {
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(48px, 16px, 64px, 0);
+}
+
+.chat-swap-button:hover:active,
+.chat-swap-button:hover {
+  -moz-image-region: rect(48px, 32px, 64px, 16px);
+}
+
+chatbar > chatbox > .chat-titlebar > .chat-swap-button {
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(32px, 16px, 48px, 0);
+}
+
+chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active,
+chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover {
+  -moz-image-region: rect(32px, 32px, 48px, 16px);
 }
 
 .chat-title {
@@ -3026,6 +3310,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;
 }
@@ -3045,8 +3334,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;
@@ -3057,6 +3345,16 @@ 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 > .toolbarbutton-icon {
+  width: 16px;
+}
+
 .chatbar-button > menupopup > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
   width: auto;
   height: auto;
@@ -3073,6 +3371,7 @@ html|*#gcli-output-frame {
   opacity: 1;
 }
 
+.chatbar-button:hover,
 .chatbar-button[open="true"] {
 }
 
@@ -3115,118 +3414,73 @@ chatbox[minimized="true"] {
   height: 20px;
 }
 
-.click-to-play-plugins-notification-content {
-  margin: -10px;
-  border-radius: 4px;
+window > chatbox {
+  -moz-margin-start: 0px;
+  margin: 0px;
+  border: none;
+  padding: 0px;
 }
 
-.click-to-play-plugins-notification-icon-box {
-  background: #000000;
-  -moz-border-end: 1px solid #FF9F00;
-  padding-top: 16px;
-  -moz-padding-end: 16px;
-  -moz-padding-start: 24px;
-  -moz-margin-start: 4px;
-  margin-top: 4px;
-  margin-bottom: 4px;
-}
+/* === END chat.inc.css === */
 
-.click-to-play-plugins-notification-icon-box:-moz-locale-dir(ltr) {
-  border-bottom-left-radius: 4px;
-  border-top-left-radius: 4px;
-}
+/* === BEGIN plugin-doorhanger.inc.css === */
 
-.click-to-play-plugins-notification-icon-box:-moz-locale-dir(rtl) {
-  border-bottom-right-radius: 4px;
-  border-top-right-radius: 4px;
-}
+/**
+ * Plugin Doorhanger Styles
+ */
 
-.click-to-play-plugins-notification-separator {
-  /*-moz-border-start: 1px solid #9C9CFF;
-  border-top: 1px solid #9C9CFF;*/
+#notification-popup[popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 6px 1px 2px;
 }
 
-.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;
-  -moz-padding-start: 10px;
+.click-to-play-plugins-notification-content {
+  width: 28em;
 }
 
 .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;
+.plugin-popupnotification-centeritem:nth-child(odd) {
+/*  background-color: rgba(0,0,0,0.1);*/
 }
 
-.center-item-box {
-  padding: 12px 16px 0px 16px;
-}
-
-.center-item-box[padbottom="true"] {
-  padding-bottom: 12px;
+.center-item-label {
+  margin-bottom: 0;
+  text-overflow: ellipsis;
 }
 
-.center-item-icon {
-  background-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+.center-item-warning-icon {
+  background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
   background-repeat: no-repeat;
-  height: 16px;
   width: 16px;
-  margin-bottom: 4px;
-}
-
-.center-item-box[warn="true"] {
-  background-color: #FFCF00;
-  color: #000000;
-  padding: 8px 16px 6px 16px;
-}
-
-.center-item-box[padbottom="true"][warn="true"] {
-  padding-bottom: 4px;
-}
-
-.center-item-box[showseparator="true"] {
-  border-top: 1px solid #9C9CFF;
+  height: 15px;
+  -moz-margin-start: 6px;
 }
 
-.center-item-box[warn="false"] > .center-item-warning {
-  display: none;
+.click-to-play-plugins-notification-button-container {
 }
 
-.center-item-warning > .text-link {
-  color: #6868AA;
+.click-to-play-popup-button {
+  width: 50%;
 }
 
-.center-item-warning > .text-link[href=""] {
-  display: none;
+.click-to-play-plugins-notification-description-box {
+  margin-left: 5px;
+  margin-right: 5px;
+  margin-top: 0;
+  padding-bottom: 3px;
 }
 
-.center-item-warning-icon {
-  background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
-  background-repeat: no-repeat;
-  width: 16px;
-  height: 15px;
-  margin-bottom: 4px;
+.click-to-play-plugins-outer-description {
+  margin-top: 1px;
 }
 
-.center-item-warning-description {
-  color: #828282;
+.click-to-play-plugins-notification-link,
+.center-item-link {
+  margin: 0;
 }
 
-.center-item-button {
-  min-width: 0;
-}
+/* === END plugin-doorhanger.inc.css === */
 
 #main-window[privatebrowsingmode=temporary] #toolbar-menubar {
   background-image: url("chrome://browser/skin/privatebrowsing-dark.png");