From 41301c1071595892009da97a99dc9a80996e3b87 Mon Sep 17 00:00:00 2001 From: euvl Date: Fri, 28 Apr 2017 18:18:46 +0300 Subject: [PATCH] Changed "modal" class name to "v--modal-box" to fix a clash with bootstrap class name --- src/Modal.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Modal.vue b/src/Modal.vue index aef96d6..5a5ab14 100644 --- a/src/Modal.vue +++ b/src/Modal.vue @@ -168,9 +168,11 @@ top: inRange(0, maxTop, top) } }, + modalClass () { - return ['modal', this.classes] + return ['v--modal-box', this.classes] }, + modalStyle () { return { top: this.position.top + 'px', @@ -190,6 +192,7 @@ this.modal.height = inRange(0, this.window.height, this.modal.height) } }, + genEventObject (params) { //todo: clean this up (change to ...) return Vue.util.extend({ @@ -198,6 +201,7 @@ timestamp: Date.now() }, params || {}); }, + resize (event) { this.modal.width = event.size.width this.modal.height = event.size.height @@ -207,6 +211,7 @@ this.$emit('resize', resizeEvent) }, + toggle (state, params) { const beforeEventName = this.visible ? 'before-close' : 'before-open' const afterEventName = this.visible ? 'closed' : 'opened' @@ -228,7 +233,7 @@ getDraggableElement () { var selector = typeof this.draggable !== 'string' - ? '.modal' + ? '.v--modal-box' : this.draggable if (selector) { @@ -297,7 +302,7 @@ opacity: 1; } - .v--modal-overlay .modal { + .v--modal-overlay .v--modal-box { position: relative; overflow: hidden; box-sizing: border-box;