UX: Move wrench down, support longer reply button names
This commit is contained in:
parent
2f19eb4735
commit
6200d61f0a
|
@ -3,7 +3,7 @@ export default Ember.Component.extend({
|
|||
|
||||
_checkSize() {
|
||||
const width = $(window).width();
|
||||
this.set('showTimeline', width > 1012);
|
||||
this.set('showTimeline', width > 960);
|
||||
},
|
||||
|
||||
didInsertElement() {
|
||||
|
|
|
@ -224,25 +224,29 @@ export default createWidget('topic-timeline', {
|
|||
}
|
||||
|
||||
const { currentUser } = this;
|
||||
if (currentUser && currentUser.get('canManageTopic')) {
|
||||
if (currentUser.get('canManageTopic')) {
|
||||
controls.push(this.attach('topic-admin-menu-button', { topic }));
|
||||
}
|
||||
if (currentUser) {
|
||||
controls.push(this.attach('topic-notifications-button', { topic }));
|
||||
}
|
||||
|
||||
return [ h('div.timeline-controls', controls),
|
||||
this.attach('link', {
|
||||
className: 'start-date',
|
||||
rawLabel: timelineDate(createdAt),
|
||||
action: 'jumpTop'
|
||||
}),
|
||||
this.attach('timeline-scrollarea', attrs),
|
||||
this.attach('link', {
|
||||
className: 'now-date',
|
||||
icon: 'dot-circle-o',
|
||||
rawLabel: relativeAge(new Date(topic.last_posted_at), { addAgo: true, defaultFormat: timelineDate }),
|
||||
action: 'jumpBottom'
|
||||
}) ];
|
||||
const rawLabel = relativeAge(new Date(topic.last_posted_at), { addAgo: true, defaultFormat: timelineDate });
|
||||
const result = [ h('div.timeline-controls', controls),
|
||||
this.attach('link', {
|
||||
className: 'start-date',
|
||||
rawLabel: timelineDate(createdAt),
|
||||
action: 'jumpTop'
|
||||
}),
|
||||
this.attach('timeline-scrollarea', attrs),
|
||||
this.attach('link', {
|
||||
className: 'now-date',
|
||||
icon: 'dot-circle-o',
|
||||
rawLabel,
|
||||
action: 'jumpBottom'
|
||||
}) ];
|
||||
|
||||
if (currentUser && currentUser.get('canManageTopic')) {
|
||||
result.push(h('div.timeline-footer-controls', this.attach('topic-admin-menu-button', { topic })));
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
});
|
||||
|
|
|
@ -15,10 +15,15 @@
|
|||
|
||||
.topic-timeline {
|
||||
margin-left: 3em;
|
||||
width: 200px;
|
||||
width: 150px;
|
||||
|
||||
.timeline-footer-controls {
|
||||
margin-top: 1em;
|
||||
}
|
||||
|
||||
.timeline-controls {
|
||||
margin-bottom: 2em;
|
||||
line-height: 2.5em;
|
||||
|
||||
button {
|
||||
margin-right: 0.5em;
|
||||
|
|
Loading…
Reference in New Issue