Skip to content

Commit c636033

Browse files
committed
Fix conversation list timestamps to update; fix some CSS
1 parent 51bf8e7 commit c636033

6 files changed

Lines changed: 12 additions & 5 deletions

File tree

app/styles/shared/conversation.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
text-align: center;
4747

4848
p {
49+
display: flex;
50+
justify-content: center;
4951
margin: 0.5em 0;
5052
}
5153
}
@@ -63,6 +65,11 @@
6365
&__categories {
6466
display: flex;
6567
justify-content: center;
68+
69+
li {
70+
display: inline-block;
71+
margin: 0 5px 5px 5px;
72+
}
6673
}
6774
}
6875

app/templates/components/conversations/conversation-list-item-with-project.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</strong>
1010
</p>
1111
<p data-test-updated-at class="conversation-list-item__timestamp">
12-
{{moment-from-now conversation.updatedAt}}
12+
{{moment-from-now conversation.updatedAt interval=60000}}
1313
</p>
1414
</div>
1515
{{/link-to}}

app/templates/components/conversations/conversation-list-item-with-user.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{{conversation.user.username}}
1717
</p>
1818
<p data-test-updated-at class="conversation-list-item__timestamp">
19-
{{moment-from-now conversation.updatedAt}}
19+
{{moment-from-now conversation.updatedAt interval=60000}}
2020
</p>
2121
{{#if (eq conversation.status 'open')}}
2222
{{!-- bubbles=false to prevent bubbling to wrapping link-to element --}}

app/templates/components/project-users.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<h4>Contributors<span>{{count}}</span></h4>
1+
<h4>People <span>{{count}}</span></h4>
22
<ul>
33
{{#each (slice 0 15 users) as |user|}}
44
<li>

app/templates/team.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</div>
2727
<div class="team-section contributors">
2828
<div class="team-section-header">
29-
<h2>Our Contributors</h2>
29+
<h2>Our Volunteers</h2>
3030
<h3>People who are giving their time and talent to help us build the future. Thanks to all of you!</h3>
3131
</div>
3232
<ul>

tests/acceptance/team-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test('visiting /team', function(assert) {
1111
assert.equal(currentURL(), '/team');
1212
assert.equal(teamPage.company.header, 'Our Team');
1313
assert.equal(teamPage.company.items().count, 3);
14-
assert.equal(teamPage.contributors.header, 'Our Contributors');
14+
assert.equal(teamPage.contributors.header, 'Our Volunteers');
1515
assert.equal(teamPage.contributors.items().count, 29);
1616
});
1717
});

0 commit comments

Comments
 (0)