Merge branch 'develop' into qr

CHANGELOG.md

@@ -4,7 +4,8 @@
 -
 
 ### Client
--
+- Fix: RSSティッカーウィジェットが正しく動作しない問題を修正
+- Fix: エラー画像が横に引き伸ばされてしまう問題に対応
 
 ### Server
 -

packages/frontend/src/components/global/MkResult.vue

@@ -41,8 +41,7 @@ const props = defineProps<{
 .img {
 	vertical-align: bottom;
 	height: 128px;
-	aspect-ratio: 1;
-	margin-bottom: 16px;
+	margin: auto auto 16px;
 	border-radius: 16px;
 }
 

packages/frontend/src/pages/settings/preferences.vue

@@ -110,7 +110,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 								</MkPreferenceContainer>
 							</SearchMarker>
 
-							<!--
 							<SearchMarker :keywords="['auto', 'load', 'auto', 'more', 'scroll']">
 								<MkPreferenceContainer k="enableInfiniteScroll">
 									<MkSwitch v-model="enableInfiniteScroll">
@@ -118,7 +117,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 									</MkSwitch>
 								</MkPreferenceContainer>
 							</SearchMarker>
-							-->
 						</div>
 
 						<SearchMarker :keywords="['emoji', 'style', 'native', 'system', 'fluent', 'twemoji']">

packages/frontend/src/widgets/WidgetRssTicker.vue

@@ -31,7 +31,7 @@ import { ref, watch, computed } from 'vue';
 import * as Misskey from 'misskey-js';
 import { useWidgetPropsManager } from './widget.js';
 import type { WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget.js';
-import MarqueeText from '@/components/MkMarqueeText.vue';
+import MkMarqueeText from '@/components/MkMarqueeText.vue';
 import type { FormWithDefault, GetFormResultType } from '@/utility/form.js';
 import MkContainer from '@/components/MkContainer.vue';
 import { shuffle } from '@/utility/shuffle.js';