From 986c4537021842e9b21c89c0ffb84033169cafe6 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 24 Aug 2022 22:31:48 +0300 Subject: use a bit more compact layout on mobile --- src/components/timeline/timeline.js | 14 ++++++-- src/components/timeline/timeline.scss | 16 +++++++++ src/components/timeline/timeline.vue | 61 ++++++++++++++++++++++++++--------- 3 files changed, 73 insertions(+), 18 deletions(-) (limited to 'src/components/timeline') diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 6fca869f..4eb63f84 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -1,4 +1,5 @@ import Status from '../status/status.vue' +import { mapState } from 'vuex' import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js' import Conversation from '../conversation/conversation.vue' import TimelineMenu from '../timeline_menu/timeline_menu.vue' @@ -6,11 +7,15 @@ import QuickFilterSettings from '../quick_filter_settings/quick_filter_settings. import QuickViewSettings from '../quick_view_settings/quick_view_settings.vue' import { debounce, throttle, keyBy } from 'lodash' import { library } from '@fortawesome/fontawesome-svg-core' -import { faCircleNotch, faCog } from '@fortawesome/free-solid-svg-icons' +import { faCircleNotch, faCirclePlus, faCog, faMinus, faArrowUp, faCheck } from '@fortawesome/free-solid-svg-icons' library.add( faCircleNotch, - faCog + faCog, + faMinus, + faArrowUp, + faCirclePlus, + faCheck ) const Timeline = { @@ -88,7 +93,10 @@ const Timeline = { }, virtualScrollingEnabled () { return this.$store.getters.mergedConfig.virtualScrolling - } + }, + ...mapState({ + mobileLayout: state => state.interface.layoutType === 'mobile', + }) }, created () { const store = this.$store diff --git a/src/components/timeline/timeline.scss b/src/components/timeline/timeline.scss index 9e009fd3..9d442a95 100644 --- a/src/components/timeline/timeline.scss +++ b/src/components/timeline/timeline.scss @@ -1,10 +1,26 @@ @import '../../_variables.scss'; .Timeline { + .alert-dot { + border-radius: 100%; + height: 8px; + width: 8px; + position: absolute; + left: calc(50% - 4px); + top: calc(50% - 4px); + margin-left: 6px; + margin-top: -6px; + background-color: var(--cBlue); + } + .loadmore-text { opacity: 1; } + .loadmore-button { + position: relative + } + &.-blocked { cursor: progress; } diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index a6bfeed1..f9f5bf92 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -8,22 +8,53 @@ type="button" @click="scrollToTop" > - - - -
- {{ $t('timeline.up_to_date') }} -
+ + -- cgit v1.2.3-70-g09d2