diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-10-12 11:28:58 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-10-12 11:28:58 +0900 |
| commit | c4c69cd267012158d456be0852e9e51e62874848 (patch) | |
| tree | 724fbc27bb61aa3abea5e434582368df0b94b78e /packages/frontend/src/components | |
| parent | refactor: MkStickyContainerで<style />を使う (#14755) (diff) | |
| download | misskey-c4c69cd267012158d456be0852e9e51e62874848.tar.gz misskey-c4c69cd267012158d456be0852e9e51e62874848.tar.bz2 misskey-c4c69cd267012158d456be0852e9e51e62874848.zip | |
:art:
Diffstat (limited to 'packages/frontend/src/components')
| -rw-r--r-- | packages/frontend/src/components/MkDateSeparatedList.vue | 6 | ||||
| -rw-r--r-- | packages/frontend/src/components/global/MkAd.vue | 18 |
2 files changed, 10 insertions, 14 deletions
diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue index a8a32e8bc7..5976aa02f5 100644 --- a/packages/frontend/src/components/MkDateSeparatedList.vue +++ b/packages/frontend/src/components/MkDateSeparatedList.vue @@ -100,10 +100,12 @@ export default defineComponent({ return [el, separator]; } else { if (props.ad && item._shouldInsertAd_) { - return [h(MkAd, { + 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 );', + }, [h(MkAd, { prefer: ['horizontal', 'horizontal-big'], - }), el]; + })]), el]; } else { return el; } diff --git a/packages/frontend/src/components/global/MkAd.vue b/packages/frontend/src/components/global/MkAd.vue index 1eded847ef..792a087148 100644 --- a/packages/frontend/src/components/global/MkAd.vue +++ b/packages/frontend/src/components/global/MkAd.vue @@ -30,12 +30,10 @@ SPDX-License-Identifier: AGPL-3.0-only </component> </div> <div v-else :class="$style.menu"> - <div :class="$style.menuContainer"> - <div>Ads by {{ host }}</div> - <!--<MkButton class="button" primary>{{ i18n.ts._ad.like }}</MkButton>--> - <MkButton v-if="chosen.ratio !== 0" :class="$style.menuButton" @click="reduceFrequency">{{ i18n.ts._ad.reduceFrequencyOfThisAd }}</MkButton> - <button class="_textButton" @click="toggleMenu">{{ i18n.ts._ad.back }}</button> - </div> + <div>Ads by {{ host }}</div> + <!--<MkButton class="button" primary>{{ i18n.ts._ad.like }}</MkButton>--> + <MkButton v-if="chosen.ratio !== 0" :class="$style.menuButton" @click="reduceFrequency">{{ i18n.ts._ad.reduceFrequencyOfThisAd }}</MkButton> + <button class="_textButton" @click="toggleMenu">{{ i18n.ts._ad.back }}</button> </div> </div> <div v-else></div> @@ -123,8 +121,7 @@ function reduceFrequency(): void { <style lang="scss" module> .root { - background-size: auto auto; - background-image: repeating-linear-gradient(45deg, transparent, transparent 8px, var(--MI_THEME-bg) 8px, var(--MI_THEME-bg) 14px ); + } .main { @@ -202,14 +199,11 @@ function reduceFrequency(): void { } .menu { - padding: 8px; text-align: center; -} - -.menuContainer { padding: 8px; margin: 0 auto; max-width: 400px; + background: var(--MI_THEME-panel); border: solid 1px var(--MI_THEME-divider); } |