Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: restyle poll buttons

This commit is contained in:
Sam 2014-08-23 10:50:45 +10:00
parent af71307363
commit 244323d218
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/poll/assets/javascripts/discourse/templates/poll.js.handlebars
View File

@ -14,7 +14,8 @@
{{/each}} {{/each}}
</table> </table>
<button {{action toggleShowResults}} class="btn btn-small"> <div class='row'>
<button {{action toggleShowResults}} class="btn btn-small show-results">
{{#if showResults}} {{#if showResults}}
<i class="fa fa-eye-slash"></i> <i class="fa fa-eye-slash"></i>
{{i18n poll.results.hide}} {{i18n poll.results.hide}}
@ -25,7 +26,7 @@
</button> </button>
{{#if showToggleClosePoll}} {{#if showToggleClosePoll}}
<button {{action toggleClosePoll}} class="btn btn-small"> <button {{action toggleClosePoll}} class="btn btn-small toggle-poll">
{{#if poll.closed}} {{#if poll.closed}}
<i class="fa fa-unlock-alt"></i> <i class="fa fa-unlock-alt"></i>
{{i18n poll.open_poll}} {{i18n poll.open_poll}}
@ -35,6 +36,7 @@
{{/if}} {{/if}}
</button> </button>
{{/if}} {{/if}}
</div>
{{#if loading}} {{#if loading}}
<i class="fa fa-spin fa-spinner"></i> <i class="fa fa-spin fa-spinner"></i>

9
plugins/poll/plugin.rb
View File

@ -158,8 +158,9 @@ register_css <<CSS
cursor: pointer; cursor: pointer;
} }
.poll-ui button:first-of-type { .poll-ui .row {
margin-left: 20px; padding-left: 15px;
padding-top: 10px;
} }
@ -192,4 +193,8 @@ register_css <<CSS
margin-right: 0px; margin-right: 0px;
} }
.poll-ui .toggle-poll {
float: right;
}
CSS CSS