sync both themes with toolkit windows theme changes in Mozilla 25 cycle

diff --git a/EarlyBlue/global/findBar.css b/EarlyBlue/global/findBar.css
index 52edacef17f2ced10bf45efddd37747504b31009..8e4c337959fd1551d033094f2fcb24aec4a63de6 100644 (file)
--- a/EarlyBlue/global/findBar.css
+++ b/EarlyBlue/global/findBar.css
@@ -1,9 +1,5 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.findbar-closebutton {
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
-}
-
 findbar {
   border-top: 1px solid #666699;
   border-bottom: 1px solid transparent;
@@ -13,6 +9,10 @@ findbar {
   transition-timing-function: ease-in-out, ease-in-out, linear;
 }
 
+findbar[position="top"] {
+  transition-property: margin-top, opacity, visibility;
+}
+
 findbar[hidden] {
   /* Override display:none to make the transition work. */
   display: -moz-box;
@@ -22,71 +22,91 @@ findbar[hidden] {
   transition-delay: 0s, 0s, 150ms;
 }
 
-/* find-next button */
+findbar[position="top"][hidden] {
+  margin-bottom: auto;
+  margin-top: -1em;
+}
 
-.findbar-find-next {
-  list-style-image: url("chrome://global/skin/icons/find.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
+.findbar-closebutton {
+  list-style-image: url("chrome://global/skin/icons/close.png");
 }
 
-.findbar-find-next[disabled="true"] {
-  -moz-image-region: rect(16px 16px 32px 0px);
+/* Search field */
+
+.findbar-textbox {
+  width: 14em;
+}
+
+.findbar-textbox[status="notfound"] {
+  background-color: #FFC0C0;
+  color: #000000;
+}
+
+.findbar-textbox[flash="true"] {
+  background-color: #FFFFC0;
+  color: #000000;
+}
+
+.findbar-textbox.minimal {
+}
+
+/* Buttons */
+
+.findbar-find-previous,
+.findbar-find-next {
+  list-style-image: url("chrome://global/skin/icons/find-arrows.png");
 }
 
-/* find-previous button */
+.findbar-find-previous:not([disabled]):active,
+.findbar-find-next:not([disabled]):active {
+}
 
 .findbar-find-previous {
-  list-style-image: url("chrome://global/skin/icons/find.png");
-  -moz-image-region: rect(0px 32px 16px 16px);
+  -moz-image-region: rect(0, 12px, 9px, 0);
 }
 
-.findbar-find-previous[disabled="true"] {
-  -moz-image-region: rect(16px 32px 32px 16px);
+.findbar-find-next {
+  -moz-image-region: rect(0, 24px, 9px, 12px);
 }
 
-/* highlight button */
+.findbar-find-previous,
+.findbar-find-previous:not([disabled]):active {
+}
 
-.findbar-highlight {
-  list-style-image: url("chrome://global/skin/icons/find.png");
-  -moz-image-region: rect(0px 48px 16px 32px);
+.findbar-find-previous[disabled="true"] {
+  -moz-image-region: rect(9px, 12px, 18px, 0);
 }
 
-.findbar-higlight[disabled="true"] {
-  -moz-image-region: rect(16px 48px 32px 32px);
+.findbar-find-next[disabled="true"] {
+  -moz-image-region: rect(9px, 24px, 18px, 12px);
 }
 
-.find-status-icon {
-  list-style-image: none;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  -moz-margin-start: 12px;
-  -moz-margin-end: 0px;
-  width: 16px;
-  height: 16px;
+.findbar-find-previous > .toolbarbutton-icon,
+.findbar-find-next > .toolbarbutton-icon {
 }
 
-.findbar-find-status {
-  margin: 0 !important;
-  -moz-margin-start: 3px !important;
-  padding: 2px !important;
+.findbar-find-previous > .toolbarbutton-text,
+.findbar-find-next > .toolbarbutton-text {
 }
 
-.find-status-icon[status="notfound"] {
-  list-style-image: url("chrome://global/skin/icons/information-16.png");
+.findbar-find-previous[disabled="true"] > .toolbarbutton-icon,
+.findbar-find-next[disabled="true"] > .toolbarbutton-icon {
 }
 
-.findbar-textbox[status="notfound"] {
-  box-shadow: 0 0 0 1em #FFC0C0 inset;
-  color: #000000;
+.findbar-highlight,
+.findbar-case-sensitive {
+  -moz-margin-start: 5px;
 }
 
-.findbar-textbox[flash="true"] {
-  box-shadow: 0 0 0 1em #FFFFC0 inset;
-  color: #000000;
+.findbar-highlight > .toolbarbutton-icon,
+.findbar-case-sensitive > .toolbarbutton-icon {
+  display: none;
 }
 
-.find-status-icon[status="wrapped"] {
-  list-style-image: url("chrome://global/skin/icons/wrap.png");
+.findbar-find-status {
+  color: #808080;
+  margin: 0 !important;
+  -moz-margin-start: 12px !important;
 }
 
 .find-status-icon[status="pending"] {

diff --git a/EarlyBlue/global/icons/close.png b/EarlyBlue/global/icons/close.png
new file mode 100644 (file)
index 0000000..07769cb
Binary files /dev/null and b/EarlyBlue/global/icons/close.png differ

diff --git a/EarlyBlue/global/icons/find-arrows.png b/EarlyBlue/global/icons/find-arrows.png
new file mode 100644 (file)
index 0000000..cd444e9
Binary files /dev/null and b/EarlyBlue/global/icons/find-arrows.png differ

diff --git a/EarlyBlue/global/icons/webapps-16.png b/EarlyBlue/global/icons/webapps-16.png
new file mode 100644 (file)
index 0000000..9fd2bef
Binary files /dev/null and b/EarlyBlue/global/icons/webapps-16.png differ

diff --git a/EarlyBlue/global/icons/webapps-64.png b/EarlyBlue/global/icons/webapps-64.png
new file mode 100644 (file)
index 0000000..beef31c
Binary files /dev/null and b/EarlyBlue/global/icons/webapps-64.png differ

diff --git a/EarlyBlue/global/scrollbars.css b/EarlyBlue/global/scrollbars.css
index 0abbcb351310cf01e412e838c5502d70c6bb376c..c645af5ee36710059c18aecb20be8de27ff655ec 100644 (file)
--- a/EarlyBlue/global/scrollbars.css
+++ b/EarlyBlue/global/scrollbars.css
@@ -15,6 +15,19 @@ scrollbar {
   -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar");
   cursor: default;
   background-color: #999999;
+  pointer-events: auto;
+}
+
+scrollbar[root="true"] {
+  position: relative;
+  z-index: 2147483647; /* largest positive value of a signed 32-bit integer */
+}
+
+@media all and (-moz-overlay-scrollbars) {
+  scrollbar:not([active="true"]),
+  scrollbar[disabled="true"] {
+    visibility: hidden;
+  }
 }
 
 /* ::::: slider ::::: */

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index a36ffb4e05cd460051bf564c5973c35d92a4d177..0c0b9fcc6c489b04016be228d78bcdfbc261fa7b 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -2272,7 +2272,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 .popup-notification-icon[popupid="webapps-install"] {
-  list-style-image: url("chrome://browser/skin/webapps-64.png");
+  list-style-image: url("chrome://global/skin/icons/webapps-64.png");
 }
 
 .popup-notification-icon[popupid="mixed-content-blocked"] {
@@ -2352,7 +2352,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 }
 
 #webapps-notification-icon {
-  list-style-image: url("chrome://browser/skin/webapps-16.png");
+  list-style-image: url("chrome://gobal/skin/icons/webapps-16.png");
 }
 
 #plugins-notification-icon {

diff --git a/LCARStrek/browser/notifyPluginBlocked.png b/LCARStrek/browser/notifyPluginBlocked.png
deleted file mode 100644 (file)
index 15e06cb..0000000
Binary files a/LCARStrek/browser/notifyPluginBlocked.png and /dev/null differ

diff --git a/LCARStrek/browser/notifyPluginOutdated.png b/LCARStrek/browser/notifyPluginOutdated.png
deleted file mode 100644 (file)
index 96e7b3e..0000000
Binary files a/LCARStrek/browser/notifyPluginOutdated.png and /dev/null differ

diff --git a/LCARStrek/global/findBar.css b/LCARStrek/global/findBar.css
index 63e13a9b9d7ecd055a9a623b8bea02e31a917a34..6e87692a81aeb1d3280c0cb880e5f41c64c6431a 100644 (file)
--- a/LCARStrek/global/findBar.css
+++ b/LCARStrek/global/findBar.css
@@ -1,20 +1,15 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.findbar-closebutton {
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
-}
-
-.findbar-closebutton:hover {
-  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
-}
-
 findbar {
   border-top: 3px solid #000000;
   border-bottom: none;
   min-width: 1px;
-  transition-property: margin-bottom, opacity, visibility;
-  transition-duration: 150ms, 150ms, 0s;
-  transition-timing-function: ease-in-out, ease-in-out, linear;
+}
+
+findbar[position="top"] {
+  border-top: none;
+  border-bottom: 3px solid #000000;
+  transition-property: margin-top, opacity, visibility;
 }
 
 findbar[hidden] {
@@ -26,71 +21,106 @@ findbar[hidden] {
   transition-delay: 0s, 0s, 150ms;
 }
 
-/* find-next button */
+findbar[position="top"][hidden] {
+  margin-bottom: auto;
+  margin-top: -1em;
+}
 
-.findbar-find-next {
-  list-style-image: url("chrome://global/skin/icons/find.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
+.findbar-closebutton {
+  list-style-image: url("chrome://global/skin/icons/close.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-.findbar-find-next[disabled="true"] {
-  -moz-image-region: rect(16px 16px 32px 0px);
+.findbar-closebutton:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+/* Search field */
+
+.findbar-textbox {
+  width: 14em;
+}
+
+.findbar-textbox[status="notfound"] {
+  background-color: #FF0000;
+  color: #000000;
+}
+
+.findbar-textbox[flash="true"] {
+  background-color: #FFCF00;
+  color: #000000;
+}
+
+.findbar-textbox.minimal {
+}
+
+/* Buttons */
+
+.findbar-find-previous,
+.findbar-find-next {
+  list-style-image: url("chrome://global/skin/icons/find-arrows.png");
 }
 
-/* find-previous button */
+.findbar-find-previous:not([disabled]):active,
+.findbar-find-next:not([disabled]):active {
+}
 
 .findbar-find-previous {
-  list-style-image: url("chrome://global/skin/icons/find.png");
-  -moz-image-region: rect(0px 32px 16px 16px);
+  -moz-image-region: rect(0, 12px, 9px, 0);
+}
+
+.findbar-find-next {
+  -moz-image-region: rect(0, 24px, 9px, 12px);
+}
+
+.findbar-find-previous,
+.findbar-find-previous:not([disabled]):active {
 }
 
 .findbar-find-previous[disabled="true"] {
-  -moz-image-region: rect(16px 32px 32px 16px);
+  -moz-image-region: rect(9px, 12px, 18px, 0);
 }
 
-/* highlight button */
+.findbar-find-next[disabled="true"] {
+  -moz-image-region: rect(9px, 24px, 18px, 12px);
+}
 
-.findbar-highlight {
-  list-style-image: url("chrome://global/skin/icons/find.png");
-  -moz-image-region: rect(0px 48px 16px 32px);
+.findbar-find-previous:not([disabled]):hover,
+.findbar-find-previous:not([disabled]):active {
+  -moz-image-region: rect(18px, 12px, 27px, 0);
 }
 
-.findbar-higlight[disabled="true"] {
-  -moz-image-region: rect(16px 48px 32px 32px);
+.findbar-find-next:not([disabled]):hover,
+.findbar-find-next:not([disabled]):active {
+  -moz-image-region: rect(18px, 24px, 27px, 12px);
 }
 
-.find-status-icon {
-  list-style-image: none;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  -moz-margin-start: 12px;
-  -moz-margin-end: 0px;
-  width: 16px;
-  height: 16px;
+.findbar-find-previous > .toolbarbutton-icon,
+.findbar-find-next > .toolbarbutton-icon {
 }
 
-.findbar-find-status {
-  margin: 0 !important;
-  -moz-margin-start: 3px !important;
-  padding: 2px !important;
+.findbar-find-previous > .toolbarbutton-text,
+.findbar-find-next > .toolbarbutton-text {
 }
 
-.find-status-icon[status="notfound"] {
-  list-style-image: url("chrome://global/skin/icons/information-16.png");
+.findbar-find-previous[disabled="true"] > .toolbarbutton-icon,
+.findbar-find-next[disabled="true"] > .toolbarbutton-icon {
 }
 
-.findbar-textbox[status="notfound"] {
-  box-shadow: 0 0 0 1em #FF0000 inset;
-  color: #000000;
+.findbar-highlight,
+.findbar-case-sensitive {
+  -moz-margin-start: 5px;
 }
 
-.findbar-textbox[flash="true"] {
-  box-shadow: 0 0 0 1em #FFCF00 inset;
-  color: #000000;
+.findbar-highlight > .toolbarbutton-icon,
+.findbar-case-sensitive > .toolbarbutton-icon {
+  display: none;
 }
 
-.find-status-icon[status="wrapped"] {
-  list-style-image: url("chrome://global/skin/icons/wrap.png");
+.findbar-find-status {
+  color: #A09090;
+  margin: 0 !important;
+  -moz-margin-start: 12px !important;
 }
 
 .find-status-icon[status="pending"] {

diff --git a/LCARStrek/global/icons/find-arrows.png b/LCARStrek/global/icons/find-arrows.png
new file mode 100644 (file)
index 0000000..f5b46cc
Binary files /dev/null and b/LCARStrek/global/icons/find-arrows.png differ

diff --git a/LCARStrek/browser/webapps-16.png b/LCARStrek/global/icons/webapps-16.png
similarity index 100%
rename from LCARStrek/browser/webapps-16.png
rename to LCARStrek/global/icons/webapps-16.png

diff --git a/LCARStrek/browser/webapps-64.png b/LCARStrek/global/icons/webapps-64.png
similarity index 100%
rename from LCARStrek/browser/webapps-64.png
rename to LCARStrek/global/icons/webapps-64.png

diff --git a/LCARStrek/global/scrollbars.css b/LCARStrek/global/scrollbars.css
index 14742e78baa80672e2f1bd54bce848214a0681de..f85dd362b4c649b92451ca192fe8f3d1fa6bf9de 100644 (file)
--- a/LCARStrek/global/scrollbars.css
+++ b/LCARStrek/global/scrollbars.css
@@ -16,6 +16,19 @@ scrollbar {
   cursor: default;
   background-color: #000000;
   border-radius: 50%;
+  pointer-events: auto;
+}
+
+scrollbar[root="true"] {
+  position: relative;
+  z-index: 2147483647; /* largest positive value of a signed 32-bit integer */
+}
+
+@media all and (-moz-overlay-scrollbars) {
+  scrollbar:not([active="true"]),
+  scrollbar[disabled="true"] {
+    visibility: hidden;
+  }
 }
 
 /* ::::: slider ::::: */