DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into mkjs-n

This commit is contained in:
tamaina 2023-05-19 07:26:36 +00:00
parent 9b27fffb0e 4a703d7cf6
commit f7a0213af9
3 changed files with 73 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/frontend/src/pages/antenna-timeline.vue
View File

@ -1,12 +1,12 @@
<template>
<MkStickyContainer>
<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
<div ref="rootEl" v-hotkey.global="keymap" class="tqmomfks">
<div v-if="queue > 0" class="new"><button class="_buttonPrimary" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
<div class="tl">
<MkSpacer :contentMax="800">
<div ref="rootEl" v-hotkey.global="keymap">
<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
<div :class="$style.tl">
<MkTimeline
ref="tlEl" :key="antennaId"
class="tl"
src="antenna"
:antenna="antennaId"
:sound="true"
@ -14,6 +14,7 @@
/>
</div>
</div>
</MkSpacer>
</MkStickyContainer>
</template>
@ -89,36 +90,29 @@ definePageMetadata(computed(() => antenna ? {
} : null));
</script>
<style lang="scss" scoped>
.tqmomfks {
padding: var(--margin);
> .new {
<style lang="scss" module>
.new {
position: sticky;
top: calc(var(--stickyTop, 0px) + 16px);
z-index: 1000;
width: 100%;
margin: calc(-0.675em - 8px - var(--margin)) 0 calc(-0.675em - 8px);
margin: calc(-0.675em - 8px) 0;
> button {
&:first-child {
margin-top: calc(-0.675em - 8px - var(--margin));
}
}
.newButton {
display: block;
margin: var(--margin) auto 0 auto;
padding: 8px 16px;
border-radius: 32px;
}
}
> .tl {
.tl {
background: var(--bg);
border-radius: var(--radius);
overflow: clip;
}
}
@container (min-width: 800px) {
.tqmomfks {
max-width: 800px;
margin: 0 auto;
}
}
</style>

6
packages/frontend/src/pages/timeline.vue
View File

@ -6,7 +6,7 @@
<XTutorial v-if="$i && defaultStore.reactiveState.timelineTutorial.value != -1" class="_panel" style="margin-bottom: var(--margin);"/>
<MkPostForm v-if="defaultStore.reactiveState.showFixedPostForm.value" :class="$style.postForm" class="post-form _panel" fixed style="margin-bottom: var(--margin);"/>
<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
<div :class="$style.tl">
<MkTimeline
ref="tlComponent"
@ -187,14 +187,14 @@ definePageMetadata(computed(() => ({
&:first-child {
margin-top: calc(-0.675em - 8px - var(--margin));
}
}
> button {
.newButton {
display: block;
margin: var(--margin) auto 0 auto;
padding: 8px 16px;
border-radius: 32px;
}
}
.postForm {
border-radius: var(--radius);

36
packages/frontend/src/pages/user-list-timeline.vue
View File

@ -1,12 +1,12 @@
<template>
<MkStickyContainer>
<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
<div ref="rootEl" class="eqqrhokj">
<div v-if="queue > 0" class="new"><button class="_buttonPrimary" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
<div class="tl">
<MkSpacer :contentMax="800">
<div ref="rootEl">
<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
<div :class="$style.tl">
<MkTimeline
ref="tlEl" :key="listId"
class="tl"
src="list"
:list="listId"
:sound="true"
@ -14,6 +14,7 @@
/>
</div>
</div>
</MkSpacer>
</MkStickyContainer>
</template>
@ -82,36 +83,29 @@ definePageMetadata(computed(() => list ? {
} : null));
</script>
<style lang="scss" scoped>
.eqqrhokj {
padding: var(--margin);
> .new {
<style lang="scss" module>
.new {
position: sticky;
top: calc(var(--stickyTop, 0px) + 16px);
z-index: 1000;
width: 100%;
margin: calc(-0.675em - 8px - var(--margin)) 0 calc(-0.675em - 8px);
margin: calc(-0.675em - 8px) 0;
> button {
&:first-child {
margin-top: calc(-0.675em - 8px - var(--margin));
}
}
.newButton {
display: block;
margin: var(--margin) auto 0 auto;
padding: 8px 16px;
border-radius: 32px;
}
}
> .tl {
.tl {
background: var(--bg);
border-radius: var(--radius);
overflow: clip;
}
}
@container (min-width: 800px) {
.eqqrhokj {
max-width: 800px;
margin: 0 auto;
}
}
</style>