161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-25 05:29:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'develop' (#9014) from develop into main

Browse Source 
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9014
This commit is contained in:
Kainoa Kanter 2022-07-26 04:24:25 +02:00
commit e06012b1b3
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "12.118.0-calc.b4", "version": "12.118.0-calc.3.b4",
"codename": "indigo", "codename": "indigo",
"repository": { "repository": {
"type": "git", "type": "git",

12
packages/client/src/router.ts
View File

@ -93,6 +93,14 @@ export const routes = [{
path: '/theme', path: '/theme',
name: 'theme', name: 'theme',
component: page(() => import('./pages/settings/theme.vue')), component: page(() => import('./pages/settings/theme.vue')),
}, {
path: '/custom-css',
name: 'custom-css',
component: page(() => import('./pages/settings/custom-css.vue')),
}, {
path: '/account-info',
name: 'account-info',
component: page(() => import('./pages/settings/account-info.vue')),
}, { }, {
path: '/navbar', path: '/navbar',
name: 'navbar', name: 'navbar',
@ -348,6 +356,10 @@ export const routes = [{
path: '/other-settings', path: '/other-settings',
name: 'other-settings', name: 'other-settings',
component: page(() => import('./pages/admin/other-settings.vue')), component: page(() => import('./pages/admin/other-settings.vue')),
}, {
path: '/other-settings',
name: 'other-settings',
component: page(() => import('./pages/admin/custom-css.vue')),
}, { }, {
path: '/', path: '/',
component: page(() => import('./pages/_empty_.vue')), component: page(() => import('./pages/_empty_.vue')),

3
packages/client/src/widgets/activity.calendar.vue
View File

@ -19,7 +19,7 @@
rx="1" ry="1" rx="1" ry="1"
fill="none" fill="none"
stroke-width="0.1" stroke-width="0.1"
stroke="#f73520"/> stroke="#eb6f92"/>
</svg> </svg>
</template> </template>
@ -52,6 +52,7 @@ props.activity.slice().forEach((d, i) => {
d.v = peak === 0 ? 0 : d.total / (peak / 2); d.v = peak === 0 ? 0 : d.total / (peak / 2);
if (d.v > 1) d.v = 1; if (d.v > 1) d.v = 1;
// TODO: Make Rose Pine
const ch = d.date.weekday === 0 || d.date.weekday === 6 ? 275 : 170; const ch = d.date.weekday === 0 || d.date.weekday === 6 ? 275 : 170;
const cs = d.v * 100; const cs = d.v * 100;
const cl = 15 + ((1 - d.v) * 80); const cl = 15 + ((1 - d.v) * 80);