From cfa4088cf8d6827e838362f873e1865d73b31e63 Mon Sep 17 00:00:00 2001 From: euvl Date: Tue, 23 May 2017 02:07:47 +0100 Subject: [PATCH] Added "top-right" slot fro custom "Close" buttons (#16) --- demo/src/components/ConditionalModal.vue | 1 - demo/src/components/DogProfileModal.vue | 12 ++++++++++++ dist/index.js | 9 +++++++-- package.json | 5 +++-- src/Modal.vue | 20 +++++++++++++++++++- 5 files changed, 41 insertions(+), 6 deletions(-) diff --git a/demo/src/components/ConditionalModal.vue b/demo/src/components/ConditionalModal.vue index d9a2abe..98475a8 100644 --- a/demo/src/components/ConditionalModal.vue +++ b/demo/src/components/ConditionalModal.vue @@ -1,6 +1,5 @@ @@ -30,6 +33,15 @@ export default { } } + .ct-top-right { + cursor: pointer; + padding-top: 20px; + padding-right: 30px; + font-weight: 600; + color: white; + text-shadow: 0 0px 20px black; + } + .scale-enter-active, .scale-leave-active { transition: all 0.5s; diff --git a/dist/index.js b/dist/index.js index f4d19c5..4ce73fa 100644 --- a/dist/index.js +++ b/dist/index.js @@ -525,6 +525,9 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // // // +// +// +// @@ -931,7 +934,7 @@ exports = module.exports = __webpack_require__(2)(); // module -exports.push([module.i, ".v--modal-overlay[data-v-40dd3b1e]{position:fixed;left:0;top:0;width:100vw;height:100vh;background:rgba(0,0,0,.2);z-index:999;opacity:1}.v--modal-overlay .v--modal-box[data-v-40dd3b1e]{position:relative;overflow:hidden;box-sizing:border-box;background-color:#fff}.v--modal[data-v-40dd3b1e]{background:#fff;text-align:left;border-radius:3px;box-shadow:0 20px 60px -2px rgba(27,33,58,.4);padding:0}.v--modal.v--modal-fullscreen[data-v-40dd3b1e]{width:100vw;height:100vh;margin:0;left:0;top:0}.overlay-fade-enter-active[data-v-40dd3b1e],.overlay-fade-leave-active[data-v-40dd3b1e]{transition:all .2s}.overlay-fade-enter[data-v-40dd3b1e],.overlay-fade-leave-active[data-v-40dd3b1e]{opacity:0}.nice-modal-fade-enter-active[data-v-40dd3b1e],.nice-modal-fade-leave-active[data-v-40dd3b1e]{transition:all .4s}.nice-modal-fade-enter[data-v-40dd3b1e],.nice-modal-fade-leave-active[data-v-40dd3b1e]{opacity:0;transform:translateY(-20px)}", ""]); +exports.push([module.i, ".v--modal-overlay[data-v-40dd3b1e]{position:fixed;left:0;top:0;width:100vw;height:100vh;background:rgba(0,0,0,.2);z-index:999;opacity:1}.v--modal-overlay .v--modal-box[data-v-40dd3b1e]{position:relative;overflow:hidden;box-sizing:border-box;background-color:#fff}.v--modal[data-v-40dd3b1e]{background:#fff;text-align:left;border-radius:3px;box-shadow:0 20px 60px -2px rgba(27,33,58,.4);padding:0}.v--modal.v--modal-fullscreen[data-v-40dd3b1e]{width:100vw;height:100vh;margin:0;left:0;top:0}.v--modal-top-right[data-v-40dd3b1e]{display:block;position:absolute;right:0;top:0}.overlay-fade-enter-active[data-v-40dd3b1e],.overlay-fade-leave-active[data-v-40dd3b1e]{transition:all .2s}.overlay-fade-enter[data-v-40dd3b1e],.overlay-fade-leave-active[data-v-40dd3b1e]{opacity:0}.nice-modal-fade-enter-active[data-v-40dd3b1e],.nice-modal-fade-leave-active[data-v-40dd3b1e]{transition:all .4s}.nice-modal-fade-enter[data-v-40dd3b1e],.nice-modal-fade-leave-active[data-v-40dd3b1e]{opacity:0;transform:translateY(-20px)}", ""]); // exports @@ -994,7 +997,9 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c _vm.toggle(false) } } - }, [_c('transition', { + }, [_c('div', { + staticClass: "v--modal-top-right" + }, [_vm._t("top-right")], 2), _vm._v(" "), _c('transition', { attrs: { "name": _vm.transition } diff --git a/package.json b/package.json index 8c3947f..23d4295 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "vue-js-modal", "description": "Modal Component for Vue.js", - "version": "1.1.1", + "version": "1.1.2", "author": "euvl ", "main": "dist/index.js", "repository": { @@ -11,7 +11,8 @@ "keywords": [ "vue", "vuejs", - "modal" + "modal", + "vue-js-modal" ], "bugs": { "url": "https://github.com/euvl/vue-js-modal/issues" diff --git a/src/Modal.vue b/src/Modal.vue index 1d66677..6d04e09 100644 --- a/src/Modal.vue +++ b/src/Modal.vue @@ -6,6 +6,9 @@ :aria-expanded="visible.toString()" :data-modal="name" @mousedown.stop="toggle(false)"> +
+ +