sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into sw-notification-action

Browse Source
This commit is contained in:
tamaina
2021-04-17 00:20:33 +09:00
parent 92e93d5928 27c373ddf4
commit 5b34bd5196
59 changed files with 2344 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/ui/chat/notes.vue
View File

@@ -5,6 +5,8 @@
<div>{{ $ts.noNotes }}</div>
</div>
<MkLoading v-if="fetching"/>
<MkError v-if="error" @retry="init()"/>
<div v-show="more && reversed" style="margin-bottom: var(--margin);">

3
src/client/ui/default.vue
View File

@@ -6,7 +6,7 @@
</div>
<main class="main _panel" @contextmenu.stop="onContextmenu">
<header v-if="$store.state.titlebar" class="header" @click="onHeaderClick">
<header class="header" @click="onHeaderClick">
<XHeader :info="pageInfo"/>
</header>
<div class="content" :class="{ _flat_: !fullView }">
@@ -310,6 +310,7 @@ export default defineComponent({
> .widgets {
//--panelShadow: none;
width: 300px;
@media (max-width: $widgets-hide-threshold) {
display: none;

19
src/client/ui/default.widgets.vue
View File

@@ -2,8 +2,8 @@
<div class="efzpzdvf">
<XWidgets :edit="editMode" :widgets="$store.reactiveState.widgets.value" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
<button v-if="editMode" @click="editMode = false" class="_textButton" style="font-size: 0.9em;"><Fa :icon="faCheck"/> {{ $ts.editWidgetsExit }}</button>
<button v-else @click="editMode = true" class="_textButton" style="font-size: 0.9em;"><Fa :icon="faPencilAlt"/> {{ $ts.editWidgets }}</button>
<button v-if="editMode" @click="editMode = false" class="_textButton edit" style="font-size: 0.9em;"><Fa :icon="faCheck"/> {{ $ts.editWidgetsExit }}</button>
<button v-else @click="editMode = true" class="_textButton edit" style="font-size: 0.9em;"><Fa :icon="faPencilAlt"/> {{ $ts.editWidgets }}</button>
</div>
</template>
@@ -62,18 +62,11 @@ export default defineComponent({
position: sticky;
height: min-content;
box-sizing: border-box;
padding-bottom: 8px;
> * {
margin: var(--margin) 0;
width: 300px;
&:first-child {
margin-top: 0;
}
}
> .add {
margin: 0 auto;
> .edit {
display: block;
margin: 16px auto;
}
}
</style>

10
src/client/ui/universal.vue
View File

@@ -2,8 +2,8 @@
<div class="mk-app" :class="{ wallpaper }">
<XSidebar ref="nav" class="sidebar"/>
<div class="contents" ref="contents" :class="{ withHeader: $store.state.titlebar }" @contextmenu.stop="onContextmenu">
<header v-if="$store.state.titlebar" class="header" ref="header" @click="onHeaderClick">
<div class="contents" ref="contents" @contextmenu.stop="onContextmenu">
<header class="header" ref="header" @click="onHeaderClick">
<XHeader :info="pageInfo"/>
</header>
<main ref="main">
@@ -259,10 +259,8 @@ export default defineComponent({
> .contents {
width: 100%;
min-width: 0;
&.withHeader {
padding-top: $header-height;
}
--stickyTop: #{$header-height};
padding-top: $header-height;
> .header {
position: fixed;