github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 23:48:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: make it easier to collapse the timeline from fullscreen

Browse Source
This commit is contained in:
Sam 2016-10-20 10:14:53 +11:00
parent 7f58ffb196
commit 9457b03da1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,8 @@ export default Ember.Component.extend({
_expanded() { _expanded() {
if (this.get('info.topicProgressExpanded')) { if (this.get('info.topicProgressExpanded')) {
$(window).on('click.hide-fullscreen', (e) => { $(window).on('click.hide-fullscreen', (e) => {
if (!$(e.target).parents().is('.timeline-container, #topic-progress-wrapper')) { if ( $(e.target).is('.topic-timeline') ||
!$(e.target).parents().is('.timeline-container, #topic-progress-wrapper')) {
this._collapseFullscreen(); this._collapseFullscreen();
} }
}); });

3
app/assets/stylesheets/common/topic-timeline.scss
View File

@ -46,6 +46,9 @@
border-top: 1px solid dark-light-choose(scale-color($primary, $lightness: 90%), scale-color($secondary, $lightness: 90%)); border-top: 1px solid dark-light-choose(scale-color($primary, $lightness: 90%), scale-color($secondary, $lightness: 90%));
padding-top: 15px; padding-top: 15px;
z-index: 100000; z-index: 100000;
.timeline-scrollarea {
max-width: 200px;
}
.topic-timeline { .topic-timeline {
width: auto; width: auto;
margin-left: 1.5em; margin-left: 1.5em;