X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=0112c5de388efef70db8a88c914d9cde88a5e2f4;hp=7913c484c723746c5535f29f37c67ab7311accc8;hb=2a5b7882f0136ca4ce1e4500862719f1ea30a2e0;hpb=8d7ef0d90b767f02a75010e15f34fc004beb7c7c

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 7913c484..0112c5de 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -1,49 +1,6 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
- *   Jason Kersey (kerz@netscape.com)
- *   Pierre Chanial (chanial@noos.fr)
- *   Dean Tessman (dean_tessman@hotmail.com)
- *   Blake Ross (blake@cs.stanford.edu)
- *   Pamela Greene (pamg.bugs@gmail.com)
- *   Dão Gottwald (dao@mozilla.com)
- *   Jim Mathies (jmathies@mozilla.com)
- *   Drew Willcoxon (adw@mozilla.com)
- *   Paul Rouget (paul@mozilla.com)
- *   Rob Campbell (rcampbell@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url("chrome://global/skin/");
 
@@ -117,9 +74,9 @@ menubar {
   visibility: visible;
 }
 
-#navigator-toolbox[tabsontop="true"] > #nav-bar,
-#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar,
-#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar {
+#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: -moz-linear-gradient(@toolbarHighlight@, rgba(255,255,255,0)); */
 }
 
@@ -480,11 +437,11 @@ menuitem.bookmark-item {
 
 .bookmark-item[container][livemark] .bookmark-item {
   list-style-image: url("chrome://communicator/skin/bookmarks/livemark-item.png");
-  -moz-image-region: auto;
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
 .bookmark-item[container][livemark] .bookmark-item[visited] {
-  /* nothing yet */
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
 .bookmark-item[container][query] {
@@ -709,7 +666,9 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   border-bottom-left-radius: 0;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #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;
@@ -721,20 +680,32 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-image-region: rect(54px, 20px, 74px, 0);
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):hover,
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #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);
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #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);
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):not([open="true"]):not(:active):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:not([disabled="true"]):not([open="true"]):not(:active):hover {
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):hover:active,
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #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: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"] {
 }
 
 #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar[currentset*="unified-back-forward-button"],
@@ -748,9 +719,11 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 /*  padding-top: 5px; */
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #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 */
-  mask: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-mask");
+  /*clip-path: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-clip-path"); */
   -moz-margin-start: -6px !important;
   padding-left: 7px;
   padding-right: 3px;
@@ -758,21 +731,20 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   margin-bottom: 2px;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #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;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #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;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:not([disabled="true"]):not(:active):hover {
-  /*mask: url(keyhole-forward-mask.svg#mask-hover);*/
-  mask: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-mask-hover");
-}
-
 .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;
@@ -1075,27 +1047,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(0, 306px, 18px, 288px);
 }
 
-#nav-bar #zoom-out-button {
-  -moz-margin-end: 0;
-}
-
-#nav-bar #zoom-in-button {
-  -moz-border-start: none;
-  -moz-margin-start: 0;
-}
-
-#nav-bar #zoom-out-button:-moz-locale-dir(ltr),
-#nav-bar #zoom-in-button:-moz-locale-dir(rtl) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-#nav-bar #zoom-out-button:-moz-locale-dir(rtl),
-#nav-bar #zoom-in-button:-moz-locale-dir(ltr) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
 #zoom-out-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 288px, 36px, 270px);
 }
@@ -1234,12 +1185,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   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 {
-  mask: url("chrome://browser/content/browser.xul#winstripe-urlbar-back-button-mask");
-}
-
 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 {
@@ -1289,6 +1234,10 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   -moz-box-align: stretch;
 }
 
+.urlbar-input-box {
+  -moz-margin-start: 0;
+}
+
 #urlbar-icons {
   -moz-box-align: center;
 }
@@ -1335,14 +1284,13 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   -moz-margin-end: 3px;
   margin-top: 0;
   margin-bottom: 0;
+  -moz-margin-start: 0;
   color: #8050B0;
 }
 
 /* identity box */
 
 #identity-box {
-  background-color: #000000;
-  color: #FF9F00;
   border-radius: 2px;
 }
 
@@ -1355,19 +1303,22 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
     #unified-back-forward-button + #urlbar-container > #urlbar > #identity-box {
 /*   border-radius: 0; */
+  -moz-padding-start: 2px;
+  -moz-padding-end: 2px;
+  -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) {
-  padding-left: 5px;
+  padding-left: 2px;
   -moz-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) {
-  padding-right: 5px;
+  padding-right: 2px;
   -moz-transition: padding-right;
 }
 
