From dcf21731fa9c973129d10221560cc47a602b1ec1 Mon Sep 17 00:00:00 2001 From: euvl Date: Wed, 23 Aug 2017 10:07:53 +0100 Subject: [PATCH] Added classes, tofix: line-height --- demo/client_side_rendering/src/App.vue | 7 +++++- dist/index.js | 7 +++--- dist/ssr.index.js | 7 +++--- src/Dialog.vue | 32 ++++++++++++-------------- 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/demo/client_side_rendering/src/App.vue b/demo/client_side_rendering/src/App.vue index 5e229f8..f1d1956 100644 --- a/demo/client_side_rendering/src/App.vue +++ b/demo/client_side_rendering/src/App.vue @@ -160,6 +160,7 @@ export default { }, { title: 'LIKE', + class: 'blue-text', handler: () => { alert('LIKE LIKE LIKE') } @@ -267,10 +268,14 @@ button { overflow: auto; } -.vue-dialog button { +.vue-dialog .vue-dialog-button { letter-spacing: 1px; } +.blue-text { + color: #5298FC; +} + @media (max-width:600px) { body { padding: 10px; diff --git a/dist/index.js b/dist/index.js index 5752c13..47afb67 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1203,7 +1203,7 @@ exports = module.exports = __webpack_require__(0)(); // module -exports.push([module.i, "\n.vue-dialog {\n font-size: 14px;\n}\n.vue-dialog div {\n box-sizing: border-box;\n}\n.vue-dialog .dialog-flex {\n width: 100%;\n height: 100%;\n}\n.vue-dialog .dialog-content {\n flex: 1 0 auto;\n width: 100%;\n padding: 15px;\n}\n.vue-dialog .dialog-c-title {\n font-weight: 600;\n padding-bottom: 15px;\n}\n.vue-dialog .dialog-c-text {\n}\n.vue-dialog .dialog-buttons {\n display: flex;\n flex: 0 1 auto;\n width: 100%;\n border-top: 1px solid #eee;\n font-size: 12px;\n}\n.vue-dialog .dialog-buttons-none {\n width: 100%;\n padding-bottom: 15px;\n}\n.vue-dialog button {\n background: transparent;\n padding: 0;\n margin: 0;\n border: 0;\n cursor: pointer;\n box-sizing: border-box;\n line-height: 44px;\n height: 44px;\n\n/* text-transform: uppercase; */\n/* letter-spacing: 1px; */\n\n color:inherit;\n font:inherit;\n}\n.vue-dialog button:hover {\n background: rgba(0, 0, 0, 0.01);\n}\n.vue-dialog button:active {\n background: rgba(0, 0, 0, 0.025);\n}\n.vue-dialog button:not(:first-of-type) {\n border-left: 1px solid #eee;\n}\n", "", {"version":3,"sources":["/./src/Dialog.vue?52df2bd4"],"names":[],"mappings":";AAwEA;EACA,gBAAA;CACA;AAEA;EACA,uBAAA;CACA;AAEA;EACA,YAAA;EACA,aAAA;CACA;AAEA;EACA,eAAA;EACA,YAAA;EACA,cAAA;CACA;AAEA;EACA,iBAAA;EACA,qBAAA;CACA;AAEA;CACA;AAEA;EACA,cAAA;EACA,eAAA;EACA,YAAA;EACA,2BAAA;EACA,gBAAA;CACA;AAEA;EACA,YAAA;EACA,qBAAA;CACA;AAEA;EACA,wBAAA;EACA,WAAA;EACA,UAAA;EACA,UAAA;EACA,gBAAA;EACA,uBAAA;EACA,kBAAA;EACA,aAAA;;AAEA,iCAAA;AACA,2BAAA;;EAEA,cAAA;EACA,aAAA;CACA;AAEA;EACA,gCAAA;CACA;AAEA;EACA,iCAAA;CACA;AAEA;EACA,4BAAA;CACA","file":"Dialog.vue","sourcesContent":["\n\n\n"],"sourceRoot":"webpack://"}]); +exports.push([module.i, "\n.vue-dialog {\n font-size: 14px;\n}\n.vue-dialog div {\n box-sizing: border-box;\n}\n.vue-dialog .dialog-flex {\n width: 100%;\n height: 100%;\n}\n.vue-dialog .dialog-content {\n flex: 1 0 auto;\n width: 100%;\n padding: 15px;\n}\n.vue-dialog .dialog-c-title {\n font-weight: 600;\n padding-bottom: 15px;\n}\n.vue-dialog .dialog-c-text {\n}\n.vue-dialog .dialog-buttons {\n display: flex;\n flex: 0 1 auto;\n width: 100%;\n border-top: 1px solid #eee;\n font-size: 12px;\n}\n.vue-dialog .dialog-buttons-none {\n width: 100%;\n padding-bottom: 15px;\n}\n.vue-dialog-button {\n position: relative;\n background: transparent;\n padding: 0;\n margin: 0;\n border: 0;\n cursor: pointer;\n text-align: center;\n box-sizing: border-box;\n line-height: 44px;\n height: 44px;\n color: inherit;\n font: inherit;\n}\n.vue-dialog-button:hover {\n background: rgba(0, 0, 0, 0.01);\n}\n.vue-dialog-button:active {\n background: rgba(0, 0, 0, 0.025);\n}\n.vue-dialog-button:not(:first-of-type) {\n border-left: 1px solid #eee;\n}\n", "", {"version":3,"sources":["/./src/Dialog.vue?e90a8702"],"names":[],"mappings":";AAwEA;EACA,gBAAA;CACA;AAEA;EACA,uBAAA;CACA;AAEA;EACA,YAAA;EACA,aAAA;CACA;AAEA;EACA,eAAA;EACA,YAAA;EACA,cAAA;CACA;AAEA;EACA,iBAAA;EACA,qBAAA;CACA;AAEA;CACA;AAEA;EACA,cAAA;EACA,eAAA;EACA,YAAA;EACA,2BAAA;EACA,gBAAA;CACA;AAEA;EACA,YAAA;EACA,qBAAA;CACA;AAEA;EACA,mBAAA;EACA,wBAAA;EACA,WAAA;EACA,UAAA;EACA,UAAA;EACA,gBAAA;EACA,mBAAA;EACA,uBAAA;EACA,kBAAA;EACA,aAAA;EACA,eAAA;EACA,cAAA;CACA;AAEA;EACA,gCAAA;CACA;AAEA;EACA,iCAAA;CACA;AAEA;EACA,4BAAA;CACA","file":"Dialog.vue","sourcesContent":["\n\n\n"],"sourceRoot":"webpack://"}]); // exports @@ -1308,8 +1308,9 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c })]), _vm._v(" "), (_vm.buttons) ? _c('div', { staticClass: "dialog-buttons" }, _vm._l((_vm.buttons), function(button, i) { - return _c('button', { + return _c('div', { key: i, + class: ['vue-dialog-button', button.class], style: (_vm.buttonStyle), domProps: { "innerHTML": _vm._s(button.title) @@ -1320,7 +1321,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c _vm.click(i, $event) } } - }, [_vm._v("\n " + _vm._s(button.title) + "\n ")]) + }) })) : _c('div', { staticClass: "dialog-buttons-none" })]) diff --git a/dist/ssr.index.js b/dist/ssr.index.js index d1a1fb1..908095a 100644 --- a/dist/ssr.index.js +++ b/dist/ssr.index.js @@ -1041,7 +1041,7 @@ exports = module.exports = __webpack_require__(0)(); // module -exports.push([module.i, "\n.vue-dialog {\n font-size: 14px;\n}\n.vue-dialog div {\n box-sizing: border-box;\n}\n.vue-dialog .dialog-flex {\n width: 100%;\n height: 100%;\n}\n.vue-dialog .dialog-content {\n flex: 1 0 auto;\n width: 100%;\n padding: 15px;\n}\n.vue-dialog .dialog-c-title {\n font-weight: 600;\n padding-bottom: 15px;\n}\n.vue-dialog .dialog-c-text {\n}\n.vue-dialog .dialog-buttons {\n display: flex;\n flex: 0 1 auto;\n width: 100%;\n border-top: 1px solid #eee;\n font-size: 12px;\n}\n.vue-dialog .dialog-buttons-none {\n width: 100%;\n padding-bottom: 15px;\n}\n.vue-dialog button {\n background: transparent;\n padding: 0;\n margin: 0;\n border: 0;\n cursor: pointer;\n box-sizing: border-box;\n line-height: 44px;\n height: 44px;\n\n/* text-transform: uppercase; */\n/* letter-spacing: 1px; */\n\n color:inherit;\n font:inherit;\n}\n.vue-dialog button:hover {\n background: rgba(0, 0, 0, 0.01);\n}\n.vue-dialog button:active {\n background: rgba(0, 0, 0, 0.025);\n}\n.vue-dialog button:not(:first-of-type) {\n border-left: 1px solid #eee;\n}\n", "", {"version":3,"sources":["/./src/Dialog.vue?52df2bd4"],"names":[],"mappings":";AAwEA;EACA,gBAAA;CACA;AAEA;EACA,uBAAA;CACA;AAEA;EACA,YAAA;EACA,aAAA;CACA;AAEA;EACA,eAAA;EACA,YAAA;EACA,cAAA;CACA;AAEA;EACA,iBAAA;EACA,qBAAA;CACA;AAEA;CACA;AAEA;EACA,cAAA;EACA,eAAA;EACA,YAAA;EACA,2BAAA;EACA,gBAAA;CACA;AAEA;EACA,YAAA;EACA,qBAAA;CACA;AAEA;EACA,wBAAA;EACA,WAAA;EACA,UAAA;EACA,UAAA;EACA,gBAAA;EACA,uBAAA;EACA,kBAAA;EACA,aAAA;;AAEA,iCAAA;AACA,2BAAA;;EAEA,cAAA;EACA,aAAA;CACA;AAEA;EACA,gCAAA;CACA;AAEA;EACA,iCAAA;CACA;AAEA;EACA,4BAAA;CACA","file":"Dialog.vue","sourcesContent":["\n\n\n"],"sourceRoot":"webpack://"}]); +exports.push([module.i, "\n.vue-dialog {\n font-size: 14px;\n}\n.vue-dialog div {\n box-sizing: border-box;\n}\n.vue-dialog .dialog-flex {\n width: 100%;\n height: 100%;\n}\n.vue-dialog .dialog-content {\n flex: 1 0 auto;\n width: 100%;\n padding: 15px;\n}\n.vue-dialog .dialog-c-title {\n font-weight: 600;\n padding-bottom: 15px;\n}\n.vue-dialog .dialog-c-text {\n}\n.vue-dialog .dialog-buttons {\n display: flex;\n flex: 0 1 auto;\n width: 100%;\n border-top: 1px solid #eee;\n font-size: 12px;\n}\n.vue-dialog .dialog-buttons-none {\n width: 100%;\n padding-bottom: 15px;\n}\n.vue-dialog-button {\n position: relative;\n background: transparent;\n padding: 0;\n margin: 0;\n border: 0;\n cursor: pointer;\n text-align: center;\n box-sizing: border-box;\n line-height: 44px;\n height: 44px;\n color: inherit;\n font: inherit;\n}\n.vue-dialog-button:hover {\n background: rgba(0, 0, 0, 0.01);\n}\n.vue-dialog-button:active {\n background: rgba(0, 0, 0, 0.025);\n}\n.vue-dialog-button:not(:first-of-type) {\n border-left: 1px solid #eee;\n}\n", "", {"version":3,"sources":["/./src/Dialog.vue?e90a8702"],"names":[],"mappings":";AAwEA;EACA,gBAAA;CACA;AAEA;EACA,uBAAA;CACA;AAEA;EACA,YAAA;EACA,aAAA;CACA;AAEA;EACA,eAAA;EACA,YAAA;EACA,cAAA;CACA;AAEA;EACA,iBAAA;EACA,qBAAA;CACA;AAEA;CACA;AAEA;EACA,cAAA;EACA,eAAA;EACA,YAAA;EACA,2BAAA;EACA,gBAAA;CACA;AAEA;EACA,YAAA;EACA,qBAAA;CACA;AAEA;EACA,mBAAA;EACA,wBAAA;EACA,WAAA;EACA,UAAA;EACA,UAAA;EACA,gBAAA;EACA,mBAAA;EACA,uBAAA;EACA,kBAAA;EACA,aAAA;EACA,eAAA;EACA,cAAA;CACA;AAEA;EACA,gCAAA;CACA;AAEA;EACA,iCAAA;CACA;AAEA;EACA,4BAAA;CACA","file":"Dialog.vue","sourcesContent":["\n\n\n"],"sourceRoot":"webpack://"}]); // exports @@ -1133,8 +1133,9 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c })]), _vm._v(" "), (_vm.buttons) ? _c('div', { staticClass: "dialog-buttons" }, _vm._l((_vm.buttons), function(button, i) { - return _c('button', { + return _c('div', { key: i, + class: ['vue-dialog-button', button.class], style: (_vm.buttonStyle), domProps: { "innerHTML": _vm._s(button.title) @@ -1145,7 +1146,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c _vm.click(i, $event) } } - }, [_vm._v("\n " + _vm._s(button.title) + "\n ")]) + }) })) : _c('div', { staticClass: "dialog-buttons-none" })]) diff --git a/src/Dialog.vue b/src/Dialog.vue index ee28c5c..eb3fa48 100644 --- a/src/Dialog.vue +++ b/src/Dialog.vue @@ -16,13 +16,13 @@ v-html="params.text || ''">
- +
+
@@ -110,32 +110,30 @@ padding-bottom: 15px; } - .vue-dialog button { + .vue-dialog-button { + position: relative; background: transparent; padding: 0; margin: 0; border: 0; cursor: pointer; + text-align: center; box-sizing: border-box; line-height: 44px; height: 44px; - - /* text-transform: uppercase; */ - /* letter-spacing: 1px; */ - - color:inherit; - font:inherit; + color: inherit; + font: inherit; } - .vue-dialog button:hover { + .vue-dialog-button:hover { background: rgba(0, 0, 0, 0.01); } - .vue-dialog button:active { + .vue-dialog-button:active { background: rgba(0, 0, 0, 0.025); } - .vue-dialog button:not(:first-of-type) { + .vue-dialog-button:not(:first-of-type) { border-left: 1px solid #eee; }