IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-01 21:19:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Move wrench down, support longer reply button names

Browse Source
This commit is contained in:
Robin Ward 2016-05-25 17:44:56 -04:00
parent 2f19eb4735
commit 6200d61f0a
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/topic-navigation.js.es6
View File

@ -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() {

38
app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
View File

@ -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;
}
});

7
app/assets/stylesheets/desktop/topic-timeline.scss
View File

@ -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;