X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=e4070861eea3c2a7f5860c21e5fa61957e4e71d6;hp=737c4bbd0fdf535cfba4dc049b2cbf999afc770f;hb=936e60fe1e8ef7a38298736369448d66d0507842;hpb=368d0b7ff30fae6bb74e895e6fb8d1a182a1cb1c

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 737c4bbd..e4070861 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -179,6 +179,14 @@ menubar {
 /*  min-height: 24px; */
 }
 
+#PersonalToolbar > #home-button {
+  -moz-box-orient: horizontal;
+}
+
+#PersonalToolbar > #home-button > .toolbarbutton-text {
+  display: block;
+}
+
 #print-preview-toolbar:not(:-moz-lwtheme) {
   /* -moz-appearance: toolbox; */
 }
@@ -320,6 +328,8 @@ toolbarbutton.bookmark-item[open="true"] {
   height: 16px;
   -moz-margin-start: 1px;
   -moz-margin-end: 2px;
+  margin-top: 1px;
+  margin-bottom: 1px;
 }
 
 /* Force the display of the label for bookmarks */
@@ -494,11 +504,11 @@ menuitem.bookmark-item {
 :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button,
           #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button,
           #social-share-button, #open-file-button, #find-button, #developer-button,
-          #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button,
+          #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button,
           #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button,
           #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
-          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button),
-
+          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button,
+          #pocket-button),
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
 }
@@ -656,6 +666,7 @@ menuitem.bookmark-item {
   -moz-image-region: rect(0, 288px, 18px, 270px);
 }
 
+#feed-button[cui-areatype="menu-panel"][panel-multiview-anchor=true],
 #feed-button[cui-areatype="toolbar"]:hover:not([disabled="true"]) {
   -moz-image-region: rect(18px, 288px, 36px, 270px);
 }
@@ -898,40 +909,40 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 720px, 36px, 702px);
 }
 
-#loop-button-throttled > .toolbarbutton-badge-container,
+#loop-button,
 #loop-button > .toolbarbutton-badge-container {
   list-style-image: url("chrome://browser/skin/loop/toolbarfx.png");
   -moz-image-region: rect(0, 18px, 18px, 0);
 }
 
-#loop-button-throttled:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container,
+#loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]),
 #loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
-#loop-button-throttled[state="disabled"] > .toolbarbutton-badge-container,
-#loop-button-throttled[disabled="true"] > .toolbarbutton-badge-container,
+#loop-button[state="disabled"],
+#loop-button[disabled="true"],
 #loop-button[state="disabled"] > .toolbarbutton-badge-container,
 #loop-button[disabled="true"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 36px, 18px, 18px);
 }
 
-#loop-button-throttled[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container,
+#loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]),
 #loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
-#loop-button-throttled:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container,
+#loop-button:not([disabled="true"])[state="error"],
 #loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
-#loop-button-throttled:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container,
+#loop-button:not([disabled="true"])[state="action"],
 #loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
-#loop-button-throttled:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container,
+#loop-button:not([disabled="true"])[state="active"],
 #loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 108px, 18px, 90px);
 }
@@ -944,6 +955,15 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 738px, 36px, 720px);
 }
 
+#pocket-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 774px, 18px, 756px);
+}
+
+#pocket-button[cui-areatype="toolbar"]:hover,
+#pocket-button[cui-areatype="toolbar"][open] {
+  -moz-image-region: rect(18px, 774px, 36px, 756px);
+}
+
 /* === END toolbarbuttons.inc.css === */
 
 /* === BEGIN menupanel.inc.css === */
@@ -960,17 +980,19 @@ toolbaritem[sdkstylewidget="true"] > toolbarbutton,
 :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button,
           #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button,
           #social-share-button, #open-file-button, #find-button, #developer-button,
-          #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button,
+          #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button,
           #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button,
           #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
-          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button)[cui-areatype="menu-panel"],
+          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button,
+          #pocket-button)[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button,
           #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button,
           #social-share-button, #open-file-button, #find-button, #developer-button,
-          #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button,
+          #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button,
           #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button,
           #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
-          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button) {
+          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button,
+                                                #pocket-button) {
   list-style-image: var(--menupanel-list-style-image);
 }
 
@@ -1277,12 +1299,21 @@ toolbarpaletteitem[place="palette"] > #webide-button:hover {
   -moz-image-region: rect(32px, 960px, 64px, 928px);
 }
 
+#pocket-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #pocket-button {
+  -moz-image-region: rect(0px, 992px, 32px, 960px);
+}
+
+#pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+  -moz-image-region: rect(32px, 992px, 64px, 960px);
+}
+
 toolbaritem[sdkstylewidget="true"] > toolbarbutton {
   -moz-image-region: rect(0, 832px, 32px, 800px);
 }
 
-#loop-button-throttled[cui-areatype="menu-panel"] > .toolbarbutton-badge-container,
-toolbarpaletteitem[place="palette"] > #loop-button-throttled > .toolbarbutton-badge-container,
+#loop-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #loop-button,
 #loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container,
 toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container {
   list-style-image: url("chrome://browser/skin/loop/menuPanel.png");
@@ -1290,39 +1321,39 @@ toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-contai
 }
 
 /* Make sure that the state icons are not shown in the customization palette. */
-toolbarpaletteitem[place="palette"] > #loop-button-throttled > .toolbarbutton-badge-container,
+toolbarpaletteitem[place="palette"] > #loop-button,
 toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 32px, 32px, 0) !important;
 }
 
-#loop-button-throttled[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container,
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]),
 #loop-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 160px, 32px, 128px);
 }
 
-#loop-button-throttled[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container,
-#loop-button-throttled[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container,
+#loop-button[cui-areatype="menu-panel"][state="disabled"],
+#loop-button[cui-areatype="menu-panel"][disabled="true"],
 #loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container,
 #loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 64px, 32px, 32px);
 }
 
-#loop-button-throttled[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container,
+#loop-button[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]),
 #loop-button[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 224px, 32px, 192px);
 }
 
-#loop-button-throttled[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container,
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"],
 #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 96px, 32px, 64px);
 }
 
-#loop-button-throttled[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container,
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"],
 #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 128px, 32px, 96px);
 }
 
-#loop-button-throttled[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container,
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"],
 #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 192px, 32px, 160px);
 }
@@ -1522,11 +1553,12 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-an
 */
 
 /* Help SDK icons fit: */
-toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
+toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon,
+toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-container > .toolbarbutton-icon {
   width: 16px;
 }
 
-#nav-bar toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
+#nav-bar toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */
   width: 32px;
 }
@@ -2452,13 +2484,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   max-height: 16px;
 }
 
-toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
-  width: auto;
-  height: auto;
-  max-width: 32px;
-  max-height: 24px;
-}
-
 /* fixup corners for share panel */
 .social-panel > .social-panel-frame {
   border-radius: inherit;
@@ -2658,6 +2683,8 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 :root {
   /* --tab-toolbar-navbar-overlap: 1px; */
   /* --tab-min-height: 31px; */
+  /* --tab-curve-width: 30px; */
+  /* --tab-curve-half-width: 15px; */
 }
 
 .tabbrowser-tab,
@@ -2685,12 +2712,8 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   background-color: #C09070;
 }
 
-.tabbrowser-tab[remote] {
-  text-decoration: underline;
-}
-
 /* The selected tab should appear above adjacent tabs, .tabs-newtab-button and the highlight of #nav-bar */
