(hopefully) complete removal of pre-Australis support and sync with Australis browser.css
authorRobert Kaiser <robert@widebook.box.kairo.at>
Mon, 7 Apr 2014 00:38:06 +0000 (02:38 +0200)
committerRobert Kaiser <robert@widebook.box.kairo.at>
Mon, 7 Apr 2014 00:38:06 +0000 (02:38 +0200)
LCARStrek/browser/ToolbarFx.png
LCARStrek/browser/browser.css
LCARStrek/customizemode.inc.css [deleted file]

index f12933ad0fb5d78d986290461a15677f268bd6d3..b3d0c9e21c75b444980eab017c1b44d3c38e75d3 100644 (file)
Binary files a/LCARStrek/browser/ToolbarFx.png and b/LCARStrek/browser/ToolbarFx.png differ
index f4a49cc0292e1766585bc24ca582440819d6e734..939d423c92de5ab89b3aeaa91cd28f8c6ab9acce 100644 (file)
@@ -56,8 +56,8 @@ menubar {
 /* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the
    toolbar-menu is displayed, and a 16px gap when it is not. 1px is taken care
    of by the (light) outer shadow of the tab, the remaining 3/15 are these margins. */
-#toolbar-menubar:not([moz-collapsed=true]):not([autohide="true"]) ~ #TabsToolbar,
-#toolbar-menubar:not([moz-collapsed=true])[autohide="true"]:not([inactive]) ~ #TabsToolbar {
+#toolbar-menubar:not([moz-collapsed=true]):not([autohide=true]) ~ #TabsToolbar,
+#toolbar-menubar:not([moz-collapsed=true])[autohide=true]:not([inactive]) ~ #TabsToolbar {
 /*  margin-top: 3px;*/
 }
 
@@ -91,285 +91,63 @@ menubar {
   -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
   height: 1px;
 }
-#navigator-toolbox[tabsontop=false]::after,
-#main-window[disablechrome] #navigator-toolbox::after {
-  visibility: collapse;
-}
 
 #navigator-toolbox > toolbar:not(:-moz-lwtheme) {
 }
 
-#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) {
-  /* like menubar */
-  background-color: #6000CF;
-  color: #FF9F00;
-}
-#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
-  background-color: #8050B0;
-  color: #FF9F00;
-}
-#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar > .tabbrowser-tabs > .tabbrowser-tab {
-  padding-top: 3px;
-}
-
-#main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
-  visibility: hidden;
-}
-#main-window[tabsintitlebar] #titlebar-content:-moz-lwtheme {
-  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
-  visibility: visible;
-}
-
-#nav-bar[tabsontop="true"],
-#nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + toolbar,
-#nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + #customToolbars + #PersonalToolbar {
-  /* background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0)); */
-  /* Position the toolbar above the bottom of background tabs */
-  position: relative;
-  z-index: 1;
-}
-
-#personal-bookmarks {
-/*  min-height: 24px; */
-}
-
-#print-preview-toolbar:not(:-moz-lwtheme) {
-  /* -moz-appearance: toolbox; */
-}
-
-/* ::::: app menu button ::::: */
-
-/* The app menu button must appear on top of the navigator-toolbox in order
- * for click and hover mouse events to work properly for the button in the
- * restored window state. Otherwise, elements in the navigator-toolbox, like the
- * menubar can swallow these events. It will also place the button above the
- * fog on themes with Aero Glass.
- */
-#main-window[tabsintitlebar] #appmenu-button-container {
-  z-index: 1;
-}
-
-#appmenu-button {
-  background-color: #FF9F00;
-  background-clip: padding-box;
-  border-radius: 0;
-  border: none;
-  border-right: 3px solid #000000;
-  color: #000000;
-  font-weight: bold;
-  padding: 1px 1.5em;
-  margin: 0;
-}
-
-#appmenu-button:-moz-locale-dir(rtl) {
-  border-left: 3px solid #000000;
-  border-right: none;
-}
-
-#main-window[privatebrowsingmode=temporary] #appmenu-button {
-  background-color: #6000CF;
-  color: #FFCF00;
-}
-
-#appmenu-button:hover:not(:active):not([open]) {
-}
-
-#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:not(:active):not([open]) {
-}
-
-#appmenu-button:hover,
-#appmenu-button:hover:active,
-#appmenu-button[open] {
-  background-color: #FFCF00;
-  color: #000000;
-}
-
-#appmenu-button > .button-box > .button-menu-dropmarker {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
-  width: auto;
-  height: auto;
-  padding: 0;
-  margin: 0;
-  border: none;
-  background-color: transparent;
-  -moz-margin-start: .5em;
-}
-
-#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .button-menu-dropmarker {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
-}
-
-#appmenuPrimaryPane > menuitem,
-#appmenuSecondaryPane > menuitem,
-#appmenuPrimaryPane > menu {
-  padding: 2px;
-}
-
-.splitmenu-menuitem {
-  -moz-padding-start: 2px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  -moz-margin-end: 1px;
-}
-
-.splitmenu-menu {
-  padding-top: 2px;
-  padding-bottom: 2px;
-  -moz-box-pack: end;
-}
-
-.appmenu-edit-button {
-}
-
-.appmenu-edit-button[disabled="true"] {
-}
-
-#appmenuPrimaryPane {
-  -moz-border-end: 1px solid #9C9CFF;
-}
-/*
-  #appmenu-popup {
-  }
-  #appmenuPrimaryPane {
-  }
-  #appmenuSecondaryPane {
-  }
-  #appmenuSecondaryPane:-moz-locale-dir(rtl) {
+/* indent due to non-applicable aero rule */
+  #toolbar-menubar {
+    background-color: transparent !important;
   }
 
-  #appmenuSecondaryPane menupopup {
+  #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme),
+  #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme) {
+    /* like menubar */
+    background-color: #6000CF;
+    color: #FF9F00;
   }
 
-  .appmenu-menuseparator {
+  #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive,
+  #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+    background-color: #8050B0;
+    color: #FF9F00;
   }
 
-  .appmenu-edit-button:not([disabled]):hover {
+  #TabsToolbar:-moz-lwtheme {
+    /*background: linear-gradient(to top, @toolbarShadowColor@ 2px, transparent 2px);*/
   }
-*/
-#appmenuSecondaryPane-spacer {
-  min-height: 1em;
-}
-
-#appmenu-editmenu {
-  -moz-box-pack: end;
-}
 
