diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-07-27 21:37:32 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-07-27 21:37:32 +0900 |
| commit | f220e4183f184290982e7049cc45cb7a126332fe (patch) | |
| tree | 6f53ba463912674c1d2d9ca9d7a07f443d8b3a8e /src/client/ui | |
| parent | Update PULL_REQUEST_TEMPLATE.md (diff) | |
| download | misskey-f220e4183f184290982e7049cc45cb7a126332fe.tar.gz misskey-f220e4183f184290982e7049cc45cb7a126332fe.tar.bz2 misskey-f220e4183f184290982e7049cc45cb7a126332fe.zip | |
:art:
Diffstat (limited to 'src/client/ui')
| -rw-r--r-- | src/client/ui/deck/widgets-column.vue | 2 | ||||
| -rw-r--r-- | src/client/ui/default.vue | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/client/ui/deck/widgets-column.vue b/src/client/ui/deck/widgets-column.vue index 69aaaffa88..22b1a38287 100644 --- a/src/client/ui/deck/widgets-column.vue +++ b/src/client/ui/deck/widgets-column.vue @@ -64,7 +64,7 @@ export default defineComponent({ <style lang="scss" scoped> .wtdtxvec { --margin: 8px; - --panelShadow: none; + --panelBorder: none; padding: 0 var(--margin); } diff --git a/src/client/ui/default.vue b/src/client/ui/default.vue index 5e79cd3830..d257b048d0 100644 --- a/src/client/ui/default.vue +++ b/src/client/ui/default.vue @@ -143,7 +143,7 @@ export default defineComponent({ }, attachSticky(ref) { - const sticky = new StickySidebar(this.$refs[ref], this.$store.state.menuDisplay === 'top' ? 1 : 16, this.$store.state.menuDisplay === 'top' ? 60 : 0); // TODO: ヘッダーの高さを60pxと決め打ちしているのを直す + const sticky = new StickySidebar(this.$refs[ref], this.$store.state.menuDisplay === 'top' ? 0 : 16, this.$store.state.menuDisplay === 'top' ? 60 : 0); // TODO: ヘッダーの高さを60pxと決め打ちしているのを直す window.addEventListener('scroll', () => { sticky.calc(window.scrollY); }, { passive: true }); @@ -230,8 +230,6 @@ export default defineComponent({ $widgets-hide-threshold: 1200px; $nav-icon-only-width: 78px; // TODO: どこかに集約したい - --panelShadow: 0 0 0 1px var(--divider); - // ほんとは単に 100vh と書きたいところだが... https://css-tricks.com/the-trick-to-viewport-units-on-mobile/ min-height: calc(var(--vh, 1vh) * 100); box-sizing: border-box; @@ -290,7 +288,6 @@ export default defineComponent({ width: 750px; margin: 0 16px 0 0; background: var(--bg); - box-shadow: 0 0 0 1px var(--divider); border-radius: 0; --margin: 12px; @@ -321,7 +318,7 @@ export default defineComponent({ } > .widgets { - //--panelShadow: none; + //--panelBorder: none; width: 300px; margin-top: 16px; @@ -342,14 +339,13 @@ export default defineComponent({ --globalHeaderHeight: 60px; // TODO: 60pxと決め打ちしているのを直す > .main { - margin-top: 1px; + margin-top: 0; border-radius: var(--radius); - box-shadow: 0 0 0 1px var(--divider); } > .widgets { --stickyTop: var(--globalHeaderHeight); - margin-top: 1px; + margin-top: 0; } } |