-.tabbrowser-tab[selected=true] {
+.tabbrowser-tab[visuallyselected=true] {
 /*  position: relative;
   z-index: 2;*/
 }
@@ -2701,7 +2724,10 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tab-content {
 }
 
-.tab-/*throbber*/,
+.tab-content[pinned] {
+}
+
+.tab-throbber,
 .tab-icon-image,
 .tab-close-button {
 }
@@ -2710,12 +2736,26 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tab-icon-image {
   height: 16px;
   width: 16px;
+  -moz-margin-end: 3px;
 }
 
 .tab-icon-image {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
+.tab-icon-overlay {
+  width: 16px;
+  height: 16px;
+ /* margin-top: 10px; */
+  -moz-margin-start: -16px;
+  display: none;
+}
+
+.tab-icon-overlay[crashed] {
+  display: -moz-box;
+  list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg");
+}
+
 .tab-throbber[busy] {
   list-style-image: url("chrome://communicator/skin/brand/throbber16-anim-connect.png");
 }
@@ -2724,11 +2764,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png");
 }
 
-.tab-throbber:not([pinned]),
-.tab-icon-image:not([pinned]) {
-  -moz-margin-end: 3px;
-}
-
 .tab-throbber[pinned],
 .tab-icon-image[pinned] {
   -moz-margin-start: 2px;
@@ -2778,15 +2813,15 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator {
 }
 
-.tab-background-start[selected=true]::after,
-.tab-background-start[selected=true]::before,
+.tab-background-start[visuallyselected=true]::after,
+.tab-background-start[visuallyselected=true]::before,
 .tab-background-start,
 .tab-background-end,
-.tab-background-end[selected=true]::after,
-.tab-background-end[selected=true]::before {
+.tab-background-end[visuallyselected=true]::after,
+.tab-background-end[visuallyselected=true]::before {
 }
 
-.tabbrowser-tab:not([selected=true]),
+.tabbrowser-tab:not([visuallyselected=true]),
 .tabbrowser-tab:-moz-lwtheme {
 }
 
@@ -2797,7 +2832,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 /* Selected tab */
 
-.tabbrowser-tab[selected="true"] {
+.tabbrowser-tab[visuallyselected="true"] {
 }
 
 /* End selected tab */
@@ -2825,17 +2860,11 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   color: #000000;
 }
 
-/* Handle a case where the last separator in a customized tab bar with a
-   separated new tab button causes the width of the tab to extend and causes
-   jittering with a small tab curve width (Bug 1111091). */
-#TabsToolbar[currentset]:not([currentset*="tabbrowser-tabs,new-tab-button"]) #tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
-}
-
 /* New tab button */
 
 .tabs-newtab-button {
   width: 28px;
-  /* width: calc(36px + @tabCurveWidth@); */
+  /* width: calc(36px + var(--tab-curve-width)); */
 }
 
 /* === END tabs.inc.css === */
@@ -2846,7 +2875,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
  * of the window (e.g. no menubar, tabs in titlebar, etc.) to make it easier to drag the window by
  * the titlebar. We don't need this in fullscreen since window dragging is not an issue there.
  */
-#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar .tab-background-middle:not([selected=true]) {
+#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar .tab-background-middle:not([visuallyselected=true]) {
 /*  clip-path: url(chrome://browser/content/browser.xul#tab-hover-clip-path);*/
 }
 
@@ -3148,6 +3177,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   margin-top: 5px;
 }
 
+/* === BEGIN notification-icons.inc.css === */
+
 .popup-notification-icon {
   width: 64px;
   height: 64px;
@@ -3158,65 +3189,54 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/Geolocation-64.png");
 }
 
+.popup-notification-icon[popupid="push"] {
+  list-style-image: url(chrome://browser/skin/Push-64.png);
+}
+
 .popup-notification-icon[popupid="xpinstall-disabled"],
-.popup-notification-icon[popupid="addon-progress"],
-.popup-notification-icon[popupid="addon-install-cancelled"],
-.popup-notification-icon[popupid="addon-install-blocked"],
-.popup-notification-icon[popupid="addon-install-failed"],
-.popup-notification-icon[popupid="addon-install-complete"] {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-  width: 32px;
-  height: 32px;
+.popup-notification-icon[popupid="addon-install-blocked"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-blocked.svg);
 }
 
-.popup-notification-icon[popupid="click-to-play-plugins"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked-64.png");
+.popup-notification-icon[popupid="addon-progress"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-downloading.svg);
 }
 
-.popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url("chrome://browser/skin/notification-64.png");
+.popup-notification-icon[popupid="addon-install-failed"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-error.svg);
 }
 
-.addon-progress-description {
-  width: 350px;
-  max-width: 350px;
+.popup-notification-icon[popupid="addon-install-confirmation"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-confirm.svg);
 }
 
-.popup-progress-label,
-.popup-progress-meter {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+#addon-install-confirmation-notification[warning] .popup-notification-icon[popupid="addon-install-confirmation"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-warning.svg);
 }
 
-.popup-progress-cancel {
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
-  padding: 0;
-  margin: 0;
-  min-height: 0;
-  min-width: 0;
-  list-style-image: url("chrome://mozapps/skin/downloads/downloadButtons.png");
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+.popup-notification-icon[popupid="addon-install-complete"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-installed.svg);
 }
 
-.popup-progress-cancel:hover {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
+.popup-notification-icon[popupid="addon-install-restart"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-restart.svg);
 }
 
-.popup-progress-cancel:active {
-  -moz-image-region: rect(32px, 32px, 48px, 16px);
+.popup-notification-icon[popupid="click-to-play-plugins"] {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked-64.png");
+}
+
+.popup-notification-icon[popupid="web-notifications"] {
+  list-style-image: url("chrome://browser/skin/notification-64.png");
 }
 
 .popup-notification-icon[popupid="indexedDB-permissions-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");
 }
 
-.popup-notification-icon[popupid="password-save"],
-.popup-notification-icon[popupid="password-change"] {
+.popup-notification-icon[popupid="password"] {
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png");
 }
 
@@ -3304,8 +3324,20 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   list-style-image: url("chrome://browser/skin/Geolocation-16.png");
 }
 
+#push-notification-icon {
+  list-style-image: url(chrome://browser/skin/Push-16.png);
+}
+
 #addons-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default);
+}
+
+#addons-notification-icon:hover {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#hover);
+}
+
+#addons-notification-icon:hover:active {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active);
 }
 
 .indexedDB-notification-icon,
@@ -3317,6 +3349,12 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-16.png");
 }
 
+#login-fill-notification-icon {
+  /* Temporary icon until the capture and fill doorhangers are unified. */
+  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png);
+  transform: scaleX(-1);
+}
+
 #webapps-notification-icon {
   list-style-image: url("chrome://gobal/skin/icons/webapps-16.png");
 }
@@ -3409,8 +3447,54 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
 #pointerLock-notification-icon {
   list-style-image: url("chrome://browser/skin/pointerLock-16.png");
 }
-#pointerLock-cancel {
-  margin: 0px;
+
+.translate-notification-icon,
+#translate-notification-icon {
+  list-style-image: url("chrome://browser/skin/translation-16.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.translated-notification-icon,
+#translated-notification-icon {
+  list-style-image: url("chrome://browser/skin/translation-16.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+.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");
+}
+
+/* EME notifications */
+
+.popup-notification-icon[popupid="drmContentPlaying"],
+#eme-notification-icon {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
+}
+
+#eme-notification-icon:hover:active {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed");
+}
+
+#eme-notification-icon[firstplay=true] {
+  animation: emeTeachingMoment 0.2s linear 0s 5 normal;
+}
+
+@keyframes emeTeachingMoment {
+  0% {transform: translateX(0); }
+  25% {transform: translateX(3px) }
+  75% {transform: translateX(-3px) }
+  100% { transform: translateX(0); }
+}
+
+/* === END notification-icons.inc.css === */
+
+.popup-notification-body[popupid="addon-progress"],
+.popup-notification-body[popupid="addon-install-confirmation"] {
+  width: 28em;
+  max-width: 28em;
 }
 
 /* Translation infobar */
@@ -3440,6 +3524,10 @@ notification[value="translation"][state="translating"] .messageImage {
   }
 }
 
+notification[value="translation"] hbox[anonid="details"] {
+  overflow: hidden;
+}
+
 notification[value="translation"] button,
 notification[value="translation"] menulist {
   min-width: 0;
@@ -3497,20 +3585,20 @@ notification[value="translation"] {
   min-height: 40px;
 }
 
-.translate-notification-icon,
-#translate-notification-icon {
-  list-style-image: url("chrome://browser/skin/translation-16.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+.translation-menupopup {
+  -moz-appearance: none;
 }
 
-.translated-notification-icon,
-#translated-notification-icon {
-  list-style-image: url("chrome://browser/skin/translation-16.png");
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+/* Loop/ Hello browser styles */
+
+notification[value="loop-sharing-notification"] .button-menubutton-button {
+  min-width: 0;
+  border: 0;
+  margin: 0;
 }
 
-.translation-menupopup {
-  -moz-appearance: none;
+notification[value="loop-sharing-notification"] .messageImage {
+  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png);
 }
 
 /* Bookmarks roots menu-items */
@@ -3540,6 +3628,12 @@ notification[value="translation"] {
   -moz-image-region: auto;
 }
 
+#panelMenu_pocket,
+#menu_pocket,
+#BMB_pocket {
+  list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16.png");
+}
+
 /* ::::: Keyboard UI Panel ::::: */
 
 .KUI-panel {
@@ -3689,10 +3783,23 @@ notification[value="translation"] {
 
 /* === BEGIN commandline.inc.css === */
 
+/* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
+   We are copy/pasting variables from light-theme and dark-theme,
+   since they aren't loaded in this context (within browser.css). */
+:root #developer-toolbar {
+  --gcli-background-color: #000000; /* --theme-toolbar-background */
+  --gcli-input-background: rgba(0, 0, 0, .75); /* --theme-tab-toolbar-background */
+  --gcli-input-focused-background: #000000; /* --theme-sidebar-background */
+  --gcli-input-color: #FF9F00; /* --theme-body-color-alt */
+  --gcli-border-color: #9C9CFF; /* --theme-splitter-color */
+  --selection-background: #008484; /* --theme-selection-background */
+  --selection-color: #000000; /* --theme-selection-color */
+}
+
 /* Developer toolbar */
 
 #developer-toolbar {
-  border-top: 3px solid #000000;
+  border-top: 3px solid var(--gcli-background-color);
   border-bottom: none;
 }
 
