aboutsummaryrefslogtreecommitdiff
path: root/src/components/timeline
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2021-03-17 08:17:23 +0000
committerShpuld Shpludson <shp@cock.li>2021-03-17 08:17:23 +0000
commitd57ee274de37a695c080279544defd2243ab9f51 (patch)
treef091d72a2aa2f724ec2cad0add5fca4c94832760 /src/components/timeline
parentd262f208dca88c22a5428c4359156856757de016 (diff)
parent8163c7b55bbc66a2455777025c29e7f9015497e0 (diff)
Merge branch 'feat/notification-quick-filters' into 'develop'
Add quick filters for notifications See merge request pleroma/pleroma-fe!1364
Diffstat (limited to 'src/components/timeline')
-rw-r--r--src/components/timeline/timeline_quick_settings.js4
-rw-r--r--src/components/timeline/timeline_quick_settings.vue8
2 files changed, 2 insertions, 10 deletions
diff --git a/src/components/timeline/timeline_quick_settings.js b/src/components/timeline/timeline_quick_settings.js
index 9ec1a007..eae65a55 100644
--- a/src/components/timeline/timeline_quick_settings.js
+++ b/src/components/timeline/timeline_quick_settings.js
@@ -1,5 +1,4 @@
import Popover from '../popover/popover.vue'
-import BooleanSetting from '../settings_modal/helpers/boolean_setting.vue'
import { mapGetters } from 'vuex'
import { library } from '@fortawesome/fontawesome-svg-core'
import { faFilter, faFont, faWrench } from '@fortawesome/free-solid-svg-icons'
@@ -12,8 +11,7 @@ library.add(
const TimelineQuickSettings = {
components: {
- Popover,
- BooleanSetting
+ Popover
},
methods: {
setReplyVisibility (visibility) {
diff --git a/src/components/timeline/timeline_quick_settings.vue b/src/components/timeline/timeline_quick_settings.vue
index 4ad2842b..94997c0d 100644
--- a/src/components/timeline/timeline_quick_settings.vue
+++ b/src/components/timeline/timeline_quick_settings.vue
@@ -6,7 +6,7 @@
>
<div
slot="content"
- class="timeline-settings-menu dropdown-menu"
+ class="dropdown-menu"
>
<div v-if="loggedIn">
<button
@@ -96,12 +96,6 @@
.dropdown-item {
margin: 0;
}
-
- .timeline-settings-menu {
- display: flex;
- min-width: 12em;
- flex-direction: column;
- }
}
</style>