Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
This commit is contained in:
		@@ -7,15 +7,27 @@
 | 
			
		||||
 | 
			
		||||
<script lang="ts" setup>
 | 
			
		||||
import { } from 'vue';
 | 
			
		||||
import { instanceName } from '@/config';
 | 
			
		||||
 | 
			
		||||
const props = defineProps<{
 | 
			
		||||
	instance: any; // TODO
 | 
			
		||||
	instance?: {
 | 
			
		||||
		faviconUrl?: string
 | 
			
		||||
		name: string
 | 
			
		||||
		themeColor?: string
 | 
			
		||||
	}
 | 
			
		||||
}>();
 | 
			
		||||
 | 
			
		||||
const themeColor = props.instance.themeColor || '#777777';
 | 
			
		||||
// if no instance data is given, this is for the local instance
 | 
			
		||||
const instance = props.instance ?? {
 | 
			
		||||
	faviconUrl: '/favicon.ico',
 | 
			
		||||
	name: instanceName,
 | 
			
		||||
	themeColor: (document.querySelector('meta[name="theme-color-orig"]') as HTMLMetaElement)?.content
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const themeColor = instance.themeColor ?? '#777777';
 | 
			
		||||
 | 
			
		||||
const bg = {
 | 
			
		||||
	background: `linear-gradient(90deg, ${themeColor}, ${themeColor + '00'})`
 | 
			
		||||
	background: `linear-gradient(90deg, ${themeColor}, ${themeColor}00)`
 | 
			
		||||
};
 | 
			
		||||
</script>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user