@@ -1382,35 +1333,34 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
     :-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) {
   /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
-  padding-left: 5.01px;
+  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) {
   /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
-  padding-right: 5.01px;
+  padding-right: 2.01px;
 }
 
-#identity-box:hover {
-  background-color: #9C9CFF;
-  color: #000000;
+#identity-box.verifiedIdentity {
+  color: #008484;
+  -moz-border-end: 1px solid #008484;
+  -moz-margin-end: 3px;
 }
 
-#identity-box[open="true"],
-#identity-box:hover:active {
-  background-color: #FF9F00;
-  color: #000000;
+#identity-box.verifiedIdentity:-moz-locale-dir(ltr) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
-#identity-box.verifiedDomain {
-  background-color: #FFCF00;
-  color: #000000;
+#identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
 }
 
-#identity-box.verifiedIdentity {
-  background-color: #008484;
-  color: #000000;
+#identity-box.verifiedIdentity:not(:-moz-lwtheme) {
+  background-color: #000000;
 }
 
 #identity-box:-moz-focusring {
@@ -1451,11 +1401,46 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 #page-proxy-favicon {
   width: 16px;
   height: 16px;
-  /* margin: 1px 4px; */
+  list-style-image: url("chrome://browser/skin/identity-icons-generic.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-#page-proxy-favicon:not([src]) {
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+.verifiedDomain > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon,
+.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-icons-https.png");
+}
+
+.verifiedIdentity > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon,
+.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-icons-https-ev.png");
+}
+
+#identity-box:hover > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon,
+#identity-box:hover > #page-proxy-favicon {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+#identity-box:hover:active > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon,
+#identity-box[open=true] > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon,
+#identity-box:hover:active > #page-proxy-favicon,
+#identity-box[open=true] > #page-proxy-favicon {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+#identity-box:hover {
+  background-color: #FFCF00;
+}
+
+#identity-box:hover:active,
+#identity-box[open=true] {
+  background-color: #FF9F00;
+}
+
+#identity-box.verifiedIdentity:hover,
+#identity-box.verifiedIdentity:hover:active,
+#identity-box.verifiedIdentity[open=true] {
+  background-color: #008484;
+  color: #000000;
 }
 
 #page-proxy-favicon[pageproxystate="invalid"] {
@@ -2116,6 +2101,12 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   height: 32px;
 }
 
+.popup-notification-icon[popupid="click-to-play-plugins"] {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+  width: 32px;
+  height: 32px;
+}
+
 .addon-progress-description {
   width: 350px;
   max-width: 350px;
@@ -2217,6 +2208,10 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://browser/skin/webapps-16.png");
 }
 
+#plugins-notification-icon {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+}
+
 #identity-popup-container {
   min-width: 280px;
 }
@@ -2508,12 +2503,22 @@ highlighter-veil-transparentbox {
 
 #inspector-inspect-toolbutton {
   list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
+  -moz-image-region: rect(0 16px 16px 0);
 }
 
-#inspector-inspect-toolbutton[checked],
+#inspector-inspect-toolbutton[checked=true],
 #inspector-inspect-toolbutton:hover {
-  -moz-image-region: rect(0px 32px 16px 16px);
+  -moz-image-region: rect(0 32px 16px 16px);
+}
+
+#inspector-option-toolbarbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspector-option-icon.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+#inspector-option-toolbarbutton[open],
+#inspector-option-toolbarbutton:hover {
+  -moz-image-region: rect(0 32px 16px 16px);
 }
 
 #inspector-toolbar {
@@ -2538,8 +2543,22 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
 
 /* Highlighter - Node Infobar */
 
+#highlighter-nodeinfobar {
+  color: #FF9F00;
+  border: 1px solid rgba(156, 156, 255, .5);
+  border-radius: 3px;
+  background-color: #000000;
+  background-clip: padding-box;
+}
+
 /* Highlighter - Node Infobar - text */
 
+#highlighter-nodeinfobar-text {
+  /* 100% - size of the buttons and margins */
+  max-width: -moz-calc(100% - 2 * (26px + 6px));
+  padding-bottom: 1px;
+}
+
 html|*#highlighter-nodeinfobar-tagname {
   color: #FFCF00;
 }
@@ -2548,16 +2567,47 @@ html|*#highlighter-nodeinfobar-id {
   color: #9C9CFF;
 }
 
-/* Highlighter - Node Infobar - box & arrow */
-.highlighter-nodeinfobar {
+html|*#highlighter-nodeinfobar-pseudo-classes {
   color: #FF9F00;
-  border: 1px solid rgba(156, 156, 255, .5);
-  border-radius: 3px;
-  padding: 8px 16px;
-  background-color: #000000;
-  background-clip: padding-box;
 }
 
+/* Highlighter - Node Infobar - buttons */
+
+.highlighter-nodeinfobar-button {
+  padding: 0;
+  width: 26px;
+  min-height: 26px;
+}
+
+#highlighter-nodeinfobar-inspectbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+  -moz-margin-start: 0px;
+  -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*/ {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#highlighter-nodeinfobar-menu {
+}
+
+#highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
+}
+
+#highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
+  -moz-box-align: center;
+  -moz-margin-start: -1px;
+}
+
+/* Highlighter - Node Infobar - box & arrow */
+
 .highlighter-nodeinfobar-arrow {
   width: 14px;
   height: 14px;
@@ -2616,11 +2666,64 @@ html|*#highlighter-nodeinfobar-id {
 /* Highlighter toolbar - breadcrumbs */
 
 #inspector-breadcrumbs {
-  padding: 0 6px;
+  -moz-margin-start: 2px;
 }
 
 #inspector-breadcrumbs > .scrollbutton-up,
 #inspector-breadcrumbs > .scrollbutton-down {
+  min-height: 25px;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up {
+  -moz-margin-end: 1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-down {
+  -moz-margin-end: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
+  /* margin: 0 5px; */
+}
+
+#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:-moz-locale-dir(ltr) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:-moz-locale-dir(rtl) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
+/*  -moz-transform: scaleX(-1); */
 }
 
 .inspector-breadcrumbs-button {
@@ -2628,7 +2731,7 @@ html|*#highlighter-nodeinfobar-id {
   border-width: 2px 13px !important;
   outline: none;
   /* color: hsl(210,30%,85%); */
-  max-width: 85px;
+  width: 85px; /* Can't use max-width. See bug 723132 */
   /* The content of the button can be larger than the button */
   overflow: hidden;
   min-height: 25px;
@@ -2636,6 +2739,10 @@ html|*#highlighter-nodeinfobar-id {
   padding: 0 9px;
 }
 
+.inspector-breadcrumbs-button:-moz-focusring > label {
+  border-bottom: 1px dotted #008484;
+}
+
 .inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
   /*color: hsl(208,100%,60%); */
 }
@@ -2655,7 +2762,8 @@ html|*#highlighter-nodeinfobar-id {
 
 /* fit height of other buttons to breadcrumbs */
 #inspector-toolbar .devtools-toolbarbutton,
-#highlighter-closebutton {
+#highlighter-closebutton,
+#inspector-option-toolbarbutton {
   min-height: 25px;
 }
 
@@ -2666,7 +2774,6 @@ html|*#highlighter-nodeinfobar-id {
 /* Highlighter toolbar - breadcrumbs - LTR */
 
 .inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
-  margin-left: 0;
 }
 
 .inspector-breadcrumbs-button {
@@ -2709,6 +2816,9 @@ html|*#highlighter-nodeinfobar-id {
   -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 2 13 2 13 stretch;
 }
 
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
+}
+
 .inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
 .inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
   -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 2 13 2 13 stretch;
@@ -2726,7 +2836,6 @@ html|*#highlighter-nodeinfobar-id {
 /* Highlighter toolbar - breadcrumbs - RTL */
 
 .inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
-  margin-right: 0;
 }
 
 .inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
@@ -2769,6 +2878,9 @@ html|*#highlighter-nodeinfobar-id {
   -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 2 13 2 13 stretch;
 }
 
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+}
+
 .inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
 .inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
   -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 2 13 2 13 stretch;
@@ -2785,6 +2897,26 @@ html|*#highlighter-nodeinfobar-id {
 
 /* Highlighter toolbar - HTML Tree */
 
+#inspector-treepanel-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/treepanel-button.png");
+  -moz-image-region: rect(0 18px 16px 0);
+}
+
+#inspector-treepanel-toolbutton[checked],
+#inspector-treepanel-toolbutton:hover {
+  -moz-image-region: rect(0 36px 16px 18px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl),
+#inspector-treepanel-toolbutton:-moz-locale-dir(ltr) {
+/*  border-radius: 3px 0 0 3px;*/
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr),
+#inspector-treepanel-toolbutton:-moz-locale-dir(rtl) {
+/*  border-radius: 0 3px 3px 0;*/
+}
+
 #inspector-tree-splitter {
   border: none;
   min-height: 3px;