-#appmenu_print,
-#appmenu_print_popup,
-.appmenu-edit-button,
-#appmenu-editmenu-cut,
-#appmenu-editmenu-copy,
-#appmenu-editmenu-paste,
-#appmenu-quit {
-  list-style-image: url("appmenu-icons.png");
-}
-
-#appmenu-cut,
-#appmenu-editmenu-cut {
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-#appmenu-cut:hover:not([disabled="true"]),
-#appmenu-editmenu-cut:hover:not([disabled="true"]) {
-  -moz-image-region: rect(16px 16px 32px 0);
-}
-
-#appmenu-cut[disabled="true"],
-#appmenu-editmenu-cut[disabled="true"] {
-  -moz-image-region: rect(32px 16px 48px 0);
-}
-
-#appmenu-copy,
-#appmenu-editmenu-copy {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-#appmenu-copy:hover:not([disabled="true"]),
-#appmenu-editmenu-copy:hover:not([disabled="true"]) {
-  -moz-image-region: rect(16px 32px 32px 16px);
-}
-
-#appmenu-copy[disabled="true"],
-#appmenu-editmenu-copy[disabled="true"] {
-  -moz-image-region: rect(32px 32px 48px 16px);
-}
-
-#appmenu-paste,
-#appmenu-editmenu-paste {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-#appmenu-paste:hover:not([disabled="true"]),
-#appmenu-editmenu-paste:hover:not([disabled="true"]) {
-  -moz-image-region: rect(16px 48px 32px 32px);
-}
-
-#appmenu-paste[disabled="true"],
-#appmenu-editmenu-paste[disabled="true"] {
-  -moz-image-region: rect(32px 48px 48px 32px);
-}
-
-#appmenu_print,
-#appmenu_print_popup {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-#appmenu_print:hover:not([disabled="true"]),
-#appmenu_print[open="true"],
-#appmenu_print_popup:hover:not([disabled="true"]) {
-  -moz-image-region: rect(16px 64px 32px 48px);
-}
-
-#appmenu-print[disabled="true"],
-#appmenu_print_popup[disabled="true"] {
-  -moz-image-region: rect(32px 64px 48px 48px);
-}
-
-#appmenu-quit {
-  -moz-image-region: rect(0 80px 16px 64px);
-}
-
-#appmenu-quit:hover {
-  -moz-image-region: rect(16px 80px 32px 64px);
-}
-
-#appmenu-edit-label {
-  -moz-appearance: none;
-  background: transparent;
-  font-style: italic;
-}
+  #main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
+    visibility: hidden;
+  }
 
-#appmenu_bookmarks {
-  list-style-image: url("chrome://browser/skin/places/bookmark.png");
-  -moz-image-region: rect(0px 48px 16px 32px);
-}
+  #main-window[tabsintitlebar] #titlebar-content:-moz-lwtheme {
+    -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
+    visibility: visible;
+  }
 
-#appmenu_privateBrowsing,
-#appmenu_newPrivateWindow {
-  list-style-image: url("chrome://browser/skin/Privacy-16.png");
+/* Make the menu inherit the toolbar's color. On non-compositor (Aero Basic, XP modern, classic)
+ * this is defined above. Otherwise (Aero Glass, Windows 8 inactive windows), this is hardcoded
+ * to black in browser-aero.css. */
+#main-menubar > menu:not(:-moz-lwtheme) {
+/*  color: inherit;*/
 }
 
-@media (min-resolution: 1.25dppx) {
-  #appmenu_privateBrowsing,
-  #appmenu_newPrivateWindow {
-    list-style-image: url("chrome://browser/skin/Privacy-32.png");
-  }
+#nav-bar {
+  /* Position the toolbar above the bottom of background tabs */
+  position: relative;
+  z-index: 1;
 }
 
-#appmenu_addons {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+#personal-bookmarks {
+/*  min-height: 24px; */
 }
 
-@media (min-resolution: 1.25dppx) {
-  #appmenu_addons {
-    list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-  }
+#print-preview-toolbar:not(:-moz-lwtheme) {
+  /* -moz-appearance: toolbox; */
 }
 
-#BMB_bookmarkThisPage,
-#appmenu_bookmarkThisPage {
-  list-style-image: url("chrome://browser/skin/places/bookmark.png");
-  -moz-image-region: rect(0 16px 16px 0);
+#browser-bottombox:not(:-moz-lwtheme) {
 }
 
 /* ::::: titlebar ::::: */
@@ -405,9 +183,6 @@ menubar {
   z-index: 1;
 }
 
-#main-window[sizemode="maximized"] #titlebar-buttonbox {
-}
-
 .titlebar-placeholder[type="appmenu-button"] {
   margin-left: 4px;
 }
@@ -452,6 +227,20 @@ menubar {
 
 /* ::::: bookmark buttons ::::: */
 
+toolbarbutton.bookmark-item:not(.subviewbutton),
+#personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder {
+/*  margin: 0;
+  padding: 2px 3px;*/
+}
+
+toolbarbutton.bookmark-item:not([disabled="true"]):not(.subviewbutton):hover:active,
+toolbarbutton.bookmark-item[open="true"] {
+/*  padding-top: 3px;
+  padding-bottom: 1px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 2px;*/
+}
+
 .bookmark-item > .toolbarbutton-icon,
 #personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
   width: 16px;
@@ -468,10 +257,6 @@ menubar {
   display: none;
 }
 
-#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
-  background: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") no-repeat center;
-}
-
 #bookmarks-toolbar-placeholder {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") !important;
 }
@@ -514,6 +299,17 @@ toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-p
   opacity: 0;
 }
 
+#bookmarked-notification-dropmarker-anchor {
+  z-index: -1;
+  position: relative;
+}
+
+#bookmarked-notification-dropmarker-icon {
+  width: 18px;
+  height: 18px;
+  visibility: hidden;
+}
+
 #bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification {
   background-image: url("chrome://browser/skin/places/bookmarks-notification-finish.png");
   animation: animation-bookmarkAdded 800ms;
@@ -521,6 +317,11 @@ toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-p
 }
 
 #bookmarks-menu-button[notification="finish"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  list-style-image: none !important;
+}
+
+#bookmarked-notification-dropmarker-anchor[notification="finish"] > #bookmarked-notification-dropmarker-icon {
+  visibility: visible;
   animation: animation-bookmarkPulse 300ms;
   animation-delay: 600ms;
   animation-timing-function: ease-out;
@@ -732,14 +533,6 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 216px, 36px, 198px);
 }
 
-#switch-to-metro-button[cui-areatype="toolbar"] {
-  -moz-image-region: rect(0, 648px, 18px, 630px);
-}
-
-#switch-to-metro-button[cui-areatype="toolbar"]:hover {
-  -moz-image-region: rect(18px, 648px, 36px, 630px);
-}
-
 #open-file-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 234px, 18px, 216px);
 }
@@ -959,6 +752,30 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 612px, 36px, 594px);
 }
 
