feat(QScrollArea): small tweaks

Author: rstoenescu

ui/src/components/scroll-area/QScrollArea.js

@@ -18,19 +18,12 @@ export default Vue.extend({
   },
 
   props: {
-    barStyle: Object,
-    thumbStyle: {
-      type: Object,
-      default: () => ({})
-    },
-    contentStyle: {
-      type: Object,
-      default: () => ({})
-    },
-    contentActiveStyle: {
-      type: Object,
-      default: () => ({})
-    },
+    barStyle: [ Array, String, Object ],
+
+    thumbStyle: Object,
+    contentStyle: [ Array, String, Object ],
+    contentActiveStyle: [ Array, String, Object ],
+
     delay: {
       type: [String, Number],
       default: 1000
@@ -40,6 +33,7 @@ export default Vue.extend({
       type: Boolean,
       default: null
     },
+
     horizontal: Boolean
   },
 

ui/src/components/scroll-area/QScrollArea.json

@@ -5,7 +5,7 @@
 
   "props": {
     "bar-style": {
-      "type": "Object",
+      "type": [ "Array", "String", "Object"],
       "desc": "Object with CSS properties and values for styling the custom scrollbar",
       "examples": [ ":bar-style=\"{ right: '4px', borderRadius: '5px', background: 'red', width: '10px', opacity: 1 }\"" ],
       "category": "style",
@@ -20,14 +20,14 @@
     },
 
     "content-style": {
-      "type": "Object",
+      "type": [ "Array", "String", "Object"],
       "desc": "Object with CSS properties and values for styling the container of QScrollArea",
       "examples": [ ":content-style=\"{ backgroundColor: '#C0C0C0' }\"" ],
       "category": "style"
     },
 
     "content-active-style": {
-      "type": "Object",
+      "type": [ "Array", "String", "Object"],
       "desc": "Object with CSS properties and values for styling the container of QScrollArea when scroll area becomes active (is mouse hovered)",
       "examples": [ ":content-active-style=\"{ backgroundColor: 'white' }\"" ],
       "category": "style"

ui/src/components/slider/slider-utils.js

@@ -115,7 +115,7 @@ export let SliderMixin = {
     },
 
     isReversed () {
-      return (this.reverse === true ? 1 : -1) * (this.$q.lang.rtl === true ? -1 : 1) === 1
+      return this.reverse !== (this.$q.lang.rtl === true)
     },
 
     horizProp () {