Skip to content

Commit

Permalink
Merge branch 'v2' into style-tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
wesbos authored Sep 21, 2023
2 parents 888d8e2 + 0b4d9ef commit 9d4fba8
Show file tree
Hide file tree
Showing 32 changed files with 289 additions and 244 deletions.
6 changes: 5 additions & 1 deletion src/app.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// See https://kit.svelte.dev/docs/types#app
import type {UserWithRoles} from '$server/auth/users';
import type { UserWithRoles } from '$server/auth/users';
import { PrismaClient } from '@prisma/client/index.d.ts';

// for information about these interfaces
Expand All @@ -18,6 +18,10 @@ declare global {
// interface PageData {}
// interface Platform {}
}
interface Document {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
startViewTransition: (callback: any) => void; // Add your custom property/method here
}
}

export {};
2 changes: 1 addition & 1 deletion src/lib/LayoutDebug.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</div>
{/if}

<style>
<style lang="postcss">
:global(.layout) > .l-margin-debug {
pointer-events: none;
grid-column: l-margin / l-margin-end !important;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Loading.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</div>
{/if}

<style>
<style lang="postcss">
.loader {
z-index: 10;
position: fixed;
Expand Down
3 changes: 2 additions & 1 deletion src/lib/PodcastHero.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</div>
</section>

<style>
<style lang="postcss">
section {
background-image: url($assets/whitegrit.png),
radial-gradient(farthest-side circle at 50% 0%, #3a006b36 4% 4%, #000 100%);
Expand All @@ -66,6 +66,7 @@
max-width: 850px;
margin: 0 auto;
}
.zone {
padding-bottom: 2rem;
}
Expand Down
3 changes: 2 additions & 1 deletion src/lib/PodcastLinks.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
{/each}
</div>


<p>social..</p>

<style>
<style lang="postcss">
div {
display: flex;
flex-wrap: wrap;
Expand Down
6 changes: 3 additions & 3 deletions src/lib/hosts/Host.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
export let guest: boolean = false;
export let host: {
name: string;
github: string;
twitter: string;
github?: string;
twitter?: string;
slug?: string;
};
</script>
Expand All @@ -25,7 +25,7 @@
</figcaption>
</figure>

<style>
<style lang="postcss">
figure {
display: grid;
gap: 20px;
Expand Down
5 changes: 3 additions & 2 deletions src/lib/hosts/HostSocialLink.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
import Icon from '$lib/Icon.svelte';
export let host: {
name: string;
github: string;
twitter: string;
github?: string | null;
twitter?: string | null;
slug?: string;
};
</script>

<a href={`https://x.com/${host.twitter}`} target="_blank" rel="noopener" class="social-icon">
<Icon name="x" title={`${host.name} on X`} />
</a>

<a href={`https://github.com/${host.github}`} target="_blank" rel="noopener" class="social-icon">
<Icon name="github" title={`${host.name} on GitHub`} />
</a>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/player/Album.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</svg>
</div>

<style>
<style lang="postcss">
.album {
background-color: var(--black);
padding: 5px;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/player/CD.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
</svg>
</div>

<style>
<style lang="postcss">
.case {
position: relative;
background: black;
Expand Down
262 changes: 150 additions & 112 deletions src/lib/player/Disc.svelte

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/lib/player/Visualizer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
{/each}
</div>

<style>
<style lang="postcss">
.visualizer {
gap: 5px;
height: 60px;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/search/SearchResults.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Renders a list of search results
<p class="info">No results</p>
{/if}

<style>
<style lang="postcss">
.info {
padding: 1rem;
font-size: 1.2rem;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/theme/ThemeToggle.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<button on:click={theme_maker.open}>🎨</button>

<style>
<style lang="postcss">
button {
background: transparent;
border: var(--yellow) solid 1px;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/transcript/Squiggle.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/>
</svg>

<style>
<style lang="postcss">
svg {
position: absolute;
top: 100%;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/transcript/TableOfContents.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ul>
</div>

<style>
<style lang="postcss">
ul {
margin: 0;
padding: 0;
Expand Down
4 changes: 1 addition & 3 deletions src/lib/transcript/Transcript.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
{/each}
</div>

<style>
<style lang="postcss">
.timeline {
--highlight: var(--bg-2);
--future: var(--bg-2);
Expand Down Expand Up @@ -266,8 +266,6 @@
.timeline {
--gutter-border-size: 5px;
section {
}
}
.speaker {
font-size: var(--font-size-sm);
Expand Down
2 changes: 1 addition & 1 deletion src/params/ThemeMaker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<!-- Themes should be only in json or in a users settings. -->
<!-- Saved as a cookie -->

<style>
<style lang="postcss">
section {
position: fixed;
top: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/routes/UserMenu.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
>
{/if}

<style>
<style lang="postcss">
.avatar {
width: 50px;
height: 50px;
Expand Down
2 changes: 1 addition & 1 deletion src/routes/about/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
</div>
</main>

<style>
<style lang="postcss">
img.avatar {
width: 150px;
border-radius: 8px;
Expand Down
2 changes: 1 addition & 1 deletion src/routes/admin/shows/+page.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { import_or_update_all_shows } from '$server/shows';
import { error } from '@sveltejs/kit';
import { get_transcript } from '$server/transcripts/deepgram';
import { aiNoteRequestHandler } from '$server/ai/requestHandlers';
import { PageServerLoad } from './$types';
import type { PageServerLoad } from './$types';

export const load: PageServerLoad = async ({ locals }) => {
return {
Expand Down
2 changes: 1 addition & 1 deletion src/routes/admin/shows/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</tbody>
</table>

<style>
<style lang="postcss">
table {
border: 1px solid black;
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion src/routes/admin/shows/[show_number]/Dump.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</tbody>
</table>

<style>
<style lang="postcss">
table {
border: 1px solid black;
width: 100%;
Expand Down
1 change: 1 addition & 0 deletions src/routes/admin/transcripts/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script lang="ts">
import { enhance } from '$app/forms';
import { form_action } from '$lib/form_action';
import { ActionResult } from '@sveltejs/kit';
import type { PageData } from './$types';
import { format } from 'date-fns';
Expand Down
32 changes: 18 additions & 14 deletions src/routes/guest/[name_slug]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,26 @@
$: ({ guest } = data);
</script>

<section>
<header>
<img src={`https://github.com/${guest.github}.png`} alt={guest.name} />
<div>
<h1>{guest.name}</h1>
<div class="guest_socials">
<HostSocialLink link={`https://x.com/${guest.twitter}`} />
{#if guest}
<section>
<header>
<img src={`https://github.com/${guest.github}.png`} alt={guest.name} />
<div>
<h1>{guest.name}</h1>
{#if guest.twitter}
<div class="guest_socials">
<HostSocialLink host={guest} />
</div>
{/if}
</div>
</div>
</header>
{#each guest.shows as { Show }}
<ShowCard show={Show} display="list" />
{/each}
</section>
</header>
{#each guest.shows as { Show }}
<ShowCard show={Show} display="list" />
{/each}
</section>
{/if}

<style>
<style lang="postcss">
header {
display: grid;
grid-template-columns: auto 1fr;
Expand Down
2 changes: 1 addition & 1 deletion src/routes/og/[number=show_number]/Template.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</footer>
</div>

<style>
<style lang="postcss">
.og-template {
background: black;
color: white;
Expand Down
Loading

0 comments on commit 9d4fba8

Please sign in to comment.