Sync style with b2g/chrome/content/content.css

sailfishos · Feb 26, 2014 · 0c7f4cf · 0c7f4cf
1 parent a687554
commit 0c7f4cf
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/embedding/embedlite/tests/content/embedScrollStyles.css b/embedding/embedlite/tests/content/embedScrollStyles.css
@@ -10,16 +10,19 @@ xul|window xul|scrollbar {
   display: none;
 }
 
+html xul|scrollbar[root="true"] {
+  position: relative;
+  z-index: 2147483647;
+}
+
 html xul|scrollbar {
   -moz-appearance: none !important;
-  position: relative;
   background-color: transparent !important;
   background-image: none !important;
   border: 0px solid transparent !important;
-  z-index: 2147483647;
   pointer-events: none;
   opacity: 1;
-  /* make frame scrollbar invisible until bug 977015 is fixed */
+ /* make frame scrollbar invisible until bug 977015 is fixed */
   display: none;
 }
 
@@ -48,7 +51,7 @@ xul|scrollbar[orient="horizontal"] xul|thumb {
 xul|scrollbar:not([active="true"]),
 xul|scrollbar[disabled] {
   opacity: 0;
-  -moz-transition: opacity 1s ease;
+  transition: opacity 1s ease;
 }
 
 xul|scrollbarbutton {
@@ -73,6 +76,10 @@ xul|thumb {
   border-radius: 3px;
 }
 
+xul|scrollbarbutton {
+  background-image: none !important;
+}
+
 /* -moz-touch-enabled? media elements */
 :-moz-any(video, audio) > xul|videocontrols {
   -moz-binding: url("chrome://global/content/bindings/videocontrols.xml#touchControls");
@@ -291,8 +298,10 @@ input[type=number]::-moz-number-spin-box {
   display: none;
 }
 
+%ifdef MOZ_WIDGET_GONK
 /* This binding only provide key shortcuts that we can't use on devices */
 input,
 textarea {
 -moz-binding: none !important;
 }
+%endif