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 c8d60d99201a2ca6fe3eaaff4898eacfd2b26f60 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Aug 1 11:57:15 2017 +0200 correction style et qrcode --- pollen-ui-riot-js/src/main/web/home/style.css | 2 +- pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html | 4 +++- pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html | 5 ++--- pollen-ui-riot-js/src/main/web/tag/popup/QrCodeButton.tag.html | 7 ++++++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/home/style.css b/pollen-ui-riot-js/src/main/web/home/style.css index c7c5c5b7..67a65552 100644 --- a/pollen-ui-riot-js/src/main/web/home/style.css +++ b/pollen-ui-riot-js/src/main/web/home/style.css @@ -2,10 +2,10 @@ display: flex; flex-flow: row wrap; flex-direction: column; - margin-top: 30px; } .wrapper { + padding-top: 30px; flex-grow: 1; display: flex; flex-direction: column; diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html index 3ccc48f3..414220ba 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html @@ -227,6 +227,7 @@ require("./Report.tag.html"); h1 { display: flex; + align-items: flex-start; } h1 .title { @@ -236,6 +237,7 @@ require("./Report.tag.html"); h1 .c-button { font-size: 1rem; margin: 0 2px; + flex-shrink: 0; } .poll-info { @@ -246,7 +248,7 @@ require("./Report.tag.html"); } .poll-info > div { - padding: 15px 30px; + padding: 0 30px; } .poll-info p { diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html index 7f246767..0e38a057 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html @@ -46,8 +46,8 @@ require("../popup/QrCodeButton.tag.html"); {__.invitations} <strong>{opts.form.model.participants.length}</strong> </div> <div> - <QrCodeButton value="{voteUrl}" title="{__.shareByQR}"/> - <a href="mailto:?subject={opts.form.model.title}&body={opts.form.model.title}%0D%0A{opts.form.model.description}%0D%0A{voteUrl}" + <QrCodeButton value="{window.location.origin}{window.location.pathname}#poll/{opts.form.model.id}/vote" title="{__.shareByQR}"/> + <a href="mailto:?subject={opts.form.model.title}&body={opts.form.model.title}%0D%0A{opts.form.model.description}%0D%0A{window.location.origin}{window.location.pathname}#poll/{opts.form.model.id}/vote" title="{__.shareByEmail}" class="c-button c-button--info"> <i class="fa fa-paper-plane"></i> @@ -76,7 +76,6 @@ require("../popup/QrCodeButton.tag.html"); this.installBundle(this.session, "summary"); this.showVoteCountingTypeHelper = false; - this.voteUrl = "test"; this.copyUrl = (refInputUrl) => () => { this.refs[refInputUrl].select(); 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 2069818f..64cbddca 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 @@ -5,7 +5,7 @@ require("../QrCode.tag.html"); <i class="fa fa-qrcode" aria-hidden="true"></i> </button> - <div if={openModal} onclick={close}> + <div if={openModal} onclick={close} class="qr-modal"> <div class="c-overlay"></div> <div class="o-modal"> <div class="c-card"> @@ -34,6 +34,11 @@ require("../QrCode.tag.html"); this.listen("escape", this.close); </script> <style> + + .qr-modal { + display: inline; + } + .o-modal{ height: 80%; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.