+#tabview-button {
+  -moz-image-region: rect(0, 648px, 18px, 630px);
+}
+
+#tabview-button:hover {
+  -moz-image-region: rect(18px, 648px, 36px, 630px);
+}
+
+#email-link-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 666px, 18px, 648px);
+}
+
+#email-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 666px, 36px, 648px);
+}
+
+#sidebar-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 684px, 18px, 666px);
+}
+
+#sidebar-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 684px, 36px, 666px);
+}
+
 /* === END toolbarbuttons.inc.css === */
 
 /* === BEGIN menupanel.inc.css === */
@@ -1304,12 +1121,8 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled=
 
 .toolbarbutton-1,
 .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  min-width: 36px;
-  min-height: 36px;
-}
-
-.toolbarbutton-1:not([type="menu-button"]) {
-  -moz-box-orient: vertical;
+/*  min-width: 36px;
+  min-height: 36px;*/
 }
 
 .toolbarbutton-1,
@@ -1328,376 +1141,285 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled=
   -moz-padding-end: 1px;
 }
 
-/* Help SDK icons fit: */
-toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
-  width: 16px;
+#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon,
+#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker,
+#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
+#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled=true] > .toolbarbutton-icon {
 }
 
-#nav-bar toolbarbutton[sdk-button="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;
+.toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
+.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
 }
 
-/* ::::: small primary toolbar buttons ::::: */
-
-#nav-bar {
-  /* force iconsize="small" on this toolbar */
-  counter-reset: smallicons;
-}
-
-toolbar[mode="text"] .toolbarbutton-1,
-toolbar[mode="icons"] .toolbarbutton-1,
-toolbar[iconsize="small"] .toolbarbutton-1,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1,
-toolbar[mode="text"] .toolbarbutton-menubutton-button,
-toolbar[mode="icons"] .toolbarbutton-menubutton-button,
-toolbar[iconsize="small"] .toolbarbutton-menubutton-button,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  min-width: 0px;
-  min-height: 0px;
-}
-
-toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker {
-  padding-top: 4px;
-  padding-bottom: 8px;
-  -moz-padding-start: 1px;
-  -moz-padding-end: 1px;
+toolbar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:-moz-lwtheme-brighttext,
+toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-brighttext {
 }
 
-toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker,
-toolbar[iconsize="small"] .toolbarbutton-menubutton-dropmarker,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  padding-top: 0px;
-  padding-bottom: 13px;
-  -moz-padding-start: 1px;
-  -moz-padding-end: 1px;
+.toolbarbutton-1 > .toolbarbutton-icon,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
 }
 
-toolbar[mode="text"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-toolbar[mode="text"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
-  padding-top: 5px;
-  padding-bottom: 7px;
-  -moz-padding-start: 2px;
-  -moz-padding-end: 0px;
+#nav-bar .toolbarbutton-1,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 }
 
-toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
-toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
-  padding-top: 1px;
-  padding-bottom: 12px;
-  -moz-padding-start: 2px;
-  -moz-padding-end: 0px;
+#nav-bar .toolbarbutton-1:not([type=menu-button]),
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
 }
 
-toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  padding-top: 4px !important;
-  padding-bottom: 8px !important;
-  -moz-padding-start: 1px !important;
-  -moz-padding-end: 1px !important;
+#nav-bar #PanelUI-menu-button {
+/*  -moz-padding-start: 7px;
+  -moz-padding-end: 5px;*/
 }
 
-toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker[disabled="true"],
-toolbar[iconsize="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  padding-top: 0px !important;
-  padding-bottom: 13px !important;
-  -moz-padding-start: 1px !important;
-  -moz-padding-end: 1px !important;
+#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button):not(#PanelUI-menu-button) {
+/*  padding-left: 5px;
+  padding-right: 5px;*/
 }
 
-toolbar[mode="icons"] .toolbarbutton-text,
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
+#nav-bar .toolbarbutton-1 > menupopup {
+/*  margin-top: -3px;*/
 }
 
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 4px 0;
+#nav-bar .toolbarbutton-1 > menupopup.cui-widget-panel {
+/*  margin-top: -8px;*/
 }
 
-toolbar[mode="text"] .toolbarbutton-1,
-toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  -moz-box-orient: horizontal;
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+/*  -moz-padding-end: 0;*/
 }
 
-toolbar[mode="full"] .toolbarbutton-1,
-toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  min-width: 30px;
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+/*  -moz-padding-start: 0;
+  -moz-box-align: center;*/
 }
 
-#navigator-toolbox[iconsize=small] > #nav-bar {
+#nav-bar .toolbarbutton-1 > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-text,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+window:not([chromehidden~="toolbar"]) #urlbar-container > .toolbarbutton-1:-moz-any([disabled],:not([open]):not([disabled]):not(:active)) > .toolbarbutton-icon {
+/*  padding: 2px 6px;
+  border: 1px solid;
+  border-color: transparent;
+  transition-property: background-color, border-color;
+  transition-duration: 150ms;*/
 }
-
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar {
+/*
+#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-badge-container,
+#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+  padding: 3px 7px;
 }
+*/
 
-
-/* unified back/forward button */
-
-/* Australis?
-#forward-button {
-  padding: 0 !important;
+/* Help SDK icons fit: */
+toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
+  width: 16px;
 }
 
-#forward-button > menupopup {
-  margin-top: 1px !important;
+#nav-bar toolbarbutton[sdk-button="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;
 }
-*/
 
-#back-button {
-  -moz-margin-end: 0;
+#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button):not(#PanelUI-menu-button) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ {
+/*  -moz-padding-end: 17px;*/
 }
 
-#forward-button {
-  -moz-margin-start: 0;
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
 }
 
-#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
-#forward-button:-moz-locale-dir(rtl),
-#forward-button:-moz-locale-dir(rtl) > .toolbarbutton-text {
-  transform: scaleX(-1);
-}
-/*
-#nav-bar #back-button:-moz-locale-dir(ltr) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
 }
 
-#nav-bar #back-button:-moz-locale-dir(rtl),
-#nav-bar #forward-button {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-*/
-#back-button,
-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 > #back-button {
-  border-radius: 10000px;
-  width: 30px;
-  height: 30px;
-  position: relative;
-  z-index: 1;
-  margin-top: -2px;
-  margin-bottom: -2px;
-  border: none;
-  -moz-image-region: rect(54px, 20px, 74px, 0);
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
 }
 
-#back-button[open="true"],
-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 > #back-button:not([disabled="true"]):hover,
-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 > #back-button[open="true"] {
-  -moz-image-region: rect(54px, 40px, 74px, 20px);
+#nav-bar .toolbaritem-combined-buttons {
+/*  margin-left: 2px;
+  margin-right: 2px;*/
 }
 
-#back-button[disabled="true"],
-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 > #back-button[disabled="true"] {
-  -moz-image-region: rect(54px, 60px, 74px, 40px);
+#nav-bar .toolbaritem-combined-buttons > .toolbarbutton-1 {
+/*  padding-left: 0;
+  padding-right: 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 > #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover {
+#nav-bar .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before,
+#nav-bar .toolbaritem-combined-buttons > .toolbarbutton-1:-moz-any(:not(:hover):not([open]),[disabled=true]) + .toolbarbutton-1:-moz-any(:not(:hover):not([open]),[disabled=true])::before {
+/*
+  content: "";
+  display: -moz-box;
+  width: 1px;
+  height: 16px;
+  -moz-margin-end: -1px;
+*/
 }
 
-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 > #back-button:not([disabled="true"]):hover:active,
-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 > #back-button[open="true"] {
+window:not([chromehidden~="toolbar"]) #urlbar-container > .toolbarbutton-1:-moz-any([disabled],:not([open]):not([disabled]):not(:active)) > .toolbarbutton-icon {
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar[currentset*="unified-back-forward-button"],
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar:not([currentset]) {
-/*  padding-top: 3px;
-  padding-bottom: 5px; */
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text,
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-container,
+window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button:not([open]):not(:active):not([disabled]):hover > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon {
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"][tabsontop="true"] > #nav-bar[currentset*="unified-back-forward-button"],
-#navigator-toolbox[iconsize="large"][mode="icons"][tabsontop="true"] > #nav-bar:not([currentset]) {
-/*  padding-top: 5px; */
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover:active > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-text,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-container {
 }
 
-#forward-button,
-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 > #forward-button {
-  /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
-  /*clip-path: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-clip-path"); */
-  -moz-margin-start: -6px !important;
-  padding-left: 7px;
-  padding-right: 3px;
-  margin-top: 2px;
-  margin-bottom: 2px;
+#TabsToolbar .toolbarbutton-1,
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+.tabbrowser-arrowscrollbox > .scrollbutton-up,
+.tabbrowser-arrowscrollbox > .scrollbutton-down {
 }
 
-#forward-button:-moz-locale-dir(ltr),
-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 > #forward-button:-moz-locale-dir(ltr) {
-  border-top-right-radius: 11px;
-  border-bottom-right-radius: 11px;
+#TabsToolbar .toolbarbutton-1:not([disabled=true]):hover,
+#TabsToolbar .toolbarbutton-1[open],
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover,
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled=true]):hover,
+.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled=true]):hover {
 }
 
-#forward-button:-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 > #forward-button:-moz-locale-dir(rtl) {
-  border-top-left-radius: 11px;
-  border-bottom-left-radius: 11px;
-}
+/* unified back/forward button */
 
-.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
-.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://global/skin/arrow/arrow-left.gif") !important;
+#forward-button {
 }
 
-.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr):hover,
-.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl):hover {
-  list-style-image: url("chrome://global/skin/arrow/arrow-left-hover.gif") !important;
+#forward-button > menupopup {
+  margin-top: 1px !important;
 }
 
-.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr),
-.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://global/skin/arrow/arrow-right.gif") !important;
+#forward-button > .toolbarbutton-icon {
+  background-clip: padding-box !important;
+  /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
+  /*clip-path: url(chrome://browser/content/browser.xul#windows-keyhole-forward-clip-path) !important;*/
 }
 
-.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr):hover,
-.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl):hover {
-  list-style-image: url("chrome://global/skin/arrow/arrow-right.gif") !important;
+#forward-button {
+  -moz-margin-start: -6px !important;
+  padding-left: 7px;
+  padding-right: 3px;
+  margin-top: 3px;
+  margin-bottom: 3px;
+  border-radius: 0 10000px 10000px 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 > #forward-button {
-/*  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  -moz-margin-end: 0; */
+#forward-button:-moz-locale-dir(rtl) {
+  border-radius: 10000px 0 0 10000px;
 }
 
-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,
 window:not([chromehidden~="toolbar"]) #urlbar-container:not([switchingtabs]) > #forward-button {
-  transition: opacity 150ms ease-out;
+  transition: opacity @forwardTransitionLength@ 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],
 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],
-window:not([chromehidden~="toolbar"]) #urlbar-container:hover > #forward-button[disabled] {
-  background-color: transparent;
-}
-
-#downloads-button > .toolbarbutton-icon {
-  margin: 0;
-}
-
-#cut-button {
-  -moz-image-region: rect(0, 216px, 18px, 198px);
-}
-
-#cut-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 216px, 36px, 198px);
-}
-
-#cut-button[disabled="true"] {
-  -moz-image-region: rect(36px, 216px, 54px, 198px);
-}
-
-#copy-button {
-  -moz-image-region: rect(0, 234px, 18px, 216px);
-}
-
-#copy-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 234px, 36px, 216px);
-}
-
-#copy-button[disabled="true"] {
-  -moz-image-region: rect(36px, 234px, 54px, 216px);
-}
-
-#paste-button {
-  -moz-image-region: rect(0, 252px, 18px, 234px);
-}
-
-#paste-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 252px, 36px, 234px);
+window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button[occluded-by-urlbar] {
+  visibility: hidden;
 }
 
-#paste-button[disabled="true"] {
-  -moz-image-region: rect(36px, 252px, 54px, 234px);
+#back-button {
+/*  padding-top: 3px !important;
+  padding-bottom: 3px !important;
+  -moz-padding-start: 5px !important;
+  -moz-padding-end: 0 !important;*/
+  position: relative;
+  z-index: 1;
+  border-radius: 10000px;
+  width: 30px;
+  height: 30px;
+  margin-top: -2px;
+  margin-bottom: -2px;
 }
 
-#zoom-out-button {
-  -moz-image-region: rect(0, 288px, 18px, 270px);
-  -moz-margin-end: 0;
+#back-button:-moz-locale-dir(rtl) {
 }
 
-#zoom-in-button {
-  -moz-image-region: rect(0, 306px, 18px, 288px);
+#back-button > menupopup {
+  margin-top: -1px !important;
 }
 
-#zoom-out-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 288px, 36px, 270px);
+#back-button > .toolbarbutton-icon {
+  border-radius: 10000px !important;
+  background-clip: padding-box !important;
+/*  background-color: hsla(210,25%,98%,.08) !important;
+  padding: 6px !important;
+  border-color: hsla(210,4%,10%,.25) !important;*/
+  transition-property: background-color, border-color !important;
+  transition-duration: 250ms !important;
 }
 
-#zoom-out-button[disabled="true"] {
-  -moz-image-region: rect(36px, 288px, 54px, 270px);
+#back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon {
+/*  background-color: hsla(210,4%,10%,.08) !important;
+  box-shadow: none !important;*/
 }
 
