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 f8e91eef5feae687ef1b100c26fa46b5eba9fd6e Author: Kevin Morin <morin@codelutin.com> Date: Fri Jul 28 11:32:28 2017 +0200 refs #74 style --- .../src/main/web/tag/poll/Votes.tag.html | 54 +++++++++++----------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html index dc51f91e..78c5d083 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html @@ -103,32 +103,30 @@ require("../components/HumanInput.tag.html"); <!-- Show votes --> <div class="voters"> <div each="{vote, index in poll.votes}" class="row"> - <div class="c-input-group vote-edition"> + <div class="name {'separator-top' : index == 0}" title="{vote.voterName}"> + <div class="voter-name"> + <i class="fa fa-user-circle c-icon"/> + <span if="{!vote.anonymous}">{vote.voterName}</span> + <span if="{vote.anonymous}" class="anonymous-voter">{parent.__.anonymousVoter}</span> + </div> <button type="button" - class="c-button u-xsmall c-button--brand" + class="c-button c-button--rounded u-xsmall c-button--brand" if="{!poll.isClosed && vote.permission}" disabled="{voteInEdition != null}" onclick="{parent.onEditVote(vote)}"> <i class="fa fa-pencil-square-o"/> </button> <button type="button" - class="c-button u-xsmall c-button--error" + class="c-button c-button--rounded u-xsmall c-button--error" if="{poll.permission || !poll.isClosed && vote.permission}" disabled="{voteInEdition != null}" onclick="{parent.deleteVote(vote)}"> <i class="fa fa-trash"/> </button> </div> - <div class="name" title="{vote.voterName}"> - <i class="fa fa-user-circle c-icon"/> - <span class="voter-name"> - <span if="{!vote.anonymous}">{vote.voterName}</span> - <span if="{vote.anonymous}" class="anonymous-voter">{parent.__.anonymousVoter}</span> - </span> - </div> <div class="results"> <div each="{choice in poll.choices}" - class="result {'checkbox' : pollTypeCheckbox} {'selected' : pollTypeCheckbox && poll.getVoteValue(vote, choice) == 1}" + class="result {'separator-top' : index == 0} {'checkbox' : pollTypeCheckbox} {'selected' : pollTypeCheckbox && poll.getVoteValue(vote, choice) == 1}" title="{choice.choiceValue}"> <span if="{!pollTypeCheckbox}">{poll.getVoteValue(vote, choice)}</span> </div> @@ -454,31 +452,26 @@ require("../components/HumanInput.tag.html"); margin: 50px 0; } - .voters .row:first-of-type > :not(.vote-edition) { - border-top: 1px solid var(--separator); - } - .voters .row { display: flex; - width: 100%; + width: 95%; align-items: center; - padding: 0 100px 0 30px; - } - - .voters .vote-edition { - width: 70px; - height: 1.8em; - justify-content: right; - margin-right: 5px; } .voters .name { - width: 200px; + width: 250px; + display: flex; height: 2em; + padding: 0 5px; + border-bottom: 1px solid var(--separator); + border-left: 1px solid var(--separator); + border-right: 1px solid var(--separator); + overflow: hidden; + } + + .voters .voter-name { + flex-grow: 1; padding: 5px; - padding-right: 10px; - border: 1px solid var(--separator); - border-top: none; overflow: hidden; white-space:nowrap; text-overflow:ellipsis; @@ -489,6 +482,11 @@ require("../components/HumanInput.tag.html"); border-bottom-color: var(--brand); } + .voters .name button { + margin-left: 3px; + overflow: visible; + } + .voters .result { min-width: 15px; width: 100%; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.