Merge branch 'develop'
This commit is contained in:
		
						commit
						b6c9ab0c15
					
				
					 4 changed files with 10 additions and 5 deletions
				
			
		|  | @ -1,7 +1,7 @@ | |||
| { | ||||
| 	"name": "misskey", | ||||
| 	"author": "syuilo <syuilotan@yahoo.co.jp>", | ||||
| 	"version": "12.80.0", | ||||
| 	"version": "12.80.1", | ||||
| 	"codename": "indigo", | ||||
| 	"repository": { | ||||
| 		"type": "git", | ||||
|  |  | |||
|  | @ -105,6 +105,10 @@ export default defineComponent({ | |||
| 
 | ||||
| <style lang="scss"> | ||||
| .sqadhkmv { | ||||
| 	> *:empty { | ||||
| 		display: none; | ||||
| 	} | ||||
| 
 | ||||
| 	> *:not(:last-child) { | ||||
| 		margin-bottom: var(--margin); | ||||
| 	} | ||||
|  |  | |||
|  | @ -14,6 +14,7 @@ | |||
| 		</div> | ||||
| 	</div> | ||||
| </div> | ||||
| <div v-else></div> | ||||
| </template> | ||||
| 
 | ||||
| <script lang="ts"> | ||||
|  | @ -32,7 +33,7 @@ export default defineComponent({ | |||
| 			type: String, | ||||
| 			required: true | ||||
| 		}, | ||||
| 		ad: { | ||||
| 		specify: { | ||||
| 			type: Object, | ||||
| 			required: false | ||||
| 		}, | ||||
|  | @ -46,8 +47,8 @@ export default defineComponent({ | |||
| 
 | ||||
| 		let ad = null; | ||||
| 
 | ||||
| 		if (props.ad) { | ||||
| 			ad = props.ad; | ||||
| 		if (props.specify) { | ||||
| 			ad = props.specify; | ||||
| 		} else { | ||||
| 			let ads = instance.ads.filter(ad => ad.place === props.prefer); | ||||
| 
 | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ | |||
| 	<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"> | ||||
| 		<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"> | ||||
| 				<span>URL</span> | ||||
| 			</MkInput> | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue