Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
syuilo 2021-05-04 23:12:53 +09:00
parent cdef5cd1ad 1a8f41010e
commit b6c9ab0c15
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "misskey", "name": "misskey",
"author": "syuilo <syuilotan@yahoo.co.jp>", "author": "syuilo <syuilotan@yahoo.co.jp>",
"version": "12.80.0", "version": "12.80.1",
"codename": "indigo", "codename": "indigo",
"repository": { "repository": {
"type": "git", "type": "git",

4
src/client/components/date-separated-list.vue
View file

@ -105,6 +105,10 @@ export default defineComponent({
<style lang="scss"> <style lang="scss">
.sqadhkmv { .sqadhkmv {
> *:empty {
display: none;
}
> *:not(:last-child) { > *:not(:last-child) {
margin-bottom: var(--margin); margin-bottom: var(--margin);
} }

7
src/client/components/global/ad.vue
View file

@ -14,6 +14,7 @@
</div> </div>
</div> </div>
</div> </div>
<div v-else></div>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -32,7 +33,7 @@ export default defineComponent({
type: String, type: String,
required: true required: true
}, },
ad: { specify: {
type: Object, type: Object,
required: false required: false
}, },
@ -46,8 +47,8 @@ export default defineComponent({
let ad = null; let ad = null;
if (props.ad) { if (props.specify) {
ad = props.ad; ad = props.specify;
} else { } else {
let ads = instance.ads.filter(ad => ad.place === props.prefer); let ads = instance.ads.filter(ad => ad.place === props.prefer);

2
src/client/pages/instance/ads.vue
View file

@ -3,7 +3,7 @@
<MkButton @click="add()" primary style="margin: 0 auto 16px auto;"><i class="fas fa-plus"></i> {{ $ts.add }}</MkButton> <MkButton @click="add()" primary style="margin: 0 auto 16px auto;"><i class="fas fa-plus"></i> {{ $ts.add }}</MkButton>
<section class="_card _gap ads" v-for="ad in ads"> <section class="_card _gap ads" v-for="ad in ads">
<div class="_content ad"> <div class="_content ad">
<MkAd v-if="ad.url" :ad="ad"/> <MkAd v-if="ad.url" :specify="ad"/>
<MkInput v-model:value="ad.url" type="url"> <MkInput v-model:value="ad.url" type="url">
<span>URL</span> <span>URL</span>
</MkInput> </MkInput>