Compare commits
	
		
			3 commits
		
	
	
		
			01b753841e
			...
			1128a01e4c
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
							 | 
						1128a01e4c | ||
| 
							 | 
						0ca81cd50c | ||
| 
							 | 
						7bf99f1c22 | 
					 6 changed files with 50 additions and 8 deletions
				
			
		
							
								
								
									
										
											BIN
										
									
								
								bun.lockb
									
										
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								bun.lockb
									
										
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							| 
						 | 
					@ -68,6 +68,7 @@
 | 
				
			||||||
    "solid-devtools": "^0.30.1",
 | 
					    "solid-devtools": "^0.30.1",
 | 
				
			||||||
    "solid-js": "^1.9.3",
 | 
					    "solid-js": "^1.9.3",
 | 
				
			||||||
    "solid-styled": "^0.11.1",
 | 
					    "solid-styled": "^0.11.1",
 | 
				
			||||||
 | 
					    "solid-transition-group": "^0.2.3",
 | 
				
			||||||
    "stacktrace-js": "^2.0.2",
 | 
					    "stacktrace-js": "^2.0.2",
 | 
				
			||||||
    "workbox-core": "^7.3.0",
 | 
					    "workbox-core": "^7.3.0",
 | 
				
			||||||
    "workbox-precaching": "^7.3.0"
 | 
					    "workbox-precaching": "^7.3.0"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,6 +9,15 @@
 | 
				
			||||||
  font-weight: 600;
 | 
					  font-weight: 600;
 | 
				
			||||||
  text-transform: uppercase;
 | 
					  text-transform: uppercase;
 | 
				
			||||||
  transition: color 120ms var(--tutu-anim-curve-std);
 | 
					  transition: color 120ms var(--tutu-anim-curve-std);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  :root:where([lang^="zh"],
 | 
				
			||||||
 | 
					    [lang="zh"],
 | 
				
			||||||
 | 
					    [lang^="kr"],
 | 
				
			||||||
 | 
					    [lang="kr"],
 | 
				
			||||||
 | 
					    [lang^="ja"],
 | 
				
			||||||
 | 
					    [lang="ja"]) & {
 | 
				
			||||||
 | 
					    font-size: 0.85rem;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.MuiToolbar-root .Tab {
 | 
					.MuiToolbar-root .Tab {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -34,7 +34,7 @@
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  &.expanded {
 | 
					  &.expanded {
 | 
				
			||||||
    z-index: calc(var(--tutu-zidx-nav) - 1);
 | 
					    z-index: calc(var(--tutu-zidx-nav) - 2);
 | 
				
			||||||
    box-shadow: var(--tutu-shadow-e9);
 | 
					    box-shadow: var(--tutu-shadow-e9);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -24,6 +24,8 @@ import TootActionGroup from "./toots/TootActionGroup.js";
 | 
				
			||||||
import TootAuthorGroup from "./toots/TootAuthorGroup.js";
 | 
					import TootAuthorGroup from "./toots/TootAuthorGroup.js";
 | 
				
			||||||
import "./RegularToot.css";
 | 
					import "./RegularToot.css";
 | 
				
			||||||
import { vibrate } from "~platform/hardware.js";
 | 
					import { vibrate } from "~platform/hardware.js";
 | 
				
			||||||
 | 
					import { Transition } from "solid-transition-group";
 | 
				
			||||||
 | 
					import { ANIM_CURVE_SHARP, ANIM_CURVE_STD } from "~material/theme.js";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export type TootEnv = {
 | 
					export type TootEnv = {
 | 
				
			||||||
  boost: (value: mastodon.v1.Status) => void;
 | 
					  boost: (value: mastodon.v1.Status) => void;
 | 
				
			||||||
| 
						 | 
					@ -97,7 +99,7 @@ export function createDefaultTootEnv(
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      const result = reblogged
 | 
					      const result = reblogged
 | 
				
			||||||
        ? await c.v1.statuses.$select(status.id).unreblog()
 | 
					        ? await c.v1.statuses.$select(status.id).unreblog()
 | 
				
			||||||
        : (await c.v1.statuses.$select(status.id).reblog());
 | 
					        : await c.v1.statuses.$select(status.id).reblog();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      if (status.reblog && !reblogged) {
 | 
					      if (status.reblog && !reblogged) {
 | 
				
			||||||
        // When calling /reblog, the result is the boost object (the actor
 | 
					        // When calling /reblog, the result is the boost object (the actor
 | 
				
			||||||
| 
						 | 
					@ -300,13 +302,22 @@ const RegularToot: Component<RegularTootProps> = (oprops) => {
 | 
				
			||||||
        <Show when={toot().poll}>
 | 
					        <Show when={toot().poll}>
 | 
				
			||||||
          <TootPoll value={toot().poll!} status={toot()} />
 | 
					          <TootPoll value={toot().poll!} status={toot()} />
 | 
				
			||||||
        </Show>
 | 
					        </Show>
 | 
				
			||||||
        <Show when={props.actionable}>
 | 
					        {props.actionable && (
 | 
				
			||||||
          <Divider
 | 
					          <Divider
 | 
				
			||||||
            class={cardStyle.cardNoPad}
 | 
					            class={cardStyle.cardNoPad}
 | 
				
			||||||
            style={{ "margin-top": "8px" }}
 | 
					            style={{ "margin-top": "8px" }}
 | 
				
			||||||
          />
 | 
					          />
 | 
				
			||||||
          <TootActionGroup value={status()} class={cardStyle.cardGutSkip} />
 | 
					        )}
 | 
				
			||||||
        </Show>
 | 
					        <Transition
 | 
				
			||||||
 | 
					          onExit={(el, done) => {
 | 
				
			||||||
 | 
					            (el as HTMLElement).addEventListener("animationend", done)
 | 
				
			||||||
 | 
					            el.classList.add("Transition-exit")
 | 
				
			||||||
 | 
					          }}
 | 
				
			||||||
 | 
					        >
 | 
				
			||||||
 | 
					          <Show when={props.actionable}>
 | 
				
			||||||
 | 
					            <TootActionGroup value={status()} class={cardStyle.cardGutSkip} />
 | 
				
			||||||
 | 
					          </Show>
 | 
				
			||||||
 | 
					        </Transition>
 | 
				
			||||||
      </article>
 | 
					      </article>
 | 
				
			||||||
    </>
 | 
					    </>
 | 
				
			||||||
  );
 | 
					  );
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,7 @@
 | 
				
			||||||
  padding-block: calc((var(--card-gut) - 10px) / 2);
 | 
					  padding-block: calc((var(--card-gut) - 10px) / 2);
 | 
				
			||||||
  contain: layout style;
 | 
					  contain: layout style;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  animation: 125ms var(--tutu-anim-curve-std) TootActionGroup_fade-in;
 | 
					  animation: 125ms var(--tutu-anim-curve-sharp) TootActionGroup_fade-in;
 | 
				
			||||||
  display: flex;
 | 
					  display: flex;
 | 
				
			||||||
  flex-flow: row wrap;
 | 
					  flex-flow: row wrap;
 | 
				
			||||||
  justify-content: space-evenly;
 | 
					  justify-content: space-evenly;
 | 
				
			||||||
| 
						 | 
					@ -28,16 +28,19 @@
 | 
				
			||||||
  >.plain {
 | 
					  >.plain {
 | 
				
			||||||
    justify-content: center;
 | 
					    justify-content: center;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  &.Transition-exit {
 | 
				
			||||||
 | 
					    animation: 125ms var(--tutu-anim-curve-sharp) TootActionGroup_fade-out;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@keyframes TootActionGroup_fade-in {
 | 
					@keyframes TootActionGroup_fade-in {
 | 
				
			||||||
  0% {
 | 
					  0% {
 | 
				
			||||||
    opacity: 0.5;
 | 
					    opacity: 0.5;
 | 
				
			||||||
    transform: translateY(-10px);
 | 
					    transform: translateY(-10px);
 | 
				
			||||||
    margin-bottom: -20px;
 | 
					    margin-bottom: -30px;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
  25% {
 | 
					  25% {
 | 
				
			||||||
    margin-bottom: 0;
 | 
					    margin-bottom: 0;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
| 
						 | 
					@ -46,4 +49,22 @@
 | 
				
			||||||
    opacity: 1;
 | 
					    opacity: 1;
 | 
				
			||||||
    transform: translateY(0);
 | 
					    transform: translateY(0);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@keyframes TootActionGroup_fade-out {
 | 
				
			||||||
 | 
					  0% {
 | 
				
			||||||
 | 
					    opacity: 1;
 | 
				
			||||||
 | 
					    transform: translateY(0px);
 | 
				
			||||||
 | 
					    margin-bottom: 0px;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  75% {
 | 
				
			||||||
 | 
					    margin-bottom: -30px;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  100% {
 | 
				
			||||||
 | 
					    opacity: 0;
 | 
				
			||||||
 | 
					    transform: translateY(-10px);
 | 
				
			||||||
 | 
					    margin-bottom: -30px;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue