diff --git a/plugins/poll/assets/javascripts/controllers/poll.js.es6 b/plugins/poll/assets/javascripts/controllers/poll.js.es6 index a948ad3cb0a..cfbd9b862f0 100644 --- a/plugins/poll/assets/javascripts/controllers/poll.js.es6 +++ b/plugins/poll/assets/javascripts/controllers/poll.js.es6 @@ -77,9 +77,7 @@ export default Em.Controller.extend({ }.property("min", "max", "poll.options.length"), canCastVotes: function() { - if (this.get("isClosed") || - this.get("showingResults") || - this.get("loading")) { + if (this.get("isClosed") || this.get("showingResults") || this.get("loading")) { return false; } @@ -137,7 +135,7 @@ export default Em.Controller.extend({ options: this.get("selectedOptions"), } }).then(function(results) { - self.setProperties({ vote: results.vote, showingResults: true }); + self.setProperties({ vote: results.vote, showResults: true }); self.set("model", Em.Object.create(results.poll)); }).catch(function() { bootbox.alert(I18n.t("poll.error_while_casting_votes")); diff --git a/plugins/poll/assets/stylesheets/poll.scss b/plugins/poll/assets/stylesheets/poll.scss index 74982c5b439..ad35ea9a968 100644 --- a/plugins/poll/assets/stylesheets/poll.scss +++ b/plugins/poll/assets/stylesheets/poll.scss @@ -68,6 +68,8 @@ div.poll { .results { + width: 100%; + .option { max-width: 90%; padding-right: 1.6em; @@ -88,7 +90,6 @@ div.poll { .bar { height: 10px; background: $primary; - transition: all 0.25s; } }