branch develop updated (5c3fb9a -> 98a2d75)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 5c3fb9a création et utilisation des composants : Modal, confirmation et information. new 98a2d75 correction taille du QrCode The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 98a2d75fd211a385bbff60804debc95b3b3a5e74 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 24 10:23:08 2017 +0200 correction taille du QrCode Summary of changes: pollen-ui-riot-js/src/main/web/tag/QrCode.tag.html | 11 ++--------- .../src/main/web/tag/popup/QrCodeButton.tag.html | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 98a2d75fd211a385bbff60804debc95b3b3a5e74 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 24 10:23:08 2017 +0200 correction taille du QrCode --- pollen-ui-riot-js/src/main/web/tag/QrCode.tag.html | 11 ++--------- .../src/main/web/tag/popup/QrCodeButton.tag.html | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/QrCode.tag.html b/pollen-ui-riot-js/src/main/web/tag/QrCode.tag.html index 3018316..0e6de96 100644 --- a/pollen-ui-riot-js/src/main/web/tag/QrCode.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/QrCode.tag.html @@ -1,5 +1,5 @@ <QrCode> - + <script type="es6"> let typeNumberByCorrectionLevel = { L: [17, 32, 53, 78, 106, 134, 154, 192, 230, 271, @@ -21,7 +21,7 @@ }; - let qrcode = require("../../../../node_modules/qrcode-generator/qrcode.js"); + let qrcode = require("qrcode-generator/qrcode.js"); this.updateQrcode = () => { if (this.opts.riotValue !== this.qrvalue) { @@ -41,11 +41,4 @@ this.on("mount", this.updateQrcode); this.on("update", this.updateQrcode); </script> - - <style> - .qr-container { - margin: 20px; - height: 100%; - } - </style> </QrCode> diff --git a/pollen-ui-riot-js/src/main/web/tag/popup/QrCodeButton.tag.html b/pollen-ui-riot-js/src/main/web/tag/popup/QrCodeButton.tag.html index f5db835..132c133 100644 --- a/pollen-ui-riot-js/src/main/web/tag/popup/QrCodeButton.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/popup/QrCodeButton.tag.html @@ -52,7 +52,7 @@ require("../QrCode.tag.html"); .qr-code { flex-grow: 1; - padding: 20px; + margin: 20px; } </style> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm