Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Polish voting page - Closes #344 #384

Merged
merged 10 commits into from
Jun 12, 2017
Merged

Polish voting page - Closes #344 #384

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
99ddf40
Add md-primary class to the vote checkboxes in delegates components
yasharAyari Jun 9, 2017
50328b7
Highlight voted delegate row in blue
yasharAyari Jun 9, 2017
1b14fc5
Change 'Confirm vote' to 'Confirm' in vote dialog button
yasharAyari Jun 9, 2017
397afa5
Merge branch 'development' into 344-polish-voting-page
yasharAyari Jun 12, 2017
07b98fa
Merge branch 'development' into 344-polish-voting-page
reyraa Jun 12, 2017
e37af2b
Fix a minor bug in delegate component
yasharAyari Jun 12, 2017
1da0596
Merge branch 'development' into 344-polish-voting-page
yasharAyari Jun 12, 2017
78613e0
Merge branch '344-polish-voting-page' of https://github.com/LiskHQ/li…
yasharAyari Jun 12, 2017
4faa4e1
Reorder some classes in delegates.less to fix a bug
yasharAyari Jun 12, 2017
c908eec
Merge branch 'development' into 344-polish-voting-page
reyraa Jun 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/delegates/delegates.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ delegates {
background-color: rgb(255, 228, 220);
}
.pending {
background-color: #eaeae9;
background-color: rgb(204, 231, 236);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Highlight voted delegate row in blue (similarly to currently used red/green)

This was supposed to mean something else. Sorry that my description was ambiguous. Pending votes should stay gray, but not pending placed votes should be blue. That is the state when the checkbox is checked and (currently) the background is white.

Also, I personally find the blue you chose bit too greenish, I like more something like #d6f0ff

}

md-card-title {
Expand Down
2 changes: 1 addition & 1 deletion src/components/delegates/delegates.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ div.offline-hide
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}')
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')
Expand Down
2 changes: 1 addition & 1 deletion src/components/delegates/vote.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'}}