feat: [Request] QModal to support Array syntax for content-css and co…

…ntent-classes #856
quasarframework · Sep 9, 2017 · b89b060 · b89b060
1 parent 85815b8
commit b89b060
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/components/modal/QModal.vue b/src/components/modal/QModal.vue
@@ -93,8 +93,8 @@ export default {
       type: String,
       default: 'flex-center'
     },
-    contentClasses: [Object, String],
-    contentCss: [Object, String],
+    contentClasses: [Object, Array, String],
+    contentCss: [Object, Array, String],
     noBackdropDismiss: {
       type: Boolean,
       default: false
@@ -134,13 +134,19 @@ export default {
     },
     modalCss () {
       if (this.position) {
-        return extend(
+        const css = Array.isArray(this.contentCss)
+          ? this.contentCss
+          : [this.contentCss]
+
+        css.unshift(extend(
           {},
           positionCSS[this.$q.theme],
-          additionalCSS(this.$q.theme, this.position),
-          this.contentCss
-        )
+          additionalCSS(this.$q.theme, this.position)
+        ))
+
+        return css
       }
+
       return this.contentCss
     }
   },