From f31c94e2ea43fa36d2a0fc8742e0a52a0025b643 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 20 Mar 2020 18:11:39 +0900 Subject: [PATCH] wip --- src/client/app.vue | 6 ++-- src/client/components/date-separated-list.vue | 6 ---- src/client/components/notes.vue | 3 +- src/client/components/notifications.vue | 32 ++++--------------- src/client/components/post-form-dialog.vue | 3 +- src/client/components/post-form.vue | 1 - src/client/components/ui/button.vue | 1 - src/client/components/ui/container.vue | 1 + src/client/pages/messaging-room.message.vue | 1 - src/client/style.scss | 24 ++++++-------- src/client/themes/_dark.json5 | 3 +- src/client/themes/_light.json5 | 3 +- src/client/themes/lavender.json5 | 1 - src/client/widgets/notifications.vue | 7 +--- src/client/widgets/timeline.vue | 8 +---- 15 files changed, 29 insertions(+), 71 deletions(-) diff --git a/src/client/app.vue b/src/client/app.vue index 48df0b9aa8..df571f824b 100644 --- a/src/client/app.vue +++ b/src/client/app.vue @@ -975,17 +975,18 @@ export default Vue.extend({ > main { width: $main-width; min-width: $main-width; + box-shadow: 1px 0 0 0 var(--shadow), -1px 0 0 0 var(--shadow); @media (max-width: $side-hide-threshold) { min-width: 0; } > .content { - padding: 16px; + padding: 16px 0; box-sizing: border-box; @media (max-width: 500px) { - padding: 8px; + padding: 8px 0; } } @@ -1023,6 +1024,7 @@ export default Vue.extend({ > .widgets { box-sizing: border-box; + margin-left: var(--margin); @media (max-width: $side-hide-threshold) { display: none; diff --git a/src/client/components/date-separated-list.vue b/src/client/components/date-separated-list.vue index 53fd0a7c7f..10f6dea517 100644 --- a/src/client/components/date-separated-list.vue +++ b/src/client/components/date-separated-list.vue @@ -76,10 +76,6 @@ export default Vue.extend({ transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1); } - > .list-enter-active { - transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1), opacity 0.7s cubic-bezier(0.23, 1, 0.32, 1); - } - &[data-direction="up"] { > .list-enter { opacity: 0; @@ -109,8 +105,6 @@ export default Vue.extend({ line-height: 32px; text-align: center; font-size: 12px; - border-radius: 64px; - background: var(--dateLabelBg); color: var(--dateLabelFg); > span { diff --git a/src/client/components/notes.vue b/src/client/components/notes.vue index dc93c1f6c4..9bbde6293a 100644 --- a/src/client/components/notes.vue +++ b/src/client/components/notes.vue @@ -111,7 +111,8 @@ export default Vue.extend({ &.max-width_500px { > .notes { > ::v-deep *:not(:last-child) { - margin-bottom: var(--marginHalf); + //margin-bottom: var(--marginHalf); + margin-bottom: 0; } } } diff --git a/src/client/components/notifications.vue b/src/client/components/notifications.vue index ff6d63821f..f090dc6bc4 100644 --- a/src/client/components/notifications.vue +++ b/src/client/components/notifications.vue @@ -1,8 +1,8 @@ -
+
@@ -148,11 +148,5 @@ export default define({ flex-grow: 1; } } - - .tl { - padding: 8px; - background: var(--bg); - box-sizing: border-box; - } }