ユーザー名の突き抜けの修正 (#5261)
* 突き抜け deck フォロリク/vote * 突き抜け desktop * notification reactionで絵文字の縦がずれないように * Fix: ユーザーページの名前が突き抜ける * Fix: デッキカラムでユーザー名が長いと閉じれなくなる * デッキのカウントの位置が右になってしまってたのを修正 * デッキヘッダーのellipsis
This commit is contained in:
		| @@ -14,7 +14,7 @@ | ||||
| 			<template v-if="active"><fa icon="angle-up"/></template> | ||||
| 			<template v-else><fa icon="angle-down"/></template> | ||||
| 		</button> | ||||
| 		<span><slot name="header"></slot></span> | ||||
| 		<span class="header"><slot name="header"></slot></span> | ||||
| 		<span class="count" v-if="count > 0">({{ count }})</span> | ||||
| 		<button v-if="!isTemporaryColumn" class="menu" ref="menu" @click.stop="showMenu"><fa icon="caret-down"/></button> | ||||
| 		<button v-else class="close" @click.stop="close"><fa icon="times"/></button> | ||||
| @@ -395,13 +395,22 @@ export default Vue.extend({ | ||||
| 		&.indicate | ||||
| 			box-shadow 0 3px 0 0 var(--primary) | ||||
|  | ||||
| 		> span | ||||
| 		> .header | ||||
| 			display inline-block | ||||
| 			align-items center | ||||
| 			overflow hidden | ||||
| 			text-overflow ellipsis | ||||
| 			white-space nowrap | ||||
|  | ||||
| 			[data-icon] | ||||
| 				margin-right 8px | ||||
|  | ||||
| 		> .count | ||||
| 			margin-left 4px | ||||
| 			opacity 0.5 | ||||
| 		 | ||||
| 		> span:only-of-type | ||||
| 			width 100% | ||||
|  | ||||
| 		> .toggleActive | ||||
| 		> .menu | ||||
|   | ||||
| @@ -54,8 +54,8 @@ | ||||
| 		<div> | ||||
| 			<header> | ||||
| 				<fa icon="user-clock" class="icon"/> | ||||
| 				<router-link :to="notification.user | userPage"> | ||||
| 					<mk-user-name :user="notification.user" class="name"/> | ||||
| 				<router-link :to="notification.user | userPage" class="name"> | ||||
| 					<mk-user-name :user="notification.user"/> | ||||
| 				</router-link> | ||||
| 				<mk-time :time="notification.createdAt"/> | ||||
| 			</header> | ||||
| @@ -67,8 +67,8 @@ | ||||
| 		<div> | ||||
| 			<header> | ||||
| 				<fa icon="chart-pie" class="icon"/> | ||||
| 				<router-link :to="notification.user | userPage"> | ||||
| 					<mk-user-name :user="notification.user" class="name"/> | ||||
| 				<router-link :to="notification.user | userPage" class="name"> | ||||
| 					<mk-user-name :user="notification.user"/> | ||||
| 				</router-link> | ||||
| 				<mk-time :time="notification.createdAt"/> | ||||
| 			</header> | ||||
| @@ -167,6 +167,10 @@ export default Vue.extend({ | ||||
| 					display inline-block | ||||
| 					margin-right 3px | ||||
|  | ||||
| 		&.reaction | ||||
| 			> div > header | ||||
| 				align-items normal | ||||
|  | ||||
| 		&.renote | ||||
| 			> div > header [data-icon] | ||||
| 				color #77B255 | ||||
|   | ||||
| @@ -17,7 +17,7 @@ | ||||
| 				<mk-follow-button v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" class="follow" mini/> | ||||
| 				<mk-avatar class="avatar" :user="user" :disable-preview="true" :key="user.id"/> | ||||
| 				<router-link class="name" :to="user | userPage()"> | ||||
| 					<mk-user-name :user="user" :key="user.id"/> | ||||
| 					<mk-user-name :user="user" :key="user.id" :nowrap="false"/> | ||||
| 				</router-link> | ||||
| 				<span class="acct">@{{ user | acct }} <fa v-if="user.isLocked == true" class="locked" icon="lock" fixed-width/></span> | ||||
| 				<span class="followed" v-if="user.isFollowed">{{ $t('follows-you') }}</span> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 MeiMei
					MeiMei