Merge branch 'master' into feat-toot-composer
This commit is contained in:
commit
06de56b4af
4 changed files with 34 additions and 33 deletions
|
@ -4,7 +4,7 @@
|
||||||
--safe-area-inset-bottom: env(safe-area-inset-bottom);
|
--safe-area-inset-bottom: env(safe-area-inset-bottom);
|
||||||
--safe-area-inset-right: env(safe-area-inset-right);
|
--safe-area-inset-right: env(safe-area-inset-right);
|
||||||
background-color: var(--tutu-color-surface, transparent);
|
background-color: var(--tutu-color-surface, transparent);
|
||||||
overscroll-behavior-block: contain;
|
overscroll-behavior-block: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.custom-emoji {
|
.custom-emoji {
|
||||||
|
|
|
@ -38,7 +38,6 @@ export function useTimeline(
|
||||||
async ([tl], info) => {
|
async ([tl], info) => {
|
||||||
let tlChanged = false;
|
let tlChanged = false;
|
||||||
if (otl !== tl) {
|
if (otl !== tl) {
|
||||||
console.debug("timeline reset");
|
|
||||||
npager = opager = undefined;
|
npager = opager = undefined;
|
||||||
otl = tl;
|
otl = tl;
|
||||||
tlChanged = true;
|
tlChanged = true;
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
max-width: 560px;
|
max-width: 560px;
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
overscroll-behavior: contain;
|
overscroll-behavior: none;
|
||||||
max-height: 100vh;
|
max-height: 100vh;
|
||||||
max-height: 100dvh;
|
max-height: 100dvh;
|
||||||
|
|
||||||
|
|
|
@ -430,6 +430,7 @@ const Home: ParentComponent = (props) => {
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<TimeSourceProvider value={now}>
|
<TimeSourceProvider value={now}>
|
||||||
|
<Show when={!!client()}>
|
||||||
<div class="panel-list" ref={panelList!}>
|
<div class="panel-list" ref={panelList!}>
|
||||||
<div class="tab-panel">
|
<div class="tab-panel">
|
||||||
<div>
|
<div>
|
||||||
|
@ -464,6 +465,7 @@ const Home: ParentComponent = (props) => {
|
||||||
</div>
|
</div>
|
||||||
<div></div>
|
<div></div>
|
||||||
</div>
|
</div>
|
||||||
|
</Show>
|
||||||
</TimeSourceProvider>
|
</TimeSourceProvider>
|
||||||
<Suspense>
|
<Suspense>
|
||||||
<HeroSourceProvider value={[heroSrc, setHeroSrc]}>
|
<HeroSourceProvider value={[heroSrc, setHeroSrc]}>
|
||||||
|
|
Loading…
Reference in a new issue