diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-07-29 23:59:45 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-07-29 23:59:45 +0900 |
| commit | b1e6a33d6b7d24ee8bb21bf2b01e5ffc3f6dc931 (patch) | |
| tree | d090bd907e13f7cb76d2d3b7f3bbeab58ae51958 /src/client/ui | |
| parent | Improve usability (diff) | |
| download | sharkey-b1e6a33d6b7d24ee8bb21bf2b01e5ffc3f6dc931.tar.gz sharkey-b1e6a33d6b7d24ee8bb21bf2b01e5ffc3f6dc931.tar.bz2 sharkey-b1e6a33d6b7d24ee8bb21bf2b01e5ffc3f6dc931.zip | |
tweak style
Diffstat (limited to 'src/client/ui')
| -rw-r--r-- | src/client/ui/chat/date-separated-list.vue | 22 | ||||
| -rw-r--r-- | src/client/ui/chat/index.vue | 9 | ||||
| -rw-r--r-- | src/client/ui/chat/notes.vue | 2 |
3 files changed, 26 insertions, 7 deletions
diff --git a/src/client/ui/chat/date-separated-list.vue b/src/client/ui/chat/date-separated-list.vue index bc7fc91d38..12638cd230 100644 --- a/src/client/ui/chat/date-separated-list.vue +++ b/src/client/ui/chat/date-separated-list.vue @@ -1,17 +1,23 @@ <script lang="ts"> -import { defineComponent, h, TransitionGroup } from 'vue'; +import { defineComponent, h, PropType, TransitionGroup } from 'vue'; +import MkAd from '@client/components/global/ad.vue'; export default defineComponent({ props: { items: { - type: Array, + type: Array as PropType<{ id: string; createdAt: string; _shouldInsertAd_: boolean; }[]>, required: true, }, reversed: { type: Boolean, required: false, default: false - } + }, + ad: { + type: Boolean, + required: false, + default: false + }, }, methods: { @@ -66,7 +72,15 @@ export default defineComponent({ return [el, separator]; } else { - return el; + if (this.ad && item._shouldInsertAd_) { + return [h(MkAd, { + class: 'a', // advertiseの意(ブロッカー対策) + key: item.id + ':ad', + prefer: ['horizontal', 'horizontal-big'], + }), el]; + } else { + return el; + } } })); }, diff --git a/src/client/ui/chat/index.vue b/src/client/ui/chat/index.vue index fed2b803b7..6e433de126 100644 --- a/src/client/ui/chat/index.vue +++ b/src/client/ui/chat/index.vue @@ -55,6 +55,7 @@ <MkA to="/my/favorites" class="item"><i class="fas fa-star icon"></i>{{ $ts.favorites }}</MkA> </div> </div> + <MkAd class="a" prefer="square"/> </div> <footer class="footer"> <div class="left"> @@ -351,7 +352,7 @@ export default defineComponent({ flex-direction: column; width: 250px; height: 100vh; - border-right: solid 0.5px var(--divider); + border-right: solid 4px var(--divider); > .header, > .footer { $padding: 8px; @@ -498,6 +499,10 @@ export default defineComponent({ } } } + + > .a { + margin: 12px; + } } } @@ -591,7 +596,7 @@ export default defineComponent({ > .side { width: 350px; - border-left: solid 0.5px var(--divider); + border-left: solid 4px var(--divider); &.widgets.sideViewOpening { @media (max-width: 1400px) { diff --git a/src/client/ui/chat/notes.vue b/src/client/ui/chat/notes.vue index 3ced6d8b3c..6690baf584 100644 --- a/src/client/ui/chat/notes.vue +++ b/src/client/ui/chat/notes.vue @@ -16,7 +16,7 @@ </MkButton> </div> - <XList ref="notes" :items="notes" v-slot="{ item: note }" :direction="reversed ? 'up' : 'down'" :reversed="reversed"> + <XList ref="notes" :items="notes" v-slot="{ item: note }" :direction="reversed ? 'up' : 'down'" :reversed="reversed" :ad="true"> <XNote :note="note" @update:note="updated(note, $event)" :key="note._featuredId_ || note._prId_ || note.id"/> </XList> |