Merge pull request #384 from LiskHQ/344-polish-voting-page

Polish voting page - Closes #344
LiskArchive · Jun 12, 2017 · e66c779 · e66c779
2 parents 6ac39f2 + c908eec
commit e66c779
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/components/delegates/delegates.less b/src/components/delegates/delegates.less
@@ -33,6 +33,9 @@ delegates {
   .downvote {
     background-color: rgb(255, 228, 220);
   }
+  .voted{
+    background-color: #d6f0ff;
+  }
   .pending {
     background-color: #eaeae9;
   }

diff --git a/src/components/delegates/delegates.pug b/src/components/delegates/delegates.pug
@@ -61,9 +61,9 @@ div.offline-hide
           tbody(md-body, infinite-scroll='$ctrl.showMore()', infinite-scroll-distance='1')
             tr(md-row, ng-if='!$ctrl.filteredDelegates.length && !$ctrl.loading')
               td(md-cell, colspan='6') No delegates found
-            tr(md-row, ng-repeat="delegate in ($ctrl.filteredDelegates = ($ctrl.delegates | filter : {username: search} )) | limitTo : $ctrl.delegatesDisplayedCount", ng-class='{"downvote": delegate.status.voted && !delegate.status.selected, "upvote": !delegate.status.voted && delegate.status.selected, "pending": delegate.status.pending}')
+            tr(md-row, ng-repeat="delegate in ($ctrl.filteredDelegates = ($ctrl.delegates | filter : {username: search} )) | limitTo : $ctrl.delegatesDisplayedCount", ng-class='{"downvote": delegate.status.voted && !delegate.status.selected, "upvote": !delegate.status.voted && delegate.status.selected, "pending": delegate.status.pending, "voted": delegate.status.voted && delegate.status.selected}')
               td(md-cell)
-                md-checkbox(ng-model='delegate.status.selected', ng-change='$ctrl.selectionChange(delegate)', ng-disabled='delegate.status.pending', aria-label='delegate selected for voting')
+                md-checkbox.md-primary(ng-model='delegate.status.selected', ng-change='$ctrl.selectionChange(delegate)', ng-disabled='delegate.status.pending', aria-label='delegate selected for voting')
               td(md-cell, ng-bind='delegate.rank')
               td(md-cell, ng-bind='delegate.username')
               td(md-cell, ng-bind='delegate.address')

diff --git a/src/components/delegates/vote.pug b/src/components/delegates/vote.pug
@@ -36,4 +36,4 @@ div.dialog-vote(aria-label='Vote for delegates')
     md-dialog-actions(layout='row')
       md-button(ng-click="$ctrl.$mdDialog.cancel()") Cancel
       span(flex)
-      md-button.md-primary.md-raised.submit-button(ng-disabled='!$ctrl.canVote()', ng-click="$ctrl.vote()") {{$ctrl.votingInProgress ? 'Voting...' : 'Confirm vote'}}
+      md-button.md-primary.md-raised.submit-button(ng-disabled='!$ctrl.canVote()', ng-click="$ctrl.vote()") {{$ctrl.votingInProgress ? 'Voting...' : 'Confirm'}}