-#zoom-in-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 306px, 36px, 288px);
+#back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon,
+#back-button[open="true"] > .toolbarbutton-icon {
+/*  background-color: hsla(210,4%,10%,.12) !important;
+  box-shadow: 0 1px 0 0 hsla(210,80%,20%,.1) inset !important;*/
 }
 
-#zoom-in-button[disabled="true"] {
-  -moz-image-region: rect(36px, 306px, 54px, 288px);
+#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+#forward-button:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
 }
-
-/* tabview button & menu item */
-
-#tabview-button,
-#menu_tabview {
-  list-style-image: url("chrome://browser/skin/tabview/tabview.png") !important;
+/*
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/menu-back.png") !important;
 }
 
-#tabview-button {
-  -moz-image-region: rect(0, 90px, 18px, 72px);
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr),
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
 }
 
-#tabview-button[groups="0"] {
-  -moz-image-region: rect(0, 18px, 18px, 0);
+#home-button.bookmark-item {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
-#tabview-button[groups="1"] {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > toolbaritem > :-moz-any(@nestedButtons@):-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbaritem > :-moz-any(@nestedButtons@):-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > :-moz-any(@primaryToolbarButtons@):-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > :-moz-any(@primaryToolbarButtons@):-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#home-button.bookmark-item:-moz-lwtheme-brighttext {
+  position: relative;
+  z-index: 1;
+  list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
 }
 
-#tabview-button[groups="2"] {
-  -moz-image-region: rect(0, 54px, 18px, 36px);
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > #sync-button[status="active"]:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > #sync-button[status="active"]:-moz-system-metric(windows-classic):not(:-moz-lwtheme) {
+  list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png");
 }
+*/
 
-#tabview-button[groups="3"] {
-  -moz-image-region: rect(0, 72px, 18px, 54px);
+#downloads-button > .toolbarbutton-icon {
+  margin: 0;
 }
 
+/* tabview button & menu item */
+
 #menu_tabview {
+  list-style-image: url("chrome://browser/skin/tabview/tabview.png");
   -moz-image-region: rect(1px, 89px, 17px, 73px);
 }
 
@@ -1726,7 +1448,8 @@ window:not([chromehidden~="toolbar"]) #urlbar-container:hover > #forward-button[
 #minimize-button,
 #restore-button,
 #close-button {
-/*  padding: 0; */
+/*  list-style-image: url("chrome://global/skin/icons/windowControls.png");
+  padding: 0; */
 }
 
 #minimize-button {
@@ -1775,9 +1498,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-container:hover > #forward-button[
   color: black; */
 }
 
-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-lwtheme:hover:not([focused]):not([readonly]),
+.searchbar-textbox:-moz-lwtheme:hover:not([focused]) {
+/*  background-color: rgba(255,255,255,.9);*/
+}
+
+#urlbar:-moz-lwtheme[focused]:not([readonly]),
+.searchbar-textbox:-moz-lwtheme[focused] {
+/*  background-color: white;*/
+}
+
 window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper {
   padding-left: 22px;
   -moz-margin-start: -22px;
@@ -1785,70 +1515,47 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper {
   pointer-events: none;
 }
 
-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,
 window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar {
 /*  -moz-border-start: none;
   margin-left: 0; */
   pointer-events: all;
 }
 
-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,
 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),
 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),
 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,
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper {
+/*  clip-path: url("chrome://browser/content/browser.xul#windows-urlbar-back-button-clip-path");*/
+}
+
 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,
 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,
 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;
 }
 
-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:-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),
 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 */
+  /* let windows-urlbar-back-button-mask clip the urlbar's right side for RTL */
   transform: scaleX(-1);
 }
 
@@ -1857,11 +1564,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   color: #E7ADE7;
 }
 
-#urlbar:-moz-lwtheme[focused="true"],
-.searchbar-textbox:-moz-lwtheme[focused="true"] {
-/*  background-color: white; */
-}
-
 #urlbar-container {
   -moz-box-orient: horizontal;
   -moz-box-align: stretch;
@@ -1950,9 +1652,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   border-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 > #identity-box,
 window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar > #identity-box {
 /*   border-radius: 0; */
   -moz-padding-start: 2px;
@@ -1960,50 +1659,30 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #url
   -moz-margin-end: 1px;
 }
 
-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),
 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),
 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,
 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),
 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),
 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 */
@@ -2145,6 +1824,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:ho
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar > #identity-box > #page-proxy-favicon {
+/*  -moz-margin-end: 1px;*/
+}
+
 #identity-box:hover > #page-proxy-favicon {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
@@ -2193,6 +1876,11 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:ho
   height: 16px;
 }
 
+richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-bookmark,
+.autocomplete-treebody::-moz-tree-image(selected, current, bookmark, treecolAutoCompleteImage) {
+/*  -moz-image-region: rect(0px 48px 16px 32px);*/
+}
+
 .ac-result-type-keyword,
 .autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
   list-style-image: url("chrome://global/skin/icons/Search-glass.png");
@@ -2209,15 +1897,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:ho
 }
 
 .ac-comment {
-  font-size: 1.15em;
+  font-size: 1.06em;
 }
 
 .ac-extra > .ac-comment {
-  font-size: inherit;
+  font-size: 1em;
 }
 
 .ac-url-text,
 .ac-action-text {
+  font-size: 1em;
   color: #9C9CFF;
 }
 
@@ -2254,21 +1943,15 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 /* combined go/reload/stop button in location bar */
 
-#go-button,
 #urlbar > toolbarbutton {
-  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  /* margin: -2px; */
   -moz-margin-start: 0;
   padding: 0 2px;
   background-origin: border-box;
   border: none;
+  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
   -moz-border-start: 1px solid #9C9CFF;
 }
 
-#go-button {
-  padding: 0 3px;
-}
-
 #urlbar:-moz-locale-dir(ltr) > toolbarbutton {
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
@@ -2285,33 +1968,32 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-padding-start: 3px;
 }
 
-#urlbar > toolbarbutton:not([disabled]):active:hover {
+#urlbar-reload-button {
+  -moz-image-region: rect(0px, 14px, 14px, 0px);
 }
 
-#urlbar-go-button {
-  -moz-image-region: rect(0, 42px, 14px, 28px);
+#urlbar-reload-button[disabled] {
+  -moz-image-region: rect(28px, 14px, 42px, 0px);
 }
 
-#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
-#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  transform: scaleX(-1);
+#urlbar-reload-button:not([disabled]):hover {
+  -moz-image-region: rect(14px, 14px, 28px, 0px);
 }
 
-#urlbar-go-button:hover,
-#go-button:hover {
-  -moz-image-region: rect(14px, 42px, 28px, 28px);
+#urlbar-reload-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
 }
 
