kredits/kredits-web
9
0
Fork 0
Code Issues 23 Pull Requests 1 Actions Releases 18 Activity

Improve layout, show contribution details #75

Merged
raucao merged 6 commits from feature/improve_layout into master 2018-06-22 20:27:00 +00:00
Conversation 8 Commits 6 Files Changed 10
+32 -12
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 32714efeb9 - Show all commits
app/components/proposal-list/template.hbs
+13 -9
View File
@@ -1,12 +1,16 @@
{{#each proposals as |proposal|}}
<li data-proposal-id={{proposal.id}}>
<span class="category {{proposal.kind}}">♥ ({{proposal.kind}})</span>
<span class="recipient">{{proposal.contributor.name}}:</span>
<span class="description">{{proposal.description}}</span>
<span class="amount">{{proposal.amount}}</span><span class="symbol">₭S</span>
{{#unless proposal.isExecuted}}
<button {{action "confirm" proposal.id}}>+1</button>
{{/unless}}
<li data-proposal-id={{proposal.id}} title="{{proposal.description}}">
<p class="meta">
<span class="category {{proposal.kind}}">♥ ({{proposal.kind}})</span>
<span class="recipient">{{proposal.contributor.name}}:</span>
<span class="amount">{{proposal.amount}}</span><span class="symbol">₭S</span>
<span class="votes">({{proposal.votesCount}}/{{proposal.votesNeeded}} votes)</span>
{{#unless proposal.isExecuted}}
<button {{action "confirm" proposal.id}}>+1</button>
{{/unless}}
</p>
<p class="description">
<span class="description">{{proposal.description}}</span>
</p>
</li>
{{/each}}
app/styles/components/_proposal-list.scss
+19 -3
View File
@@ -4,9 +4,8 @@ ul.proposal-list {
list-style: none;
li {
// display: block;
padding: 0 1.2rem;
line-height: 4.2rem;
display: block;
padding: 1rem 1.2rem;
background-color: rgba(255,255,255,0.1);
font-size: 1.2rem;
border-bottom: 1px solid rgba(255,255,255,0.2);
@@ -14,10 +13,27 @@ ul.proposal-list {
border-top: 1px solid rgba(255,255,255,0.2);
}
p {
margin: 0;
font-size: inherit;
line-height: 2rem;
&.meta {
margin-bottom: 0.5rem;
}
// &.description {
// line-height: 2rem;
// }
}
span {
font-size: inherit;
}
.description {
line-height: 1.4em;
}
.category {
color: $blue;
padding-right: 0.2rem;