summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2024-10-14 03:06:10 +0900
committerGitHub <noreply@github.com>2024-10-14 03:06:10 +0900
commitd0bb0b51f5ec8a9125ee768d75a1e8a9f76c6849 (patch)
tree7f3394fa2472de64a64d10ac40385cdf0121ef64 /packages/frontend/src/components
parentfix(frontend): 使用されているexposeを復活させる (#14764) (diff)
downloadmisskey-d0bb0b51f5ec8a9125ee768d75a1e8a9f76c6849.tar.gz
misskey-d0bb0b51f5ec8a9125ee768d75a1e8a9f76c6849.tar.bz2
misskey-d0bb0b51f5ec8a9125ee768d75a1e8a9f76c6849.zip
fix(frontend): タイムラインで、広告がない際にも広告のwrapperが出てしまうのを修正 (#14763)
Diffstat (limited to 'packages/frontend/src/components')
-rw-r--r--packages/frontend/src/components/MkDateSeparatedList.vue11
1 files changed, 9 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue
index 5976aa02f5..f04e5cf7c6 100644
--- a/packages/frontend/src/components/MkDateSeparatedList.vue
+++ b/packages/frontend/src/components/MkDateSeparatedList.vue
@@ -9,6 +9,7 @@ import MkAd from '@/components/global/MkAd.vue';
import { isDebuggerEnabled, stackTraceInstances } from '@/debug.js';
import { i18n } from '@/i18n.js';
import * as os from '@/os.js';
+import { instance } from '@/instance.js';
import { defaultStore } from '@/store.js';
import { MisskeyEntity } from '@/types/date-separated-list.js';
@@ -99,10 +100,10 @@ export default defineComponent({
return [el, separator];
} else {
- if (props.ad && item._shouldInsertAd_) {
+ if (props.ad && instance.ads.length > 0 && item._shouldInsertAd_) {
return [h('div', {
key: item.id + ':ad',
- style: 'padding: 8px; background-size: auto auto; background-image: repeating-linear-gradient(45deg, transparent, transparent 8px, var(--MI_THEME-bg) 8px, var(--MI_THEME-bg) 14px );',
+ class: $style['ad-wrapper'],
}, [h(MkAd, {
prefer: ['horizontal', 'horizontal-big'],
})]), el];
@@ -255,5 +256,11 @@ export default defineComponent({
.date-2-icon {
margin-left: 8px;
}
+
+.ad-wrapper {
+ padding: 8px;
+ background-size: auto auto;
+ background-image: repeating-linear-gradient(45deg, transparent, transparent 8px, var(--MI_THEME-bg) 8px, var(--MI_THEME-bg) 14px);
+}
</style>