Merge branch 'develop'

4 files changed, 25 insertions, 24 deletions

diff --git a/packages/client/src/components/form/input.vue b/packages/client/src/components/form/input.vue
index 1cc3912178..2a03d6a5d4 100644
--- a/packages/client/src/components/form/input.vue
+++ b/packages/client/src/components/form/input.vue
@@ -77,9 +77,9 @@ const inputEl = ref<HTMLElement>();
 const prefixEl = ref<HTMLElement>();
 const suffixEl = ref<HTMLElement>();
 const height =
-	props.small ? 38 :
-	props.large ? 42 :
-	40;
+	props.small ? 36 :
+	props.large ? 40 :
+	38;
 
 const focus = () => inputEl.value.focus();
 const onInput = (ev: KeyboardEvent) => {
diff --git a/packages/client/src/components/form/select.vue b/packages/client/src/components/form/select.vue
index fe8c08cd6c..78282dfdc1 100644
--- a/packages/client/src/components/form/select.vue
+++ b/packages/client/src/components/form/select.vue
@@ -63,9 +63,9 @@ const prefixEl = ref(null);
 const suffixEl = ref(null);
 const container = ref(null);
 const height =
-	props.small ? 38 :
-	props.large ? 42 :
-	40;
+	props.small ? 36 :
+	props.large ? 40 :
+	38;
 
 const focus = () => inputEl.value.focus();
 const onInput = (ev) => {
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue
index c05ab7fec4..85bffca4a5 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@@ -390,7 +390,7 @@ if (appearNote.replyId) {
 
 	> .article {
 		padding: 32px;
-		font-size: 1.1em;
+		font-size: 1.2em;
 
 		> .header {
 			display: flex;
diff --git a/packages/client/src/components/ui/button.vue b/packages/client/src/components/ui/button.vue
index e6b20d9881..5f5d6d42ed 100644
--- a/packages/client/src/components/ui/button.vue
+++ b/packages/client/src/components/ui/button.vue
@@ -1,5 +1,6 @@
 <template>
-<button v-if="!link" class="bghgjjyj _button"
+<button
+	v-if="!link" class="bghgjjyj _button"
 	:class="{ inline, primary, gradate, danger, rounded, full }"
 	:type="type"
 	@click="$emit('click', $event)"
@@ -10,7 +11,8 @@
 		<slot></slot>
 	</div>
 </button>
-<MkA v-else class="bghgjjyj _button"
+<MkA
+	v-else class="bghgjjyj _button"
 	:class="{ inline, primary, gradate, danger, rounded, full }"
 	:to="to"
 	@mousedown="onMousedown"
@@ -29,56 +31,56 @@ export default defineComponent({
 	props: {
 		type: {
 			type: String,
-			required: false
+			required: false,
 		},
 		primary: {
 			type: Boolean,
 			required: false,
-			default: false
+			default: false,
 		},
 		gradate: {
 			type: Boolean,
 			required: false,
-			default: false
+			default: false,
 		},
 		rounded: {
 			type: Boolean,
 			required: false,
-			default: false
+			default: false,
 		},
 		inline: {
 			type: Boolean,
 			required: false,
-			default: false
+			default: false,
 		},
 		link: {
 			type: Boolean,
 			required: false,
-			default: false
+			default: false,
 		},
 		to: {
 			type: String,
-			required: false
+			required: false,
 		},
 		autofocus: {
 			type: Boolean,
 			required: false,
-			default: false
+			default: false,
 		},
 		wait: {
 			type: Boolean,
 			required: false,
-			default: false
+			default: false,
 		},
 		danger: {
 			type: Boolean,
 			required: false,
-			default: false
+			default: false,
 		},
 		full: {
 			type: Boolean,
 			required: false,
-			default: false
+			default: false,
 		},
 	},
 	emits: ['click'],
@@ -127,8 +129,8 @@ export default defineComponent({
 			window.setTimeout(() => {
 				if (this.$refs.ripples) this.$refs.ripples.removeChild(ripple);
 			}, 2000);
-		}
-	}
+		},
+	},
 });
 </script>
 
@@ -142,8 +144,7 @@ export default defineComponent({
 	padding: 8px 14px;
 	text-align: center;
 	font-weight: normal;
-	font-size: 0.9em;
-	line-height: 22px;
+	font-size: 1em;
 	box-shadow: none;
 	text-decoration: none;
 	background: var(--buttonBg);