This is an automated email from the git hooks/post-receive script. New commit to branch feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 702d0f2050f457540e0c15ce3f618f7b603f26c3 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Feb 1 18:32:58 2017 +0100 quelques retouches de styles --- pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag | 16 ++++++++-------- pollen-ui-riot-js/src/main/web/tag/poll/PollComments.tag | 2 +- pollen-ui-riot-js/src/main/web/tag/poll/PollSettings.tag | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag index bfd4cba..e318032 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag @@ -15,33 +15,33 @@ require('./PollSettings.tag'); <div class="tab-header"> <div class="{selectedTab=='choices'?'tab-selected':'tab-not-selected'}"> <a href="#poll/{pollId}/choice{permission?'/' + permission : ''}"> - <i class="fa fa-thumbs-o-up"></i> {__.choices} ({choicesCount}) + <i class="fa fa-list-ol fa-15x"></i> {__.choices} ({choicesCount}) </a> </div> <div class="{selectedTab=='votes'?'tab-selected':'tab-not-selected'}"> <a href="#poll/{pollId}/vote{permission?'/' + permission : ''}"> - <i class="fa fa-thumbs-o-up fa-flip-horizontal"></i> {__.votes} ({votesCount}) + <i class="fa fa-thumbs-o-up fa-flip-horizontal fa-15x"></i> {__.votes} ({votesCount}) </a> </div> <div class="{selectedTab=='comments'?'tab-selected':'tab-not-selected'}"> <a href="#poll/{pollId}/comment{permission?'/' + permission : ''}"> - <i class="fa fa-comments-o"></i> {__.comments} ({commentsCount}) + <i class="fa fa-comments-o fa-15x"></i> {__.comments} ({commentsCount}) </a> </div> <div class="{selectedTab=='results'?'tab-selected':'tab-not-selected'}"> <a class="{withResults ? '' : 'block'}" href="{withResults?'#poll/' + pollId + '/result' + (permission? '/' + permission : ''):''}"> - <i class="fa fa-bar-chart-o"></i><span>{__.results}</span> + <i class="fa fa-trophy fa-15x"></i> {__.results} </a> </div> <div if="{poll.permission}" class="{selectedTab=='settings'?'tab-selected':'tab-not-selected'}"> <a href="#poll/{pollId}/settings{permission?'/' + permission : ''}"> - <i class="fa fa-gear"></i> {__.settings} + <i class="fa fa-gear fa-15x"></i> {__.settings} </a> </div> <div if="{poll.permission}" class="actions tab-not-selected"> <div class="actions-dropdown"> - <i class="fa fa-bars fa-2x mainColor"/> + <i class="fa fa-bars fa-15x mainColor"/> <div class="actions-dropdown-content"> <a if="{!poll.isClosed}" onclick="{closePoll}"><i class="link fa fa-close fa-15x"/> {__.closePoll}</a> @@ -188,13 +188,13 @@ require('./PollSettings.tag'); border-left: 1px solid #ddd; border-top: 1px solid #ddd; height: 42px; - padding: 12px 12px 12px; + padding: 6px 12px 12px; font-weight: bold; } .tab-not-selected { border-bottom: 1px solid #ddd; - padding: 12px 12px 12px; + padding: 6px 12px 12px; height: 42px; } diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/PollComments.tag b/pollen-ui-riot-js/src/main/web/tag/poll/PollComments.tag index 4a2d8fc..ba77c32 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/PollComments.tag +++ b/pollen-ui-riot-js/src/main/web/tag/poll/PollComments.tag @@ -8,7 +8,7 @@ require('./CommentPopup.tag'); </div> <div class="legend"> - {__.title} <a if="{comments.length > -1}" onclick="{toggleSort}"><i ref="sortOwner" + {__.title} <a if="{comments.length > 0}" onclick="{toggleSort}"> <i ref="sortOwner" class="fa fa-sort-amount-desc"></i></a> </div> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/PollSettings.tag b/pollen-ui-riot-js/src/main/web/tag/poll/PollSettings.tag index ba7af5a..4b5bc0e 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/PollSettings.tag +++ b/pollen-ui-riot-js/src/main/web/tag/poll/PollSettings.tag @@ -83,11 +83,11 @@ <a onclick="{scrollTo}" href="#Result">{__.nav_result}</a> <ul class="nav nav-stacked"> <li> - <a onclick="{scrollTo}" href="#Poll_resultVisibility">{__.nav_resultVisibility}</a> + <a onclick="{scrollTo}" href="#Result_visibility">{__.nav_resultVisibility}</a> </li> <li> <a onclick="{scrollTo}" - href="#Poll_continuousResult">{__.nav_continuousResult}</a> + href="#Result_continuous">{__.nav_continuousResult}</a> </li> </ul> </li> @@ -237,7 +237,7 @@ </div> <div id="Result" class="config-group"> <div class="config-header">{__.resultsConfiguration}</div> - <div id="Poll_resultVisibility"> + <div id="Result_visibility"> <div class="config-subheader">{__.nav_resultVisibility}<i class="fa fa-info-circle" onclick="{help}"></i></div> <div class="config-description"> @@ -257,7 +257,7 @@ </ul> </div> </div> - <div id="Poll_continuousResult"> + <div id="Result_continuous"> <div class="config-subheader">{__.nav_continuousResult}<i class="fa fa-info-circle" onclick="{help}"></i></div> <div class="config-description"> {__.continuousResult}</div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.