This is an automated email from the git hooks/post-receive script. New commit to branch feature/init-perf-test in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 26ade978023470ac0a6e803e05bfa4181366d539 Author: jcouteau <couteau@codelutin.com> Date: Wed Nov 27 09:51:30 2019 +0100 Improve print layout --- pollen-ui-riot-js/src/main/web/css/main.css | 2 ++ pollen-ui-riot-js/src/main/web/css/print.css | 17 ++++++++++++++++- .../src/main/web/tag/poll/EditVote.tag.html | 4 ++-- .../src/main/web/tag/poll/VotesTable.tag.html | 4 ++-- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/css/main.css b/pollen-ui-riot-js/src/main/web/css/main.css index b763fa2f..cc1c2c1a 100644 --- a/pollen-ui-riot-js/src/main/web/css/main.css +++ b/pollen-ui-riot-js/src/main/web/css/main.css @@ -99,6 +99,8 @@ input, textarea { } } +@media print{@page {size: portrait}} + a { text-decoration: none; color: var(--main); diff --git a/pollen-ui-riot-js/src/main/web/css/print.css b/pollen-ui-riot-js/src/main/web/css/print.css index 1e6661e9..dd14cb75 100644 --- a/pollen-ui-riot-js/src/main/web/css/print.css +++ b/pollen-ui-riot-js/src/main/web/css/print.css @@ -30,8 +30,13 @@ pollenheader .header-actions { display: none!important; } -h1, .tabs { +.tabs { + display: none!important; +} + +h1 { background-color: transparent!important; + font-size:1em; } /* print only the selected tab */ @@ -49,3 +54,13 @@ h1, .tabs { pollenfooter { display: none!important; } + +body { + display:block!important; + overflow:visible!important; +} + +table { + page-break-inside:auto; + page-break-before:always; +} diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html index 35ff11d8..439a63bc 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html @@ -38,7 +38,7 @@ <HumanInput onsubmit="{saveVote}"></HumanInput> <div class="header"> <div class="current-voter separator-right"> - <div class="o-field o-field--icon-left o-field--icon-right" + <div class="o-field o-field--icon-left o-field--icon-right not-printable" if={poll.questions[0] && (poll.questions[0].canVote || voteInEdition)} > <i class="fa fa-fw fa-user c-icon" aria-hidden="true"></i> <input class="c-field {c-field--error: !voteInEdition && error && error['voter.name']}" @@ -118,7 +118,7 @@ </div> </div> <div class="footer separator-top" if="{poll.questions[0] && poll.questions[0].choices && (poll.questions[0].canVote || voteInEdition)}"> - <div class="current-voter-actions separator-right"> + <div class="current-voter-actions separator-right not-printable"> <div class="o-form-element" if={mustValidateGtuToVote()}> <label class="c-field c-field--choice gtu-validation"> <input type="checkbox" diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/VotesTable.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/VotesTable.tag.html index abe2ebf2..af2d3f12 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/VotesTable.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/VotesTable.tag.html @@ -40,14 +40,14 @@ <span if="{element.anonymous && !element.permission}" class="anonymous-voter">{parent.parent._t.anonymousVoter}</span> </div> <button type="button" - class="c-button c-button--rounded u-xsmall c-button--brand" + class="c-button c-button--rounded u-xsmall c-button--brand not-printable" if="{!parent.parent.poll.closed && element.permission}" disabled="{parent.parent.voteInEdition != null || parent.parent.voting}" onclick="{parent.parent.editVote(element)}"> <i class="fa fa-pencil-square-o" aria-hidden="true"></i> </button> <button type="button" - class="c-button c-button--rounded u-xsmall c-button--error" + class="c-button c-button--rounded u-xsmall c-button--error not-printable" if="{!parent.parent.poll.closed && (parent.parent.poll.permission || element.permission)}" disabled="{parent.parent.voteInEdition != null || parent.parent.voting}" onclick="{parent.parent.deleteVote(element)}"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.