branch feature/93-impressionPartielle created (now 2300ed1a)
This is an automated email from the git hooks/post-receive script. New change to branch feature/93-impressionPartielle in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 2300ed1a Clean print.css This branch includes the following new commits: new f914c257 Improve print layout new 2300ed1a Clean print.css The 2 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 2300ed1abe4024478b37c75f836d9278a970b5e4 Author: jcouteau <couteau@codelutin.com> Date: Thu Dec 5 09:26:38 2019 +0100 Clean print.css commit f914c257693f942b9ab121b6e73f4eecd07bbc22 Author: jcouteau <couteau@codelutin.com> Date: Wed Nov 27 09:51:30 2019 +0100 Improve print layout -- 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 feature/93-impressionPartielle in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit f914c257693f942b9ab121b6e73f4eecd07bbc22 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 7915e075..5036f17d 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 7ffc8137..62ea83c8 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>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/93-impressionPartielle in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 2300ed1abe4024478b37c75f836d9278a970b5e4 Author: jcouteau <couteau@codelutin.com> Date: Thu Dec 5 09:26:38 2019 +0100 Clean print.css --- pollen-ui-riot-js/src/main/web/css/print.css | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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 dd14cb75..760f1f82 100644 --- a/pollen-ui-riot-js/src/main/web/css/print.css +++ b/pollen-ui-riot-js/src/main/web/css/print.css @@ -39,18 +39,10 @@ h1 { font-size:1em; } -/* print only the selected tab */ .tabs .tab, .tabs .dropdown { display: none!important; } -.tabs .tab.selected { - display: block!important; - border: none; - background-color: transparent; - font-size: 2em; -} - pollenfooter { display: none!important; } @@ -58,9 +50,10 @@ pollenfooter { body { display:block!important; overflow:visible!important; + height: auto; } table { page-break-inside:auto; page-break-before:always; -} +} \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm