hippoz/waffle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: hippoz:537036e8bb8bbd78e23ca7ca6bdc8ffba5a1bd8f
Branches Tags
hippoz:master
..
compare: hippoz:6cf7da50895ba8c65084aab1f03efc41c6a2817e
Branches Tags
hippoz:master

No commits in common. "537036e8bb8bbd78e23ca7ca6bdc8ffba5a1bd8f" and "6cf7da50895ba8c65084aab1f03efc41c6a2817e" have entirely different histories.
537036e8bb ... 6cf7da5089

4 changed files with 5 additions and 23 deletions
Show stats Expand all files Collapse all files

2
frontend/public/global.css
View file

@ -12,7 +12,7 @@
/* top-level */ /* top-level */
:root { :root {
--background-color-0: hsl(180, 11%, 5%); --background-color-0: hsl(180, 11%, 6%);
--background-color-1: hsl(180, 11%, 7%); --background-color-1: hsl(180, 11%, 7%);
--background-color-2: hsl(180, 11%, 10%); --background-color-2: hsl(180, 11%, 10%);
--background-color-3: hsl(180, 11%, 13%); --background-color-3: hsl(180, 11%, 13%);

18
frontend/src/animations.js
View file

@ -13,27 +13,9 @@ export function maybeModalFly(node) {
export function maybeFly(...e) { export function maybeFly(...e) {
if (getItem("ui:doAnimations")) if (getItem("ui:doAnimations"))
return fly(...e); return fly(...e);
else
return fly(e[0], { duration: 0 });
} }
export function maybeFade(...e) { export function maybeFade(...e) {
if (getItem("ui:doAnimations")) if (getItem("ui:doAnimations"))
return fade(...e); return fade(...e);
else
return fade(e[0], { duration: 0 });
}
export function maybeFlyIf(...e) {
if (getItem("ui:doAnimations") && e[1] && e[1]._condition)
return fly(...e);
else
return fly(e[0], { duration: 0 });
}
export function maybeFadeIf(...e) {
if (getItem("ui:doAnimations") && e[1] && e[1]._condition)
return fade(...e);
else
return fade(e[0], { duration: 0 });
} }

4
frontend/src/components/PresenceSidebar.svelte
View file

@ -1,7 +1,7 @@
<script> <script>
import { ArrowLeftIcon, AtSignIcon } from "svelte-feather-icons"; import { ArrowLeftIcon, AtSignIcon } from "svelte-feather-icons";
import { quadInOut } from "svelte/easing"; import { quadInOut } from "svelte/easing";
import { maybeFly, maybeFlyIf } from "../animations"; import { maybeFly } from "../animations";
import { presenceStore, showChannelView, showPresenceSidebar, smallViewport } from "../stores"; import { presenceStore, showChannelView, showPresenceSidebar, smallViewport } from "../stores";
let pendingExit = false; let pendingExit = false;
@ -11,7 +11,7 @@
}; };
</script> </script>
<div class="sidebar-container" in:maybeFly="{{ duration: 175, easing: quadInOut, x: 10 }}" out:maybeFlyIf="{{ _condition: !smallViewport.value, duration: 175, easing: quadInOut, x: -10 }}"> <div class="sidebar-container" in:maybeFly="{{ duration: 175, easing: quadInOut, x: 10 }}">
<div class="top-bar"> <div class="top-bar">
<span class="input-label">User List</span> <span class="input-label">User List</span>
</div> </div>

4
frontend/src/components/Sidebar.svelte
View file

@ -1,7 +1,7 @@
<script> <script>
import { HashIcon, PlusIcon, MoreVerticalIcon, SettingsIcon, CloudIcon } from "svelte-feather-icons"; import { HashIcon, PlusIcon, MoreVerticalIcon, SettingsIcon, CloudIcon } from "svelte-feather-icons";
import { quadInOut } from "svelte/easing"; import { quadInOut } from "svelte/easing";
import { maybeFly, maybeFlyIf } from "../animations"; import { maybeFly } from "../animations";
import { channels, gatewayStatus, overlayStore, selectedChannel, showChannelView, showSidebar, smallViewport, userInfoStore } from "../stores"; import { channels, gatewayStatus, overlayStore, selectedChannel, showChannelView, showSidebar, smallViewport, userInfoStore } from "../stores";
import UserTopBar from "./UserTopBar.svelte"; import UserTopBar from "./UserTopBar.svelte";
@ -14,7 +14,7 @@
} }
</script> </script>
<div class="sidebar-container" in:maybeFly="{{ duration: 175, easing: quadInOut, x: -10 }}" out:maybeFlyIf="{{ _condition: !smallViewport.value, duration: 175, easing: quadInOut, x: -10 }}"> <div class="sidebar-container" in:maybeFly="{{ duration: 175, easing: quadInOut, x: -10 }}">
<UserTopBar /> <UserTopBar />
<div class="sidebar"> <div class="sidebar">
{#each $channels as channel (channel.id)} {#each $channels as channel (channel.id)}