-#urlbar-reload-button {
-  -moz-image-region: rect(0px, 14px, 14px, 0px);
+#urlbar-go-button {
+  -moz-image-region: rect(0, 42px, 14px, 28px);
 }
 
-#urlbar-reload-button[disabled] {
-  -moz-image-region: rect(28px, 14px, 42px, 0px);
+#urlbar-go-button:hover,
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
 }
 
-#urlbar-reload-button:not([disabled]):hover {
-  -moz-image-region: rect(14px, 14px, 28px, 0px);
+#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
 }
 
 #urlbar-stop-button {
@@ -2343,11 +2025,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   height: 150px;
 }
 
-#social-share-button {
-  list-style-image: url("chrome://browser/skin/social/share-button.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
 .social-share-toolbar {
   border-right: 1px solid #9C9CFF;
 /*  background-color: #000000; */
@@ -2451,35 +2128,40 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-/* star button */
+/* bookmarks menu-button */
 
-/* #urlbar-container only directly contains the urlbar pre-Australis, don't assign an icon in Australis */
-#urlbar-container > #urlbar > #urlbar-icons > #star-button {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark.png");
-  -moz-image-region: rect(16px 16px 32px 0px);
+#bookmarks-menu-button.bookmark-item {
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-#urlbar-container > #urlbar > #urlbar-icons > #star-button:hover {
-  -moz-image-region: rect(16px 32px 32px 16px);
+#bookmarks-menu-button.bookmark-item[starred] {
+  -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-#urlbar-container > #urlbar > #urlbar-icons > #star-button:hover:active {
-  -moz-image-region: rect(16px 48px 32px 32px);
+#bookmarks-menu-button.bookmark-item > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+  -moz-margin-start: 5px;
 }
 
-#urlbar-container > #urlbar > #urlbar-icons > #star-button[starred="true"] {
-  -moz-image-region: rect(0px 16px 16px 0px);
+#bookmarks-menu-button[cui-areatype="toolbar"]:not(.bookmark-item):not([overflowedItem=true]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  padding-top: 2px;
+  padding-bottom: 2px;
 }
 
-#urlbar-container > #urlbar > #urlbar-icons > #star-button[starred="true"]:hover {
-  -moz-image-region: rect(0px 32px 16px 16px);
+#BMB_bookmarksPopup[side="top"],
+#BMB_bookmarksPopup[side="bottom"] {
+  margin-left: -20px;
+  margin-right: -20px;
 }
 
-#urlbar-container > #urlbar > #urlbar-icons > #star-button[starred="true"]:hover:active {
-  -moz-image-region: rect(0px 48px 16px 32px);
+#BMB_bookmarksPopup[side="left"],
+#BMB_bookmarksPopup[side="right"] {
+  margin-top: -20px;
+  margin-bottom: -20px;
 }
 
 /* bookmarking panel */
+
 #editBookmarkPanelStarIcon {
   list-style-image: url("chrome://browser/skin/places/starred48.png");
   width: 48px;
@@ -2554,34 +2236,9 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 */
 }
 
-/* ::::: throbber ::::: */
-
-#navigator-throbber {
-  width: 16px;
-  min-height: 16px;
-  margin: 0 3px;
-}
-
-#navigator-throbber[busy="true"] {
-  list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png");
-}
-
-#navigator-throbber,
-#wrapper-navigator-throbber > #navigator-throbber {
-  list-style-image: url("chrome://communicator/skin/brand/throbber16-single.png");
-}
-
 /* Tabstrip */
 
-/* Remove selector when Australis lands - this makes it only apply pre-Australis as iconsize only exists there */
-#navigator-toolbox[iconsize] > #TabsToolbar {
-  min-height: 0;
-  padding: 0;
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
-}
-
-/* Remove selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */
-#navigator-toolbox:not([iconsize]) > #TabsToolbar {
+#TabsToolbar {
   min-height: 0;
   padding: 0;
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar");
@@ -2596,6 +2253,13 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   border-bottom: 1px solid #008484;
 }
 
+#main-window:not([customizing]) #TabsToolbar:not(:-moz-lwtheme) {
+ }
+
+#main-window[tabsintitlebar] #TabsToolbar {
+  background-color: transparent;
+}
+
 /* === BEGIN tabs.inc.css === */
 
 .tabbrowser-tab,
@@ -2627,42 +2291,31 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   text-decoration: underline;
 }
 
-/* Selected tab */
-
-.tabbrowser-tab[selected="true"] {
+/* The selected tab should appear above adjacent tabs, .tabs-newtab-button and the highlight of #nav-bar */
+.tabbrowser-tab[selected=true] {
+/*  position: relative;
+  z-index: 2;*/
 }
 
-/* End selected tab */
-
-/* Pinned tabs */
-
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
-  background-color: #E7ADE7;
-}
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
-  background-color: #3333FF;
-  color: #000000;
+.tab-background-middle {
 }
 
-/* New tab button */
-
-.tabs-newtab-button {
-  width: 28px;
+.tab-content {
 }
 
-#TabsToolbar > #new-tab-button {
-  width: 26px;
+.tab-throbber,
+.tab-icon-image,
+.tab-close-button {
 }
 
-/* === END tabs.inc.css === */
-
 .tab-throbber,
 .tab-icon-image {
-  width: 16px;
   height: 16px;
+  width: 16px;
+}
+
+.tab-icon-image {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-  -moz-image-region: auto;
-  -moz-margin-end: 3px;
 }
 
 .tab-throbber {
@@ -2673,17 +2326,98 @@ 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;
   -moz-margin-end: 2px;
 }
 
+.tab-label {
+}
+
+.tab-close-button {
+  margin-top: 1px;
+  padding: 0;
+}
+
+.tab-background,
+.tabs-newtab-button {
+  /* overlap the tab curves */
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
+}
+
+.tab-background-start[selected=true]::after,
+.tab-background-start[selected=true]::before,
+.tab-background-start,
+.tab-background-end,
+.tab-background-end[selected=true]::after,
+.tab-background-end[selected=true]::before {
+}
+
+.tabbrowser-tab:not([selected=true]),
+.tabbrowser-tab:-moz-lwtheme {
+}
+
 /* tabbrowser-tab focus ring */
-.tabbrowser-tab:focus > .tab-stack {
+.tabbrowser-tab:focus {
   outline: 1px dotted;
 }
 
+/* Selected tab */
+
+.tabbrowser-tab[selected="true"] {
+}
+
+/* End selected tab */
+
+/* Background tabs */
+
+/* Decrease the height of the hoverable region of background tabs whenever the tabs are at the top
+   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]:not([sizemode="maximized"]):not([inFullscreen]) #toolbar-menubar:-moz-any([autohide="true"][inactive], :not([autohide])) + #TabsToolbar .tab-background-middle:not([selected=true]) {
+}
+
+/* End background tabs */
+
+/* Tab pointer-events */
+/*
+.tabbrowser-tab {
+  pointer-events: none;
+}
+
+.tab-background-middle,
+.tabs-newtab-button,
+.tab-close-button {
+  pointer-events: auto;
+}
+*/
+/* Pinned tabs */
+
+.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
+  background-color: #E7ADE7;
+}
+
+.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
+  background-color: #3333FF;
+  color: #000000;
+}
+
+/* New tab button */
+
+.tabs-newtab-button {
+  width: 28px;
+}
+
+/* === END tabs.inc.css === */
+
 /* Tab DnD indicator */
 .tab-drop-indicator {
   list-style-image: url("chrome://browser/skin/tabbrowser/tabDragIndicator.png");
@@ -2692,9 +2426,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 /* Tab close button */
 .tab-close-button {
-  border: none;
-  padding: 0px;
-  margin-top: 1px;
   list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
 
@@ -2715,12 +2446,39 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   margin: 0;
   padding-top: 0;
   padding-bottom: 0;
+  background-origin: border-box;
+}
+
+#main-window[tabsintitlebar]:not([inFullscreen]) .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-lwtheme-brighttext,
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-lwtheme-brighttext {
+ }
+.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled],
+.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] {
+ }
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) {
+/*  transform: scaleX(-1);*/
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-down {
+  transition: 1s background-color ease-out;
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] {
   background-color: #008484;
 }
 
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]),
+.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]) {
+/*  border-width: 0 2px 0 0;
+  border-style: solid;
+  border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 fill;*/
+}
+
 .tabs-newtab-button > .toolbarbutton-icon {
   margin-top: -1px;
   margin-bottom: -1px;
@@ -2734,21 +2492,27 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   -moz-image-region: rect(0, 16px, 18px, 0);
 }
 
