diff --git a/src/renderer/components/TimelineSpace/Contents/Favourites.vue b/src/renderer/components/TimelineSpace/Contents/Favourites.vue index d44c2c06..9e75b9d7 100644 --- a/src/renderer/components/TimelineSpace/Contents/Favourites.vue +++ b/src/renderer/components/TimelineSpace/Contents/Favourites.vue @@ -18,7 +18,7 @@
-
+
@@ -41,6 +41,7 @@ export default { }, computed: { ...mapState({ + openSideBar: state => state.TimelineSpace.Contents.SideBar.openSideBar, backgroundColor: state => state.App.theme.background_color, startReload: state => state.TimelineSpace.HeaderMenu.reload, account: state => state.TimelineSpace.account, @@ -200,4 +201,10 @@ export default { bottom: 20px; right: 20px; } + +.upper-with-side-bar { + position: fixed; + bottom: 20px; + right: -webkit-calc(20px + 320px); +} diff --git a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue index d6b4b61f..c9e79c61 100644 --- a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue +++ b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue @@ -20,7 +20,7 @@
-
+
@@ -43,6 +43,7 @@ export default { }, computed: { ...mapState({ + openSideBar: state => state.TimelineSpace.Contents.SideBar.openSideBar, backgroundColor: state => state.App.theme.background_color, startReload: state => state.TimelineSpace.HeaderMenu.reload, timeline: state => state.TimelineSpace.Contents.Hashtag.Tag.timeline, @@ -257,5 +258,11 @@ export default { bottom: 20px; right: 20px; } + +.upper-with-side-bar { + position: fixed; + bottom: 20px; + right: -webkit-calc(20px + 320px); +} diff --git a/src/renderer/components/TimelineSpace/Contents/Home.vue b/src/renderer/components/TimelineSpace/Contents/Home.vue index 3bc2dd15..feb0ddda 100644 --- a/src/renderer/components/TimelineSpace/Contents/Home.vue +++ b/src/renderer/components/TimelineSpace/Contents/Home.vue @@ -21,7 +21,7 @@
-
+
@@ -43,6 +43,7 @@ export default { }, computed: { ...mapState({ + openSideBar: state => state.TimelineSpace.Contents.SideBar.openSideBar, backgroundColor: state => state.App.theme.background_color, startReload: state => state.TimelineSpace.HeaderMenu.reload, timeline: state => state.TimelineSpace.Contents.Home.timeline, @@ -227,6 +228,14 @@ export default { position: fixed; bottom: 20px; right: 20px; + transition: all 0.5s; + } + + .upper-with-side-bar { + position: fixed; + bottom: 20px; + right: -webkit-calc(20px + 320px); + transition: all 0.5s; } } diff --git a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue index 88db3aa7..f97cfd8b 100644 --- a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue +++ b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue @@ -20,7 +20,7 @@
-
+
@@ -43,6 +43,7 @@ export default { }, computed: { ...mapState({ + openSideBar: state => state.TimelineSpace.Contents.SideBar.openSideBar, backgroundColor: state => state.App.theme.background_color, startReload: state => state.TimelineSpace.HeaderMenu.reload, timeline: state => state.TimelineSpace.Contents.Lists.Show.timeline, @@ -256,5 +257,11 @@ export default { bottom: 20px; right: 20px; } + +.upper-with-side-bar { + position: fixed; + bottom: 20px; + right: -webkit-calc(20px + 320px); +} diff --git a/src/renderer/components/TimelineSpace/Contents/Local.vue b/src/renderer/components/TimelineSpace/Contents/Local.vue index f15e6dcc..00dac823 100644 --- a/src/renderer/components/TimelineSpace/Contents/Local.vue +++ b/src/renderer/components/TimelineSpace/Contents/Local.vue @@ -21,7 +21,7 @@
-
+
@@ -43,6 +43,7 @@ export default { }, computed: { ...mapState({ + openSideBar: state => state.TimelineSpace.Contents.SideBar.openSideBar, backgroundColor: state => state.App.theme.background_color, startReload: state => state.TimelineSpace.HeaderMenu.reload, timeline: state => state.TimelineSpace.Contents.Local.timeline, @@ -227,6 +228,12 @@ export default { bottom: 20px; right: 20px; } + + .upper-with-side-bar { + position: fixed; + bottom: 20px; + right: -webkit-calc(20px + 320px); + } } diff --git a/src/renderer/components/TimelineSpace/Contents/Notifications.vue b/src/renderer/components/TimelineSpace/Contents/Notifications.vue index e6502b28..7fe28d49 100644 --- a/src/renderer/components/TimelineSpace/Contents/Notifications.vue +++ b/src/renderer/components/TimelineSpace/Contents/Notifications.vue @@ -19,7 +19,7 @@
-
+
@@ -41,6 +41,7 @@ export default { }, computed: { ...mapState({ + openSideBar: state => state.TimelineSpace.Contents.SideBar.openSideBar, startReload: state => state.TimelineSpace.HeaderMenu.reload, backgroundColor: state => state.App.theme.background_color, notifications: state => state.TimelineSpace.Contents.Notifications.notifications, @@ -218,6 +219,12 @@ export default { bottom: 20px; right: 20px; } + + .upper-with-side-bar { + position: fixed; + bottom: 20px; + right: -webkit-calc(20px + 320px); + } } diff --git a/src/renderer/components/TimelineSpace/Contents/Public.vue b/src/renderer/components/TimelineSpace/Contents/Public.vue index e43cd22b..721ce5df 100644 --- a/src/renderer/components/TimelineSpace/Contents/Public.vue +++ b/src/renderer/components/TimelineSpace/Contents/Public.vue @@ -21,7 +21,7 @@
-
+
@@ -43,6 +43,7 @@ export default { }, computed: { ...mapState({ + openSideBar: state => state.TimelineSpace.Contents.SideBar.openSideBar, backgroundColor: state => state.App.theme.background_color, startReload: state => state.TimelineSpace.HeaderMenu.reload, timeline: state => state.TimelineSpace.Contents.Public.timeline, @@ -250,6 +251,12 @@ export default { bottom: 20px; right: 20px; } + + .upper-with-side-bar { + position: fixed; + bottom: 20px; + right: -webkit-calc(20px + 320px); + } }