いっぱいアップデート

This commit is contained in:
sim1222 2022-06-16 18:41:04 +09:00
parent de633f0117
commit adf755f0b2
9 changed files with 146 additions and 6 deletions

View File

@ -56,11 +56,12 @@ module.exports = Object.entries(locales)
.reduce((a, [k ,v]) => (a[k] = (() => {
const [lang] = k.split('-');
switch (k) {
case 'ja-JP': return v;
case 'ja-NY':
case 'ja-NY': return v;
case 'ja-JP':
case 'ja-KS':
case 'en-US': return merge(locales['ja-JP'], v);
case 'en-US': return merge(locales['ja-NY'], v);
default: return merge(
locales['ja-NY'],
locales['ja-JP'],
locales['en-US'],
locales[`${lang}-${primaries[lang]}`] || {},

View File

@ -1,6 +1,6 @@
{
"name": "misskey",
"version": "12.111.1-simkey-v11",
"version": "12.111.1-simkey-v12",
"codename": "indigo",
"repository": {
"type": "git",

View File

@ -32,6 +32,9 @@
if (lang == null || !supportedLangs.includes(lang)) {
if (supportedLangs.includes(navigator.language)) {
lang = navigator.language;
if (lang === 'ja-JP') {
lang = 'ja-NY';
}
} else {
lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);

View File

@ -19,6 +19,7 @@ export const themeProps = Object.keys(lightTheme.props).filter(key => !key.start
export const getBuiltinThemes = () => Promise.all(
[
'l-simkey',
'l-simkey-noglass',
'l-light',
'l-coffee',
'l-apricot',
@ -28,6 +29,7 @@ export const getBuiltinThemes = () => Promise.all(
'l-sushi',
'd-simkey',
'd-simkey-noglass',
'd-dark',
'd-persimmon',
'd-astro',

View File

@ -255,8 +255,8 @@ type Plugin = {
/**
* ()
*/
import lightTheme from '@/themes/l-light.json5';
import darkTheme from '@/themes/d-dark.json5';
import lightTheme from '@/themes/l-simkey.json5';
import darkTheme from '@/themes/d-simkey.json5';
export class ColdDeviceStorage {
public static default = {

View File

@ -0,0 +1,78 @@
{
id: '971cb22e-c9e6-4a7d-92f9-87cc0ddda561',
base: 'dark',
name: 'simkey Astro Dark-NoGlass',
author: 'sim1222',
props: {
bg: 'rgba(35, 33, 37, 1)',
fg: '#efdab9',
cwBg: '#687390',
cwFg: '#393f4f',
link: '#78b0a0',
warn: '#ecb637',
badge: '#31b1ce',
error: '#ec4137',
focus: ':alpha<0.3<@accent',
navBg: '@panel',
navFg: '@fg',
panel: 'rgba(42, 39, 43, 1)',
accent: '#81c08b',
header: ':alpha<0.7<@bg',
infoBg: '#253142',
infoFg: '#fff',
renote: '#659CC8',
shadow: 'rgba(0, 0, 0, 0.3)',
divider: 'rgba(255, 255, 255, 0.1)',
hashtag: '#ff9156',
mention: '#ffd152',
modalBg: 'rgba(0, 0, 0, 0.5)',
success: '#86b300',
buttonBg: 'rgba(255, 255, 255, 0.05)',
acrylicBg: ':alpha<0.5<@bg',
cwHoverBg: '#707b97',
indicator: '@accent',
mentionMe: '#fb5d38',
messageBg: '@bg',
navActive: '@accent',
infoWarnBg: '#42321c',
infoWarnFg: '#ffbd3e',
navHoverFg: ':lighten<17<@fg',
dateLabelFg: '@fg',
inputBorder: 'rgba(255, 255, 255, 0.1)',
inputBorderHover: 'rgba(255, 255, 255, 0.2)',
panelBorder: '" solid 1px var(--divider)',
accentDarken: ':darken<10<@accent',
acrylicPanel: ':alpha<0.5<@panel',
navIndicator: '@accent',
accentLighten: ':lighten<10<@accent',
buttonHoverBg: 'rgba(255, 255, 255, 0.1)',
buttonGradateA: '@accent',
buttonGradateB: ':hue<-20<@accent',
driveFolderBg: ':alpha<0.3<@accent',
fgHighlighted: ':lighten<3<@fg',
panelHeaderBg: ':lighten<3<@panel',
panelHeaderFg: '@fg',
htmlThemeColor: '@bg',
panelHighlight: ':lighten<3<@panel',
listItemHoverBg: 'rgba(255, 255, 255, 0.03)',
scrollbarHandle: 'rgba(255, 255, 255, 0.2)',
wallpaperOverlay: 'rgba(0, 0, 0, 0.5)',
panelHeaderDivider: 'rgba(0, 0, 0, 0)',
scrollbarHandleHover: 'rgba(255, 255, 255, 0.4)',
X2: ':darken<2<@panel',
X3: 'rgba(255, 255, 255, 0.05)',
X4: 'rgba(255, 255, 255, 0.1)',
X5: 'rgba(255, 255, 255, 0.05)',
X6: 'rgba(255, 255, 255, 0.15)',
X7: 'rgba(255, 255, 255, 0.05)',
X8: ':lighten<5<@accent',
X9: ':darken<5<@accent',
X10: ':alpha<0.4<@accent',
X11: 'rgba(0, 0, 0, 0.3)',
X12: 'rgba(255, 255, 255, 0.1)',
X13: 'rgba(255, 255, 255, 0.15)',
X14: ':alpha<0.5<@navBg',
X15: ':alpha<0<@panel',
X16: ':alpha<0.7<@panel',
},
}

View File

@ -0,0 +1,50 @@
{
id: '2626d839-8579-4b44-80a4-39af123ff74a',
name: 'simkey Vivid Light-NoGlass',
author: 'sim1222',
base: 'light',
props: {
bg: 'rgba(250, 250, 250, 0.7)',
fg: '#444',
cwBg: '#b1b9c1',
cwFg: '#fff',
link: '#ff9400',
panel: 'rgba(255, 255, 255, 0.6)',
accent: '#81c08b',
header: ':alpha<0.7<@panel',
infoBg: '#e5f5ff',
infoFg: '#72818a',
renote: '#659CC8',
shadow: 'rgba(0, 0, 0, 0.1)',
divider: 'rgba(0, 0, 0, 0.08)',
hashtag: '#92d400',
mention: '@accent',
modalBg: 'rgba(0, 0, 0, 0.3)',
buttonBg: 'rgba(0, 0, 0, 0.05)',
cwHoverBg: '#bbc4ce',
mentionMe: '@mention',
infoWarnBg: '#fff0db',
infoWarnFg: '#8f6e31',
navHoverFg: ':darken<17<@fg',
inputBorder: 'rgba(0, 0, 0, 0.1)',
inputBorderHover: 'rgba(0, 0, 0, 0.2)',
buttonHoverBg: 'rgba(0, 0, 0, 0.1)',
fgHighlighted: ':darken<3<@fg',
fgTransparent: ':alpha<0.5<@fg',
panelHighlight: ':darken<3<@panel',
listItemHoverBg: 'rgba(0, 0, 0, 0.03)',
scrollbarHandle: 'rgba(0, 0, 0, 0.2)',
wallpaperOverlay: 'rgba(255, 255, 255, 0.5)',
fgTransparentWeak: ':alpha<0.75<@fg',
panelHeaderDivider: '@divider',
scrollbarHandleHover: 'rgba(0, 0, 0, 0.4)',
X3: 'rgba(0, 0, 0, 0.05)',
X4: 'rgba(0, 0, 0, 0.1)',
X5: 'rgba(0, 0, 0, 0.05)',
X6: 'rgba(0, 0, 0, 0.25)',
X7: 'rgba(0, 0, 0, 0.05)',
X11: 'rgba(0, 0, 0, 0.1)',
X12: 'rgba(0, 0, 0, 0.1)',
X13: 'rgba(0, 0, 0, 0.15)',
},
}

View File

@ -81,6 +81,9 @@ export default defineComponent({
$avatar-size: 32px;
$avatar-margin: 8px;
backdrop-filter: var(--blur, blur(8px));
-webkit-backdrop-filter: var(--blur, blur(8px));
> div {
> .divider {

View File

@ -88,6 +88,9 @@ function more(ev: MouseEvent) {
width: $nav-width;
box-sizing: border-box;
backdrop-filter: var(--blur, blur(8px));
-webkit-backdrop-filter: var(--blur, blur(8px));
> div {
position: fixed;
top: 0;