-/* 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,
 #TabsToolbar > #new-tab-button:hover {
   -moz-image-region: rect(0, 32px, 18px, 16px);
 }
 
-#alltabs-button {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+#main-window[tabsintitlebar]:not([inFullscreen]) .tabs-newtab-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar > #new-tab-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+.tabs-newtab-button:-moz-lwtheme-brighttext,
+#TabsToolbar > #new-tab-button:-moz-lwtheme-brighttext,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-lwtheme-brighttext {
 }
 
-#alltabs-button > .toolbarbutton-menu-dropmarker {
-  display: none;
+#TabsToolbar > #new-tab-button {
+  width: 26px;
+}
+
+#alltabs-button {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
 }
 
 #alltabs-button:hover,
@@ -2757,6 +2521,18 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
 }
 
+#main-window[tabsintitlebar]:not([inFullscreen]) #alltabs-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#alltabs-button:-moz-lwtheme-brighttext {
+}
+
+#alltabs-button > .toolbarbutton-icon {
+/*  margin: 0 2px;*/
+}
+
+#alltabs-button > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
 /* All tabs menupopup */
 .alltabs-item > .menu-iconic-left > .menu-iconic-icon {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
@@ -2817,10 +2593,6 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   margin: 0;
 }
 
-toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
-  display: -moz-box; /* display chevron icon in text mode */
-}
-
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading.gif");
   -moz-margin-end: 4px;
@@ -3067,9 +2839,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   border-right-width: 8px;
 }
 
-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 {
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar > #notification-popup-box {
 /*  padding-left: 5px; */
 }
 
@@ -3192,14 +2962,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   margin: 0px;
 }
 
-#download-monitor {
-  list-style-image: url("chrome://browser/skin/FxToolbar.png");
-  -moz-image-region: rect(0, 108px, 18px, 90px);
-}
-
 /* Bookmarks roots menu-items */
-#appmenu_subscribeToPage:not([disabled]),
-#appmenu_subscribeToPageMenu,
 #subscribeToPageMenuitem:not([disabled]),
 #subscribeToPageMenupopup,
 #BMB_subscribeToPageMenuitem:not([disabled]),
@@ -3208,14 +2971,14 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 }
 
 #bookmarksToolbarFolderMenu,
-#appmenu_bookmarksToolbar,
-#BMB_bookmarksToolbar {
+#BMB_bookmarksToolbar,
+#panelMenu_bookmarksToolbar {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png");
   -moz-image-region: auto;
 }
 
-#appmenu_unsortedBookmarks,
-#BMB_unsortedBookmarks {
+#BMB_unsortedBookmarks,
+#panelMenu_unsortedBookmarks {
   list-style-image: url("chrome://communicator/skin/bookmarks/unsortedBookmarks.png");
   -moz-image-region: auto;
 }
@@ -3280,59 +3043,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   margin-top: .5em;
 }
 
-/* Add-on bar */
-
-#addon-bar {
-  min-height: 20px;
-  border-top: 3px solid #000000;
-  border-bottom-width: 0;
-}
-
-#addon-bar .toolbar-holder {
-  background-color: #8050B0;
-  color: #FFCF00;
-}
-
-#addon-bar .toolbar-holder {
-  background-color: #8050B0;
-  color: #FFCF00;
-}
-
-#addon-bar .toolbar-startcap,
-#addon-bar .toolbar-endcap{
-  background-color: #6000CF;
-}
-
-#status-bar {
-  -moz-binding: url("chrome://global/content/bindings/general.xml#statusbar");
-  margin-top: .3em;
-  border-width: 0;
-}
-
-#addon-bar[customizing] > #status-bar {
-  opacity: .5;
-/*  background-image: -moz-repeating-linear-gradient(-45deg,
-                                                   rgba(255,255,255,.3), rgba(255,255,255,.3) 5px,
-                                                   rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);*/
-}
-
-/* Remove all borders from statusbarpanel children of
-   the statusbar.
-#status-bar > statusbarpanel {
-  border-width: 0;
-} */
-
-#addonbar-closebutton {
-  border: none;
-  padding: 3px 5px;
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
-}
-
-#addonbar-closebutton:hover,
-#addonbar-closebutton:hover:active {
-  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
-}
-
 /* Status panel */
 
 .statuspanel-label {
@@ -3872,7 +3582,7 @@ html|*#gcli-output-frame {
   position: relative;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {
+#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {
   padding: 2px 2px;
 }
 
@@ -3903,7 +3613,7 @@ html|*#gcli-output-frame {
   right: 0;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
+#nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
   top: 1px;
   right: 1px;
 }
@@ -3913,7 +3623,7 @@ html|*#gcli-output-frame {
   right: auto;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+#nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
   left: 1px;
   right: auto;
 }
@@ -4213,6 +3923,36 @@ window > chatbox {
 
 /* === END chat.inc.css === */
 
+.chat-titlebar {
+/*  background-color: #c4cfde; */
+}
+
+.chat-titlebar[selected] {
+/*  background-color: #dae3f0; */
+}
+
+.chatbar-button {
+  -moz-appearance: none;
+/*  background-color: #c4cfde; */
+}
+
+.chatbar-button > .toolbarbutton-icon {
+/*  -moz-margin-end: 0; */
+}
+
+.chatbar-button:hover,
+.chatbar-button[open="true"] {
+/*  background-color: #dae3f0; */
+}
+
+.chatbar-button[activity]:not([open="true"]) {
+}
+
+chatbox {
+/*  border-top-left-radius: 2.5px;
+  border-top-right-radius: 2.5px; */
+}
+
 /* === BEGIN plugin-doorhanger.inc.css === */
 
 /**
@@ -4497,9 +4237,8 @@ toolbarpaletteitem[place="toolbar"] {
   margin-top: 20px;
 }
 
-/* Remove |:-moz-any(#customization-palette, #panelUI-contents)| selector when Australis lands - this makes it only apply post-Australis as those elements only exist there */
 #wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton,
-:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton {
+#wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton {
   margin-left: 0;
   margin-right: 0;
   max-width: 24px;
@@ -4518,8 +4257,8 @@ toolbarpaletteitem[place="toolbar"] {
   opacity: 1; /* To ensure these buttons always look enabled in customize mode */
 }
 
-:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button,
-:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button + separator {
+#wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button,
+#wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button + separator {
   display: none;
 }
 
@@ -4612,6 +4351,16 @@ toolbarpaletteitem[place="toolbar"] {
 
 /* === END customizeTip.inc.css === */
 
+/**
+ * This next rule is a hack to disable subpixel anti-aliasing on all
+ * labels during the customize mode transition. Subpixel anti-aliasing
+ * on Windows with Direct2D layers acceleration is particularly slow to
+ * paint, so this hack is how we sidestep that performance bottleneck.
+ */
+#main-window:-moz-any([customize-entering],[customize-exiting]) label {
+  transform: perspective(0.01px);
+}
+
 #main-window[customize-entered] {
   background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
   background-attachment: fixed;
@@ -4665,13 +4414,9 @@ 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 {
@@ -4689,3 +4434,7 @@ html|div#UITourHighlight[active] {
 }
 
 /* === END UITour.inc.css === */
+
+#UITourTooltipButtons {
+  margin: 24px -4px -4px;
+}
diff --git a/LCARStrek/customizemode.inc.css b/LCARStrek/customizemode.inc.css
deleted file mode 100644 (file)
index 8f09dc9..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-
-/* Customization mode */
-#nav-bar[customize-entered] > #nav-bar-customization-target {
-  margin: 1px 3px;
-}
-
-#nav-bar[customize-entered] > #nav-bar-customization-target,
-#PanelUI-contents > .panel-customization-placeholder {
-  outline: 1px dashed transparent;
-}
-
-#main-window[customizing-movingItem] #nav-bar-customization-target,
-#main-window[customizing-movingItem] .panel-customization-placeholder {
-  outline-color: #9C9CFF;
-}
-
-#PanelUI-contents > .panel-customization-placeholder {
-  cursor: auto;
-  outline-offset: -5px;
-}
-
-#main-window[customize-entered] .customization-target {
-  min-width: 100px;
-  padding-left: 10px;
-  padding-right: 10px;
-}
-
-#customization-container {
-  background-color: #000000;
-}
-
-#customization-palette-container {
-  padding: 15px;
-}
-
-#customization-header {
-  font-size: 1.5em;
-  line-height: 1.5em;
-  color: #9C9CFF;
-  font-weight: lighter;
-  margin-bottom: 1em;
-}
-
-#customization-panel-container {
-  padding: 10px 10px 0px;
-  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
-  background-position: left top;
-  background-repeat: repeat;
-  background-size: auto;
-  background-attachment: fixed;
-}
-
-toolbarpaletteitem {
-  transition: background-color, border-color, box-shadow, border-width;
-  transition-duration: 10ms, 10ms, 10ms, 250ms;
-  transition-timing-function: linear, linear, linear, ease-in-out;
-}
-
-toolbarpaletteitem[mousedown] {
-  outline: 1px solid #008484;
-  cursor: -moz-grabbing;
-  opacity: 0.8;
-}
-
-.panel-customization-placeholder,
-toolbarpaletteitem[place="palette"],
-toolbarpaletteitem[place="panel"] {
-  transition: background-color, border-color, box-shadow, transform;
-  transition-duration: 10ms, 10ms, 10ms, 250ms;
-  transition-timing-function: linear, linear, linear, ease-in-out;
-}
-
-toolbarpaletteitem[notransition][place="palette"],
-toolbarpaletteitem[notransition][place="panel"] {
-  transition: background-color, border-color, box-shadow;
-  transition-duration: 10ms, 10ms, 10ms;
-  transition-timing-function: linear, linear, linear;
-}
-
-toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon {
-  transition: transform 50ms ease-in-out;
-}
-
-toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon {
-  transform: scale(1.1);
-}
-
-/* Override the toolkit styling for items being dragged over. */
-toolbarpaletteitem[place="toolbar"] {
-  border-left-width: 0;
-  border-right-width: 0;
-  margin-right: 0;
-  margin-left: 0;
-}
-
-#customization-palette:not([hidden]) {
-  margin-bottom: 25px;
-}
-
-/* Remove |:-moz-any(#customization-palette, #panelUI-contents)| selector when Australis lands - this makes it only apply post-Australis as those elements only exist there */
-#customization-palette > #wrapper-edit-controls,
-:-moz-any(#customization-palette, #panelUI-contents) > #customization-palette > #wrapper-zoom-controls {
-  width: 225px;
-}
-
-#wrapper-edit-controls[place="palette"] > .toolbarpaletteitem-box,
-#wrapper-zoom-controls[place="palette"] > .toolbarpaletteitem-box {
-  width: 225px;
-  max-width: 225px;
-}
-
-#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton,
-#wrapper-edit-controls[place="palette"] > #edit-controls > separator,
-:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton,
-:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > separator {
-  margin-top: 24px;
-}
-
-#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton,
-:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton {
-  margin-left: 0;
-  margin-right: 0;
-  max-width: 70px;
-  min-width: 70px;
-  max-height: 24px;
-  height: 24px;
-}
-
-#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton > .toolbarbutton-text,
-:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button > .toolbarbutton-text {
-  display: inline;
-}
-
-#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton > .toolbarbutton-icon,
-:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton > .toolbarbutton-icon {
-  margin: 0;
-  -moz-margin-start: 5px;
-}
-
-#customization-palette > toolbarpaletteitem > label {
-  text-align: center;
-  margin-left: 0;
-  margin-right: 0;
-}
-