summaryrefslogtreecommitdiff
path: root/src/client/components
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-03-20 18:11:39 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-03-20 18:11:39 +0900
commitf31c94e2ea43fa36d2a0fc8742e0a52a0025b643 (patch)
treee48e372ddaac8514cada36f165bf921f313971a4 /src/client/components
parentFix bug (diff)
downloadsharkey-f31c94e2ea43fa36d2a0fc8742e0a52a0025b643.tar.gz
sharkey-f31c94e2ea43fa36d2a0fc8742e0a52a0025b643.tar.bz2
sharkey-f31c94e2ea43fa36d2a0fc8742e0a52a0025b643.zip
wip
Diffstat (limited to 'src/client/components')
-rw-r--r--src/client/components/date-separated-list.vue6
-rw-r--r--src/client/components/notes.vue3
-rw-r--r--src/client/components/notifications.vue32
-rw-r--r--src/client/components/post-form-dialog.vue3
-rw-r--r--src/client/components/post-form.vue1
-rw-r--r--src/client/components/ui/button.vue1
-rw-r--r--src/client/components/ui/container.vue1
7 files changed, 11 insertions, 36 deletions
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 @@
<template>
-<div class="mk-notifications" :class="{ page }">
+<div class="mk-notifications">
<x-list class="notifications" :items="items" v-slot="{ item: notification }">
<x-note v-if="['reply', 'quote', 'mention'].includes(notification.type)" :note="notification.note" :key="notification.id"/>
- <x-notification v-else :notification="notification" :with-time="true" :full="true" class="notification" :class="{ _panel: page }" :key="notification.id"/>
+ <x-notification v-else :notification="notification" :with-time="true" :full="true" class="_panel notification" :key="notification.id"/>
</x-list>
<button class="more _button" v-if="more" @click="fetchMore" :disabled="moreFetching">
@@ -43,11 +43,6 @@ export default Vue.extend({
type: String,
required: false
},
- page: {
- type: Boolean,
- required: false,
- default: false
- }
},
data() {
@@ -94,25 +89,10 @@ export default Vue.extend({
<style lang="scss" scoped>
.mk-notifications {
- &.page {
- > .notifications {
- > ::v-deep * {
- margin-bottom: var(--margin);
- }
- }
- }
-
- &:not(.page) {
- > .notifications {
- > ::v-deep * {
- margin-bottom: 8px;
- }
-
- > .notification {
- background: var(--panel);
- border-radius: 6px;
- box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
- }
+ > .notifications {
+ > ::v-deep * {
+ //margin-bottom: var(--margin);
+ margin-bottom: 0;
}
}
diff --git a/src/client/components/post-form-dialog.vue b/src/client/components/post-form-dialog.vue
index b6531474cf..9cb527af23 100644
--- a/src/client/components/post-form-dialog.vue
+++ b/src/client/components/post-form-dialog.vue
@@ -17,7 +17,8 @@
:initial-note="initialNote"
:instant="instant"
@posted="onPosted"
- @cancel="onCanceled"/>
+ @cancel="onCanceled"
+ style="border-radius: var(--radius);"/>
</transition>
</div>
</div>
diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue
index 2d35cfe167..7b84938d5a 100644
--- a/src/client/components/post-form.vue
+++ b/src/client/components/post-form.vue
@@ -586,7 +586,6 @@ export default Vue.extend({
<style lang="scss" scoped>
.gafaadew {
background: var(--panel);
- border-radius: var(--radius);
> header {
z-index: 1000;
diff --git a/src/client/components/ui/button.vue b/src/client/components/ui/button.vue
index 5264224c18..15289c820e 100644
--- a/src/client/components/ui/button.vue
+++ b/src/client/components/ui/button.vue
@@ -124,7 +124,6 @@ export default Vue.extend({
&.primary {
color: #fff;
background: var(--accent);
- box-shadow: 0 6px 16px var(--accentShadow);
&:not(:disabled):hover {
background: var(--jkhztclx);
diff --git a/src/client/components/ui/container.vue b/src/client/components/ui/container.vue
index 4e7c9420ab..9d5abdf2dd 100644
--- a/src/client/components/ui/container.vue
+++ b/src/client/components/ui/container.vue
@@ -110,6 +110,7 @@ export default Vue.extend({
> header {
position: relative;
box-shadow: 0 1px 0 0 var(--divider);
+ z-index: 1;
> .title {
margin: 0;