@@ -3824,11 +3931,11 @@ html|*#gcli-output-frame {
 /*  line-height: 32px;
   outline-style: none; */
   background-repeat: no-repeat;
-  background-color: rgba(0, 0, 0, .75);
+  background-color: var(--gcli-input-background);
 }
 
 .gclitoolbar-input-node[focused="true"] {
-  background-color: #000000;
+  background-color: var(--gcli-input-focused-background);
 }
 
 .gclitoolbar-input-node::before {
@@ -3858,9 +3965,8 @@ html|*#gcli-output-frame {
 }
 
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
-  background-color: #008484;
-  color: #000000;
-  text-shadow: none;
+  background-color: var(--selection-background);
+  color: var(--selection-color);
 }
 
 .gclitoolbar-complete-node {
@@ -4290,12 +4396,6 @@ 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 {
   -moz-margin-start: 0; /* override default label margin to match description margin */
 }
@@ -4734,17 +4834,44 @@ notification.pluginVulnerable .messageImage {
 
 /* === END badcontent-doorhanger.inc.css === */
 
-/* EME notifications */
+/* === BEGIN login-doorhanger.inc.css === */
 
-.popup-notification-icon[popupid="drmContentPlaying"],
-#eme-notification-icon {
-  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
+#login-fill-testing {
+  color: #FF0000;
+  font-weight: bold;
 }
 
-#eme-notification-icon:hover:active {
-  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed");
+#login-fill-list {
+  border: 1px solid #9C9CFF;
+  max-height: 20em;
 }
 
+.login-fill-item[disabled] {
+  color: #8050B0;
+  background-color: #000000;
+}
+
+.login-fill-item[disabled][selected] {
+  background-color: #008484;
+}
+
+.login-hostname {
+  margin: 4px;
+  font-weight: bold;
+}
+
+.login-fill-item.different-hostname > .login-hostname {
+  color: #A09090;
+  font-style: italic;
+}
+
+.login-username {
+  margin: 4px;
+  color: #A09090;
+}
+
+/* === END login-doorhanger.inc.css === */
+
 /* === BEGIN customizeMode.inc.css === */
 
 /* Customization mode */
@@ -4898,13 +5025,17 @@ notification.pluginVulnerable .messageImage {
 #customization-titlebar-visibility-button {
   list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
-  padding: 0px 5px;
 }
 
 #customization-titlebar-visibility-button:hover {
   -moz-image-region: rect(16px, 16px, 32px, 0);
 }
 
+#customization-lwtheme-button,
+#customization-titlebar-visibility-button  {
+  padding: 0px 5px;
+}
+
 #customization-titlebar-visibility-button > .button-box {
   padding-top: 0;
   padding-bottom: 1px;
@@ -4915,11 +5046,19 @@ notification.pluginVulnerable .messageImage {
   padding-bottom: 0;
 }
 
+#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text,
 #customization-titlebar-visibility-button > .button-box > .button-text {
   /* Sadly, button.css thinks its margins are perfect for everyone. */
   -moz-margin-start: 5px !important;
 }
 
+#customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon {
+  width: 20px;
+  height: 20px;
+  border-radius: 2px;
+  background-size: contain;
+}
+
 #customization-titlebar-visibility-button > .button-box > .button-icon {
   vertical-align: middle;
 }
