From: Robert Kaiser <kairo@kairo.at>
Date: Sun, 30 Nov 2008 21:56:30 +0000 (+0100)
Subject: clean merge conflict
X-Git-Tag: LCARStrek-2.0a2~7
X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=c09bd2ddc32d2bd0de40b939b6641684c4f0b97b

clean merge conflict
---

c09bd2ddc32d2bd0de40b939b6641684c4f0b97b
diff --cc LCARStrek/navigator/navigator.css
index 449733fa,64067e3a..95f79f54
--- a/LCARStrek/navigator/navigator.css
+++ b/LCARStrek/navigator/navigator.css
@@@ -383,10 -399,90 +399,94 @@@ toolbar[mode="text"] toolbarbutton.chev
    -moz-image-region: rect(48px 32px 64px 16px);
  }
  
 +#urlbar-icons {
 +  -moz-margin-end: 2px;
 +}
 +
+ toolbar[iconsize="small"] > #back-button {
+   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+   -moz-image-region: rect(32px 16px 48px 0);
+ }
+ 
+ toolbar[iconsize="small"] > #back-button[disabled="true"] {
+   -moz-image-region: rect(32px 32px 48px 16px) !important;
+ }
+ 
+ toolbar[iconsize="small"] > #back-button:not([disabled="true"]):hover,
+ toolbar[iconsize="small"] > #back-button:not([disabled="true"]):hover:active {
+   -moz-image-region: rect(32px 48px 48px 32px);
+ }
+ 
+ toolbar[iconsize="small"] > #forward-button {
+   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+   -moz-image-region: rect(48px 16px 64px 0);
+ }
+ 
+ toolbar[iconsize="small"] > #forward-button[disabled="true"] {
+   -moz-image-region: rect(48px 32px 64px 16px) !important;
+ }
+ 
+ toolbar[iconsize="small"] > #forward-button:not([disabled="true"]):hover,
+ toolbar[iconsize="small"] > #forward-button:not([disabled="true"]):hover:active {
+   -moz-image-region: rect(48px 48px 64px 32px);
+ }
+ 
+ toolbar[iconsize="small"] > #reload-button {
+   list-style-image: url("chrome://navigator/skin/icons/navigatoricons-small.png");
+   -moz-image-region: rect(0 16px 16px 0);
+ }
+ 
+ toolbar[iconsize="small"] > #reload-button[disabled="true"] {
+   -moz-image-region: rect(0 32px 16px 16px) !important;
+ }
+ 
+ toolbar[iconsize="small"] > #reload-button:not([disabled="true"]):hover,
+ toolbar[iconsize="small"] > #reload-button:not([disabled="true"]):hover:active {
+   -moz-image-region: rect(0 48px 16px 32px);
+ }
+ 
+ toolbar[iconsize="small"] > #stop-button {
+   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+   -moz-image-region: rect(16px 16px 32px 0);
+ }
+ 
+ toolbar[iconsize="small"] > #stop-button[disabled="true"] {
+   -moz-image-region: rect(16px 32px 32px 16px) !important;
+ }
+ 
+ toolbar[iconsize="small"] > #stop-button:not([disabled="true"]):hover,
+ toolbar[iconsize="small"] > #stop-button:not([disabled="true"]):hover:active {
+   -moz-image-region: rect(16px 48px 32px 32px);
+ }
+ 
+ toolbar[iconsize="small"] > #print-button {
+   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+   -moz-image-region: rect(0 16px 16px 0);
+ }
+ 
+ toolbar[iconsize="small"] > #print-button[disabled="true"] {
+   -moz-image-region: rect(0 32px 16px 16px) !important;
+ }
+ 
+ toolbar[iconsize="small"] > #print-button:not([disabled="true"]):hover,
+ toolbar[iconsize="small"] > #print-button:not([disabled="true"]):hover:active {
+   -moz-image-region: rect(0 48px 16px 32px);
+ }
+ 
+ toolbar[iconsize="small"] > #home-button {
+   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+   -moz-image-region: rect(64px 16px 80px 0);
+ }
+ 
+ toolbar[iconsize="small"] > #home-button[disabled="true"] {
+   -moz-image-region: rect(64px 32px 80px 16px) !important;
+ }
+ 
+ toolbar[iconsize="small"] > #home-button:not([disabled="true"]):hover,
+ toolbar[iconsize="small"] > #home-button:not([disabled="true"]):hover:active {
+   -moz-image-region: rect(64px 48px 80px 32px);
+ }
+ 
  /* ::::: home button on the personal toolbar ::::: */
  
  #PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon {