usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip

This commit is contained in:
syuilo 2020-07-04 18:28:57 +09:00
parent 1fd345f563
commit 83e1068da3
6 changed files with 11 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/client/app.vue
View File

@ -911,7 +911,6 @@ export default Vue.extend({
> main { > main {
width: $main-width; width: $main-width;
min-width: $main-width; min-width: $main-width;
box-shadow: 1px 0 0 0 var(--divider), -1px 0 0 0 var(--divider);
@media (max-width: $side-hide-threshold) { @media (max-width: $side-hide-threshold) {
min-width: 0; min-width: 0;
@ -926,10 +925,6 @@ export default Vue.extend({
padding: var(--margin) 0; padding: var(--margin) 0;
} }
&:not(.naked) {
background: var(--pageBg);
}
&.naked { &.naked {
background: var(--bg); background: var(--bg);
} }
@ -970,9 +965,7 @@ export default Vue.extend({
> .widgets { > .widgets {
box-sizing: border-box; box-sizing: border-box;
margin-left: var(--margin); margin: 0 var(--margin);
background: var(--pageBg);
box-shadow: 1px 0 0 0 var(--divider),-1px 0 0 0 var(--divider);
@media (max-width: $side-hide-threshold) { @media (max-width: $side-hide-threshold) {
display: none; display: none;
@ -982,7 +975,9 @@ export default Vue.extend({
position: sticky; position: sticky;
top: $header-height; top: $header-height;
height: calc(100vh - #{$header-height}); height: calc(100vh - #{$header-height});
padding: 0 var(--margin);
overflow: auto; overflow: auto;
box-shadow: 1px 0 0 0 var(--divider), -1px 0 0 0 var(--divider);
> * { > * {
margin: var(--margin) 0; margin: var(--margin) 0;

7
src/client/components/notifications.vue
View File

@ -87,13 +87,6 @@ export default Vue.extend({
<style lang="scss" scoped> <style lang="scss" scoped>
.mfcuwfyp { .mfcuwfyp {
> .notifications {
> ::v-deep * {
//margin-bottom: var(--margin);
margin-bottom: 0;
}
}
> .empty { > .empty {
margin: 0; margin: 0;
padding: 16px; padding: 16px;

6
src/client/pages/my-groups/index.vue
View File

@ -8,7 +8,7 @@
<mk-container :body-togglable="true"> <mk-container :body-togglable="true">
<template #header><fa :icon="faUsers"/> {{ $t('ownedGroups') }}</template> <template #header><fa :icon="faUsers"/> {{ $t('ownedGroups') }}</template>
<mk-pagination :pagination="ownedPagination" #default="{items}" ref="owned"> <mk-pagination :pagination="ownedPagination" #default="{items}" ref="owned">
<div class="_frame" v-for="group in items" :key="group.id"> <div class="_card" v-for="group in items" :key="group.id">
<div class="_title"><router-link :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</router-link></div> <div class="_title"><router-link :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</router-link></div>
<div class="_content"><mk-avatars :user-ids="group.userIds"/></div> <div class="_content"><mk-avatars :user-ids="group.userIds"/></div>
</div> </div>
@ -18,7 +18,7 @@
<mk-container :body-togglable="true"> <mk-container :body-togglable="true">
<template #header><fa :icon="faEnvelopeOpenText"/> {{ $t('invites') }}</template> <template #header><fa :icon="faEnvelopeOpenText"/> {{ $t('invites') }}</template>
<mk-pagination :pagination="invitationPagination" #default="{items}" ref="invitations"> <mk-pagination :pagination="invitationPagination" #default="{items}" ref="invitations">
<div class="_frame" v-for="invitation in items" :key="invitation.id"> <div class="_card" v-for="invitation in items" :key="invitation.id">
<div class="_title">{{ invitation.group.name }}</div> <div class="_title">{{ invitation.group.name }}</div>
<div class="_content"><mk-avatars :user-ids="invitation.group.userIds"/></div> <div class="_content"><mk-avatars :user-ids="invitation.group.userIds"/></div>
<div class="_footer"> <div class="_footer">
@ -32,7 +32,7 @@
<mk-container :body-togglable="true"> <mk-container :body-togglable="true">
<template #header><fa :icon="faUsers"/> {{ $t('joinedGroups') }}</template> <template #header><fa :icon="faUsers"/> {{ $t('joinedGroups') }}</template>
<mk-pagination :pagination="joinedPagination" #default="{items}" ref="joined"> <mk-pagination :pagination="joinedPagination" #default="{items}" ref="joined">
<div class="_frame" v-for="group in items" :key="group.id"> <div class="_card" v-for="group in items" :key="group.id">
<div class="_title">{{ group.name }}</div> <div class="_title">{{ group.name }}</div>
<div class="_content"><mk-avatars :user-ids="group.userIds"/></div> <div class="_content"><mk-avatars :user-ids="group.userIds"/></div>
</div> </div>

31
src/client/style.scss
View File

@ -278,8 +278,12 @@ hr {
._panel { ._panel {
position: relative; position: relative;
background: var(--panel); background: var(--panel);
border-radius: var(--radius);
._panel {
box-shadow: 0 1px 0 0 var(--divider), 0 -1px 0 0 var(--divider); box-shadow: 0 1px 0 0 var(--divider), 0 -1px 0 0 var(--divider);
} }
}
.__panelButton { .__panelButton {
display: flex; display: flex;
@ -374,33 +378,6 @@ hr {
} }
} }
._frame {
position: relative;
border: solid 1px var(--divider);
border-radius: var(--radius);
margin: var(--margin);
> ._title {
margin: 0;
padding: 16px;
border-bottom: solid 1px var(--divider);
font-weight: bold;
}
> ._content {
padding: 16px;
& + ._content {
border-top: solid 1px var(--divider);
}
}
> ._footer {
border-top: solid 1px var(--divider);
padding: 16px;
}
}
._fullinfo { ._fullinfo {
padding: 32px; padding: 32px;
text-align: center; text-align: center;

1
src/client/themes/_dark.json5
View File

@ -20,7 +20,6 @@
panel: '#000', panel: '#000',
shadow: 'rgba(0, 0, 0, 0.1)', shadow: 'rgba(0, 0, 0, 0.1)',
header: 'rgba(20, 20, 20, 0.75)', header: 'rgba(20, 20, 20, 0.75)',
pageBg: ':lighten<5<@bg',
navBg: '@panel', navBg: '@panel',
navFg: '@fg', navFg: '@fg',
navHoverFg: ':lighten<17<@fg', navHoverFg: ':lighten<17<@fg',

1
src/client/themes/_light.json5
View File

@ -20,7 +20,6 @@
panel: '#fff', panel: '#fff',
shadow: 'rgba(0, 0, 0, 0.1)', shadow: 'rgba(0, 0, 0, 0.1)',
header: 'rgba(255, 255, 255, 0.75)', header: 'rgba(255, 255, 255, 0.75)',
pageBg: '@bg',
navBg: '@panel', navBg: '@panel',
navFg: '@fg', navFg: '@fg',
navHoverFg: ':darken<17<@fg', navHoverFg: ':darken<17<@fg',