X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=6c587e50ddc0aa6639f0082c387d7167fe051761;hp=32fb8fe493084933fc38feabc41b15dcc5b4d9d8;hb=43ee1307e3c5939f459977d42a001cf5046dc0b9;hpb=f76c6aee64655acdb0b77f9d0995a4111c237ef7

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 32fb8fe4..6c587e50 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -67,15 +67,9 @@ menubar {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
 }
 
-#main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) {
-  /* like menubar */
-  background-color: #6000CF;
-  color: #FF9F00;
-}
-
-#main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme):-moz-window-inactive {
-  background-color: #8050B0;
-  color: #FF9F00;
+#main-window[tabsintitlebar] #toolbar-menubar .toolbar-endcap {
+  /* the titlebar buttons are shown right over the endcap but we have no power over the buttonbox position just for this case, so hide the endcap */
+  display: none;
 }
 
 #navigator-toolbox {
@@ -435,14 +429,15 @@ menubar {
 
 /* ::::: bookmark buttons ::::: */
 
-/*.bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon */
-.bookmark-item > .toolbarbutton-icon {
+.bookmark-item > .toolbarbutton-icon,
+#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
 }
 
-/* Prevent [mode="icons"] from hiding the label */
-.bookmark-item > .toolbarbutton-text {
+/* Force the display of the label for bookmarks */
+.bookmark-item > .toolbarbutton-text,
+#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-text {
   display: -moz-box !important;
 }
 
@@ -454,7 +449,8 @@ menubar {
   background: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") no-repeat center;
 }
 
-.bookmarks-toolbar-customize {
+.bookmarks-toolbar-customize,
+#bookmarks-toolbar-placeholder {
   max-width: 15em !important;
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") !important;
 }
@@ -603,6 +599,12 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 144px, 36px, 126px);
 }
 
+/* When "new tab" page shows up, the menubutton-button (star button) is disabled */
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button[disabled="true"] {
+  -moz-image-region: rect(36px, 144px, 54px, 126px) !important;
+  background-color: transparent !important;
+}
+
 #navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][starred] {
   -moz-image-region: rect(0, 162px, 18px, 144px);
 }
@@ -946,13 +948,11 @@ menuitem.bookmark-item {
 }
 
 #downloads-button[cui-areatype="menu-panel"],
-#downloads-indicator[cui-areatype="menu-panel"],
 :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #downloads-button {
   -moz-image-region: rect(0px, 256px, 32px, 224px);
 }
 
 #downloads-button[cui-areatype="menu-panel"]:hover,
-#downloads-indicator[cui-areatype="menu-panel"]:hover,
 :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #downloads-button:hover {
   -moz-image-region: rect(32px, 256px, 64px, 224px);
 }
@@ -1361,30 +1361,46 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 /* unified back/forward button */
 
+/* Australis?
+#forward-button {
+  padding: 0 !important;
+}
+
+#forward-button > menupopup {
+  margin-top: 1px !important;
+}
+*/
+
 #back-button {
-  -moz-image-region: rect(0, 18px, 18px, 0);
   -moz-margin-end: 0;
 }
 
-#back-button:not([disabled="true"]):hover {
+/* A number of styles use :-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) - this makes it only apply pre-Australis as iconsize and palette-box or addon-bar don't exist afterwards */
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #back-button {
+  -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #back-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 18px, 36px, 0);
 }
 
-#back-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #back-button[disabled="true"] {
   -moz-image-region: rect(36px, 18px, 54px, 0);
 }
 
 #forward-button {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
-  border-left: none;
   -moz-margin-start: 0;
 }
 
-#forward-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #forward-button {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #forward-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 36px, 36px, 18px);
 }
 
-#forward-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #forward-button[disabled="true"] {
   -moz-image-region: rect(36px, 36px, 54px, 18px);
 }
 
@@ -1393,16 +1409,7 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-text {
   transform: scaleX(-1);
 }
-
-#nav-bar #back-button {
-  -moz-margin-end: 0 !important;
-}
-
-#nav-bar #forward-button {
-  border-left-style: none;
-  -moz-margin-start: 0 !important;
-}
-
+/*
 #nav-bar #back-button:-moz-locale-dir(ltr) {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
@@ -1413,7 +1420,7 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
-
+*/
 /* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */
 #urlbar-container > #back-button,
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
@@ -1535,71 +1542,74 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button:not([switchingtabs]) > #forward-button {
+    #unified-back-forward-button:not([switchingtabs]) > #forward-button,
+window:not([chromehidden~="toolbar"]) #urlbar-container:not([switchingtabs]) > #forward-button {
   transition: opacity 150ms ease-out;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button:not(:hover) > #forward-button[disabled] {
+    #unified-back-forward-button:not(:hover) > #forward-button[disabled],
+window:not([chromehidden~="toolbar"]) #urlbar-container:not(:hover) > #forward-button[disabled] {
   opacity: 0;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button:hover > #forward-button[disabled] {
+    #unified-back-forward-button:hover > #forward-button[disabled],
+window:not([chromehidden~="toolbar"]) #urlbar-container:hover > #forward-button[disabled] {
   background-color: transparent;
 }
 
-/* A number of buttons use :-moz-any(#palette-box, #navigator-toolbox[iconsize]) - this makes it only apply pre-Australis as iconsize and the palette-box don't exist afterwards */
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #stop-button {
+/* A number of buttons use :-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) - this makes it only apply pre-Australis as iconsize and the palette-box don't exist afterwards */
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #stop-button {
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #stop-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #stop-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 54px, 36px, 36px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #stop-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #stop-button[disabled="true"] {
   -moz-image-region: rect(36px, 54px, 54px, 36px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #reload-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #reload-button {
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #reload-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #reload-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 72px, 36px, 54px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #reload-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #reload-button[disabled="true"] {
   -moz-image-region: rect(36px, 72px, 54px, 54px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #home-button.bookmark-item {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #home-button.bookmark-item {
   list-style-image: url("chrome://browser/skin/FxToolbar.png");
 }
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #home-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #home-button {
   -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #home-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #home-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 90px, 36px, 72px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #home-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #home-button[disabled="true"] {
   -moz-image-region: rect(36px, 90px, 54px, 72px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #downloads-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #downloads-button {
   -moz-image-region: rect(0, 108px, 18px, 90px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #downloads-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #downloads-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 108px, 36px, 90px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #downloads-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #downloads-button[disabled="true"] {
   -moz-image-region: rect(36px, 108px, 54px, 90px);
 }
 
@@ -1607,20 +1617,20 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   margin: 0;
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #history-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #history-button {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #history-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #history-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 126px, 36px, 108px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #history-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #history-button[disabled="true"] {
   -moz-image-region: rect(36px, 126px, 54px, 108px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-button,
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-menu-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-button,
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-menu-button {
   list-style-image: url("chrome://browser/skin/FxToolbar.png") !important; /* for making the palette work */
   -moz-image-region: rect(0, 144px, 18px, 126px);
 }
@@ -1629,54 +1639,54 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   /* list-style-image: url("chrome://browser/skin/FxToolbar.png"); */
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-menu-button.toolbarbutton-1 {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-menu-button.toolbarbutton-1 {
   -moz-box-orient: horizontal;
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-button:not([disabled="true"]):hover,
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-menu-button[open="true"],
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-menu-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-button:not([disabled="true"]):hover,
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-menu-button[open="true"],
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-menu-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 144px, 36px, 126px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-button[disabled="true"],
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-menu-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-button[disabled="true"],
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-menu-button[disabled="true"] {
   -moz-image-region: rect(36px, 144px, 54px, 126px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #print-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #print-button {
   -moz-image-region: rect(0, 162px, 18px, 144px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #print-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #print-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 162px, 36px, 144px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #print-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #print-button[disabled="true"] {
   -moz-image-region: rect(36px, 162px, 54px, 144px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #new-tab-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #new-tab-button {
   -moz-image-region: rect(0, 180px, 18px, 162px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #new-tab-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #new-tab-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 180px, 36px, 162px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #new-tab-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #new-tab-button[disabled="true"] {
   -moz-image-region: rect(36px, 180px, 54px, 162px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #new-window-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #new-window-button {
   -moz-image-region: rect(0, 198px, 18px, 180px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #new-window-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #new-window-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 198px, 36px, 180px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #new-window-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #new-window-button[disabled="true"] {
   -moz-image-region: rect(36px, 198px, 54px, 180px);
 }
 
@@ -1716,15 +1726,15 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 252px, 54px, 234px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #fullscreen-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #fullscreen-button {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #fullscreen-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #fullscreen-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 270px, 36px, 252px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #fullscreen-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #fullscreen-button[disabled="true"] {
   -moz-image-region: rect(36px, 270px, 54px, 252px);
 }
 
@@ -1753,38 +1763,38 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 306px, 54px, 288px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #sync-button:not([status]) {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #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);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #sync-button[status="active"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #sync-button[status="active"] {
   list-style-image: url("chrome://browser/skin/sync-throbber.png");
   -moz-image-region: rect(0, 18px, 18px, 0);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #sync-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #sync-button[disabled="true"] {
   -moz-image-region: rect(36px, 324px, 54px, 306px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #feed-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #feed-button {
   -moz-image-region: rect(0, 342px, 18px, 324px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #feed-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #feed-button[disabled="true"] {
   -moz-image-region: rect(36px, 342px, 54px, 324px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #webrtc-status-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #webrtc-status-button {
   -moz-image-region: rect(0, 360px, 18px, 342px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #webrtc-status-button:not([disabled="true"]):hover,
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #webrtc-status-button[open="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #webrtc-status-button:not([disabled="true"]):hover,
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #webrtc-status-button[open="true"] {
   -moz-image-region: rect(18px, 360px, 36px, 342px);
 }
 
-:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #webrtc-status-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #webrtc-status-button[disabled="true"] {
   -moz-image-region: rect(36px, 360px, 54px, 342px);
 }
 
@@ -1895,7 +1905,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button + #urlbar-container {
+    #unified-back-forward-button + #urlbar-container,
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper {
   padding-left: 22px;
   -moz-margin-start: -22px;
   position: relative;
@@ -1904,7 +1915,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button + #urlbar-container > #urlbar {
+    #unified-back-forward-button + #urlbar-container > #urlbar,
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar {
 /*  -moz-border-start: none;
   margin-left: 0; */
   pointer-events: all;
@@ -1912,40 +1924,46 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button:not([switchingtabs]) + #urlbar-container > #urlbar {
+    #unified-back-forward-button:not([switchingtabs]) + #urlbar-container > #urlbar,
+window:not([chromehidden~="toolbar"]) #urlbar-container:not([switchingtabs]) > #urlbar-wrapper > #urlbar {
   transition: margin-left 150ms ease-out;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(ltr) {
+    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(ltr),
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar:-moz-locale-dir(ltr) {
 /*  border-top-left-radius: 0;
   border-bottom-left-radius: 0; */
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
+    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl),
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
 /*  border-top-right-radius: 0;
   border-bottom-right-radius: 0; */
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar {
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar,
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar {
   margin-left: -22px;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar {
+    #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar,
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:hover:not([switchingtabs]) > #urlbar-wrapper > #urlbar {
   /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
   transition-delay: 100s;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar {
+    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar,
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar {
   /* when not hovered anymore, trigger a new transition to hide the forward button immediately */
   margin-left: -22.01px;
 }
@@ -1955,7 +1973,9 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
     #unified-back-forward-button + #urlbar-container:-moz-locale-dir(rtl),
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
+    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl),
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper:-moz-locale-dir(rtl),
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
   /* let winstripe-urlbar-back-button-clip-path clip the urlbar's right side for RTL */
   transform: scaleX(-1);
 }
@@ -2029,6 +2049,10 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   color: #8050B0;
 }
 
+#search-container {
+  min-width: calc(54px + 11ch);
+}
+
 /* identity box */
 
 #identity-box {
@@ -2043,7 +2067,8 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button + #urlbar-container > #urlbar > #identity-box {
+    #unified-back-forward-button + #urlbar-container > #urlbar > #identity-box,
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar > #identity-box {
 /*   border-radius: 0; */
   -moz-padding-start: 2px;
   -moz-padding-end: 2px;
@@ -2052,35 +2077,50 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar >
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr),
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar >
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
   padding-left: 2px;
   transition: padding-left;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > 
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl),
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar > 
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
   padding-right: 2px;
   transition: padding-right;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box {
+    #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > 
+    #notification-popup-box[hidden] + #identity-box,
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:hover:not([switchingtabs]) > #urlbar-wrapper > #urlbar > 
+    #notification-popup-box[hidden] + #identity-box {
   /* forward button hiding is delayed when hovered */
   transition-delay: 100s;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar >
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr),
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar > 
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
   /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
   padding-left: 2.01px;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > 
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl),
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar > 
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
   /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
   padding-right: 2.01px;
 }
@@ -2659,11 +2699,12 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 }
 
 .tabbrowser-tab,
-.tabs-newtab-button {
+.tabs-newtab-button,
+#TabsToolbar > #new-tab-button {
   margin-top: 0px;
 }
 
-.tabbrowser-tab{
+.tabbrowser-tab {
   padding: 1px 4px 2px;
 }
 
@@ -2671,12 +2712,14 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-margin-start: 2px;
 }
 
-.tabs-newtab-button {
+.tabs-newtab-button,
+#TabsToolbar > #new-tab-button {
   border-radius: 8px 8px 0px 0px;
   -moz-margin-start: 0;
 }
 
-.tabs-newtab-button:not(:hover) {
+.tabs-newtab-button:not(:hover),
+#TabsToolbar > #new-tab-button:not(:hover) {
   background-color: #C09070;
 }
 
@@ -2809,8 +2852,11 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   width: 26px;
 }
 
+/* Remove |#navigator-toolbox:not([iconsize])| selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */
 .tabs-newtab-button,
 .tabs-newtab-button:hover,
+#navigator-toolbox:not([iconsize]) #TabsToolbar > #new-tab-button,
+#navigator-toolbox:not([iconsize]) #TabsToolbar > #new-tab-button:hover,
 #TabsToolbar > #new-tab-button:hover {
   -moz-image-region: rect(0, 32px, 18px, 16px);
 }
@@ -2993,6 +3039,29 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/Secure24.png");
 }
 
+#identity-popup-help-icon {
+  border: none;
+  margin: 7px 0 0 -3px;
+  background: none;
+  min-width: 0;
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+  cursor: pointer;
+}
+
+#identity-popup-help-icon > .button-box > .button-text {
+  display: none;
+}
+
+#identity-popup-help-icon > .button-box > .button-icon {
+  height: 16px;
+  width: 16px;
+}
+
+#identity-popup-help-icon:-moz-focusring {
+  outline: 1px dotted;
+  outline-offset: 1px;
+}
+
 #identity-popup-more-info-button {
   margin-top: 6px;
   margin-bottom: 0;
@@ -3419,11 +3488,13 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   background-color: transparent !important;
 }
 
+/* === BEGIN highlighter.inc.css === */
+
 /* Highlighter */
 
 .highlighter-outline {
   box-shadow: 0 0 0 1px black;
-  outline: 1px dashed white;
+  outline: 1px dashed #A09090;
 }
 
 .highlighter-outline[locked]  {
@@ -3435,10 +3506,14 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 .highlighter-nodeinfobar {
   color: #FF9F00;
-  border: 1px solid rgba(156, 156, 255, .5);
   border-radius: 3px;
   background-color: #000000;
   background-clip: padding-box;
+  border: 1px solid #008484;
+  padding: 5px;
+  /* Avoid cases where the infobar is smaller than the arrow, when the text is
+  short */
+  min-width: 75px;
 }
 
 /* Highlighter - Node Infobar - text */
@@ -3464,6 +3539,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
 /* Highlighter - Node Infobar - buttons */
 
 .highlighter-nodeinfobar-button {
+  border-width: 0;
   padding: 0;
   width: 26px;
   min-height: 26px;
@@ -3476,9 +3552,6 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-margin-end: 2px;
 }
 
-.highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
-}
-
 .highlighter-nodeinfobar-inspectbutton:hover,
 .highlighter-nodeinfobar-inspectbutton:hover:active/*,
 .highlighter-nodeinfobar-container:not([locked]) >  .highlighter-nodeinfobar >  .highlighter-nodeinfobar-inspectbutton*/ {
@@ -3488,9 +3561,6 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
 .highlighter-nodeinfobar-menu {
 }
 
-.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
-}
-
 .highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
   -moz-box-align: center;
   -moz-margin-start: -1px;
@@ -3503,7 +3573,6 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   height: 14px;
   -moz-margin-start: calc(50% - 7px);
   transform: rotate(-45deg);
-  border: 1px solid transparent;
   background-clip: padding-box;
   background-repeat: no-repeat;
 }
@@ -3511,28 +3580,21 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
 .highlighter-nodeinfobar-arrow-top {
   margin-bottom: -8px;
   margin-top: 8px;
-  border-right-color: rgba(0, 132, 132, .5);
-  border-top-color: rgba(0, 132, 132, .5);
   background-image: linear-gradient(to bottom left, transparent 50%, rgb(0, 132, 132) 50%);
 }
 
 .highlighter-nodeinfobar-arrow-bottom {
   margin-top: -8px;
   margin-bottom: 8px;
-  border-left-color: rgba(0, 132, 132, .5);
-  border-bottom-color: rgba(0, 132, 132, .5);
   background-image: linear-gradient(to top right, transparent 50%, rgb(0, 132, 132) 50%);
 }
 
-.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
-.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar {
-  box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
-}
-
 .highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
   margin: 7px 0;
 }
 
+/* === END highlighter.inc.css === */
+
 #full-screen-warning-message {
   background-color: #000000;
   color: #FF9F00;
@@ -4224,6 +4286,18 @@ window > chatbox {
   margin: 0;
 }
 
+.messageImage[value="plugin-hidden"] {
+  list-style-image: url("chrome://browser/skin/notification-pluginNormal.png");
+}
+
+/* Keep any changes to this style in sync with pluginProblem.css */
+notification.pluginVulnerable {
+}
+
+notification.pluginVulnerable .messageImage {
+  list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png");
+}
+
 /* Customization mode */
 
 /* === END plugin-doorhanger.inc.css === */
@@ -4425,6 +4499,13 @@ html|div#UITourHighlight {
   border: 2px #9C9CFF solid;
   min-height: 32px;
   min-width: 32px;
+  /* HACK for pre-Australis */
+  display: none;
+}
+
+html|div#UITourHighlight[active] {
+  /* HACK for pre-Australis */
+  display: none;
 }
 
 #UITourTooltip {