sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
sim1222 2022-06-16 04:52:03 +09:00
commit d7e9ed7301
9 changed files with 33 additions and 10 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.111.1-simkey-v10", "version": "12.111.1-simkey-v11",
"codename": "indigo", "codename": "indigo",
"repository": { "repository": {
"type": "git", "type": "git",

4
packages/client/src/components/ui/context-menu.vue
View File

@ -71,8 +71,8 @@ function onMousedown(evt: Event) {
<style lang="scss" scoped> <style lang="scss" scoped>
.nvlagfpb { .nvlagfpb {
position: absolute; position: absolute;
backdrop-filter: var(--blur, blur(8px)); // backdrop-filter: var(--blur, blur(8px));
-webkit-backdrop-filter: var(--blur, blur(8px)); // -webkit-backdrop-filter: var(--blur, blur(8px));
} }
.fade-enter-active, .fade-leave-active { .fade-enter-active, .fade-leave-active {

2
packages/client/src/components/ui/popup-menu.vue
View File

@ -27,6 +27,8 @@ let modal = $ref<InstanceType<typeof MkModal>>();
<style lang="scss" scoped> <style lang="scss" scoped>
.sfhdhdhq { .sfhdhdhq {
// backdrop-filter: var(--blur, blur(8px));
// -webkit-backdrop-filter: var(--blur, blur(8px));
&.drawer { &.drawer {
border-radius: 24px; border-radius: 24px;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;

2
packages/client/src/pages/timeline.vue
View File

@ -183,7 +183,7 @@ defineExpose({
} }
> .tl { > .tl {
background: var(--bg); // background: var(--bg);
border-radius: var(--radius); border-radius: var(--radius);
overflow: clip; overflow: clip;
} }

6
packages/client/src/pages/welcome.entrance.a.vue
View File

@ -15,7 +15,7 @@
</div> </div>
<div class="main _panel"> <div class="main _panel">
<div class="bg"> <div class="bg">
<div class="fade"></div> <!-- <div class="fade"></div> -->
</div> </div>
<div class="fg"> <div class="fg">
<h1> <h1>
@ -327,6 +327,8 @@ export default defineComponent({
} }
} }
} }
._panel {
background: var(--panel);
}
</style> </style>

3
packages/client/src/pages/welcome.entrance.b.vue
View File

@ -245,5 +245,8 @@ export default defineComponent({
} }
} }
._panel {
background: var(--panel);
}
</style> </style>

6
packages/client/src/pages/welcome.entrance.c.vue
View File

@ -2,7 +2,7 @@
<div v-if="meta" class="rsqzvsbo"> <div v-if="meta" class="rsqzvsbo">
<div class="top"> <div class="top">
<MkFeaturedPhotos class="bg"/> <MkFeaturedPhotos class="bg"/>
<div class="fade"></div> <!-- <div class="fade"></div> -->
<div class="emojis"> <div class="emojis">
<MkEmoji :normal="true" :no-style="true" emoji="👍"/> <MkEmoji :normal="true" :no-style="true" emoji="👍"/>
<MkEmoji :normal="true" :no-style="true" emoji="❤"/> <MkEmoji :normal="true" :no-style="true" emoji="❤"/>
@ -313,4 +313,8 @@ export default defineComponent({
} }
} }
._panel {
background: var(--panel);
}
</style> </style>

2
packages/client/src/scripts/theme.ts
View File

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

14
packages/client/src/style.scss
View File

@ -261,7 +261,7 @@ hr {
// background: var(--panel); // background: var(--panel);
border-radius: var(--radius); border-radius: var(--radius);
overflow: clip; overflow: clip;
//backdrop-filter: var(--blur, blur(8px)); backdrop-filter: var(--blur, blur(8px));
-webkit-backdrop-filter: var(--blur, blur(8px)); -webkit-backdrop-filter: var(--blur, blur(8px));
} }
@ -571,7 +571,17 @@ hr {
} }
//パネルブラー //パネルブラー
.dnpfarvg, .sqadhkmv { // .dnpfarvg, .sqadhkmv {
// backdrop-filter: var(--blur, blur(8px));
// -webkit-backdrop-filter: var(--blur, blur(8px));
// }
.widget._panel {
backdrop-filter: var(--blur, blur(8px)); backdrop-filter: var(--blur, blur(8px));
-webkit-backdrop-filter: var(--blur, blur(8px)); -webkit-backdrop-filter: var(--blur, blur(8px));
} }
.qglefbjs._panel {
backdrop-filter: none var(--blur, blur(8px));
-webkit-backdrop-filter: none var(--blur, blur(8px));
}