(fix) Visual feedback from pull request.

This commit is contained in:
Gabriel Rodriguez Alsina 2018-08-09 11:16:29 -03:00
parent 51bed94e38
commit d97772e303
10 changed files with 33 additions and 13 deletions

View File

@ -39,7 +39,7 @@ class App extends Component {
icon: 'link-icon-add',
title: 'New Ballot',
url: `${commonStore.rootPath}/new`,
class: 'btn btn-new-ballot btn-success btn-new no-shadow'
class: 'btn btn-new-ballot btn-success btn-new no-shadow text-capitalize'
}
// {
// 'icon': '',

File diff suppressed because one or more lines are too long

View File

@ -61,6 +61,8 @@ textarea {
}
&.btn-load-more {
background-image: url('#{ $base-images-path }/icons/icon-load-more.svg');
font-size: 16px;
font-weight: 400;
@include btn-background-properties();
.sokol & {
background-image: url('#{ $base-images-path }/icons/icon-load-more-sokol.svg');

View File

@ -2,7 +2,7 @@ $padding-left-items: 25px;
.info-container {
background-color: #f8f8f8;
margin-bottom: 20px;
margin-bottom: 30px;
margin-left: -#{ $desktop-indent };
margin-right: -#{ $desktop-indent };
padding-bottom: #{ $desktop-indent };
@ -54,10 +54,13 @@ $padding-left-items: 25px;
}
.toggle-show {
color: #333;
color: $primary-color;
cursor: pointer;
display: inline-block;
margin-left: 5px;
.sokol & {
color: $primary-color-sokol;
}
}
}

View File

@ -3,7 +3,7 @@
border-radius: 5px;
clear: left;
height: 10px;
margin-top: 32px;
margin-top: 34px;
overflow: hidden;
&-not-finalized {

View File

@ -71,8 +71,12 @@
&.ballots-about-td-value {
color: #333;
font-size: 14px;
padding-left: 5px;
padding-right: 5px;
.ballots-about-i_action &,
.ballots-about-i_type & {
text-transform: capitalize;
}
@media screen and (max-width: $tablet-width) {
padding-left: 0;
padding-right: 0;

View File

@ -8,6 +8,11 @@
margin-bottom: $mobile-indent;
}
}
&-about {
margin-top: -8px;
}
&-i {
@extend %white-block;
background-color: #fff;
@ -30,7 +35,7 @@
&-column {
display: flex;
justify-content: space-between;
width: 48%;
width: 47.5%;
@media screen and (max-width: $tablet-width) {
overflow: hidden;
width: 100%;
@ -68,11 +73,13 @@
}
&_no,
&_yes {
line-height: 44px;
min-width: 55px;
text-transform: capitalize;
@media screen and (max-width: $tablet-width) {
float: left;
margin-left: 0;
margin-right: 15px;
min-width: 51px;
}
}
}

View File

@ -36,7 +36,7 @@ $footer-height_desktop: 66px;
$footer-height_mobile: 132px;
// misc
$desktop-indent: 20px;
$desktop-indent: 30px;
$tablet-indent: 15px;
$mobile-indent: 10px;

View File

@ -451,7 +451,7 @@ export class BallotCard extends React.Component {
No
</button>
<div className="vote-scale--container">
<p className="vote-scale--votes">Votes: {this.votesAgainstNumber}</p>
<p className="vote-scale--votes">{this.votesAgainstNumber} Votes</p>
<p className="vote-scale--percentage">{this.votesAgainstPercents}%</p>
<div className={voteScaleClass}>
<div
@ -463,7 +463,7 @@ export class BallotCard extends React.Component {
</div>
<div className="ballots-i-scale-column">
<div className="vote-scale--container">
<p className="vote-scale--votes">Votes: {this.votesForNumber}</p>
<p className="vote-scale--votes">{this.votesForNumber} Votes</p>
<p className="vote-scale--percentage">{this.votesForPercents}%</p>
<div className={voteScaleClass}>
<div className="vote-scale--fill vote-scale--fill_no" style={{ width: `${this.votesForPercents}%` }} />

View File

@ -143,7 +143,11 @@ export class Ballots extends React.Component {
if (ballotCards.length > this.limit && !commonStore.isActiveFilter && !commonStore.isToFinalizeFilter) {
loadMoreButton = (
<div className="center">
<button type="button" className="btn btn-transparent btn-load-more" onClick={e => this.onClick(e)}>
<button
type="button"
className="btn btn-transparent btn-load-more text-capitalize"
onClick={e => this.onClick(e)}
>
Load More Ballots
</button>
</div>