@@ -5470,58 +5609,11 @@ toolbarpaletteitem[place="toolbar"] {
   color: #000000;
 }
 
-.SearchHighlight {
-  -moz-margin-end: 6px;
-  font-size: 110%;
-  width: 225px;
-}
-
-.SearchHighlight label,
-.SearchHighlight description {
-  color: #008484;
-  margin: 0 0 8px 0;
-  padding: 0;
-}
-
-.SearchHighlightTitle {
-  font-weight: bold;
-}
-
-.SearchHighlight .dot {
-  width: 7px;
-  height: 7px;
-  background-image: -moz-image-rect(url("chrome://browser/skin/dots.png"), 0, 100%, 100%, 9);
-  background-size: 7px;
-  background-position: center center;
-  background-repeat: no-repeat;
-  -moz-margin-end: 2px;
-}
-
-.SearchHighlight .dot.filled {
-  background-image: -moz-image-rect(url("chrome://browser/skin/dots.png"), 0, 7, 100%, 0);
-}
-
-.SearchHighlight button {
-  margin: 0;
-  /* On some platforms clicking the button will steal focus from the search box
-     causing the popup to close. */
-  -moz-user-focus: ignore;
-}
-
-@media not all and (max-resolution: 1dppx) {
-  .SearchHighlight .dot {
-    background-image: -moz-image-rect(url("chrome://browser/skin/dots@2x.png"), 0, 100%, 100%, 18);
-  }
-
-  .SearchHighlight .dot.filled {
-    background-image: -moz-image-rect(url("chrome://browser/skin/dots@2x.png"), 0, 14, 100%, 0);
-  }
-}
-
 /* Notification overrides for Heartbeat UI */
 
 notification.heartbeat {
   background-color: #A09090;
+/*  height: 40px;*/
 }
 
 @keyframes pulse-onshow {
@@ -5558,17 +5650,15 @@ notification.heartbeat {
 
 .messageText.heartbeat {
   color: #000000;
-/*  font-weight: normal;
-  font-family: "Lucida Grande", Segoe, Ubuntu;
-  font-size: 14px;
-  line-height: 16px;
-  text-shadow: none; */
+/*  text-shadow: none; */
+  -moz-margin-start: 0px;
 }
 
 .messageImage.heartbeat {
-  width: 36px;
-  height: 36px;
-  -moz-margin-end: 10px;
+  width: 24px;
+  height: 24px;
+  -moz-margin-start: 8px;
+  -moz-margin-end: 8px;
 }
 
 .messageImage.heartbeat.pulse-onshow {
@@ -5585,9 +5675,25 @@ notification.heartbeat {
   animation-timing-function: linear;
 }
 
+/* Learn More link styles */
+.heartbeat > .text-link {
+  color: #3333FF;
+  -moz-margin-start: 0px;
+}
+
+.heartbeat > .text-link:hover {
+  color: #9C9CFF;
+  text-decoration: none;
+}
+
+.heartbeat > .text-link:hover:active {
+  color: #FF9F00;
+}
+
 /* Heartbeat UI Rating Star Classes */
 .heartbeat > #star-rating-container {
   display: -moz-box;
+/*  margin-bottom: 4px;*/
 }
 
 .heartbeat > #star-rating-container > #star5 {
@@ -5609,16 +5715,15 @@ notification.heartbeat {
 .heartbeat > #star-rating-container > .star-x  {
   background: url("chrome://browser/skin/heartbeat-star-off.svg");
   cursor: pointer;
-  width: 24px;
-  height: 24px;
+  /* Overrides the -moz-margin-end for all platforms defined in the .plain class */
+  -moz-margin-end: 4px !important;
+  width: 16px;
+  height: 16px;
 }
 
 .heartbeat > #star-rating-container > .star-x:hover,
 .heartbeat > #star-rating-container > .star-x:hover ~ .star-x {
   background: url("chrome://browser/skin/heartbeat-star-lit.svg");
-  cursor: pointer;
-  width: 24px;
-  height: 24px;
 }
 
 /* === END UITour.inc.css === */
@@ -5749,6 +5854,10 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
 }
 
+#context-media-eme-learnmore {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
+}
+
 /* === END contextmenu.inc.css === */
 
 #context-navigation {