Skip to content

Commit 15b1272

Browse files
authored
Merge pull request #2 from Exgene/main
style: update /features style
2 parents fdaaa8e + c570d5e commit 15b1272

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

src/routes/(nav)/(grid)/user-submit.svelte

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@
2323
</script>
2424

2525
<div class="mb-0 flex flex-col items-center justify-center gap-y-10">
26-
<div class="mb-0 flex w-full flex-col items-center justify-center gap-x-4 gap-y-4 sm:flex-row px-16">
26+
<div
27+
class="mb-0 flex w-full flex-col items-center justify-center gap-x-4 gap-y-4 px-16 sm:flex-row"
28+
>
2729
<Select.Root bind:selected={source_country}>
2830
<Select.Trigger
29-
class="h-16 w-full max-w-sm justify-center gap-x-2 rounded-full border-2 sm:text-lg text-base"
31+
class="h-16 w-full max-w-sm justify-center gap-x-2 rounded-full border-2 text-base sm:text-lg"
3032
>
3133
<Select.Value placeholder="Source" />
3234
</Select.Trigger>
@@ -39,7 +41,7 @@
3941

4042
<Select.Root bind:selected={dest_country}>
4143
<Select.Trigger
42-
class="h-16 w-full max-w-sm justify-center gap-x-2 rounded-full border-2 sm:text-lg text-base"
44+
class="h-16 w-full max-w-sm justify-center gap-x-2 rounded-full border-2 text-base sm:text-lg"
4345
>
4446
<Select.Value placeholder="Destination" />
4547
</Select.Trigger>
@@ -52,7 +54,7 @@
5254

5355
<Select.Root bind:selected={product_category}>
5456
<Select.Trigger
55-
class="h-16 w-full max-w-sm justify-center gap-x-2 rounded-full border-2 sm:text-lg text-base"
57+
class="h-16 w-full max-w-sm justify-center gap-x-2 rounded-full border-2 text-base sm:text-lg"
5658
>
5759
<Select.Value placeholder="Product Category" />
5860
</Select.Trigger>

src/routes/(nonav)/features/+page.svelte

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
import * as Card from '$lib/components/ui/card';
33
import * as Drawer from '$lib/components/ui/drawer';
44
5-
import SvelteMarkdown from 'svelte-markdown';
65
import { Separator } from '$lib/components/ui/separator';
6+
import { Icons } from '$lib/icons';
7+
import SvelteMarkdown from 'svelte-markdown';
8+
import Map from './Map.svelte';
9+
import ResultTable from './ResultTable.svelte';
710
import UserForm from './user-form.svelte';
811
import UserMenu from './user-menu.svelte';
9-
import ResultTable from './ResultTable.svelte';
10-
import Map from './Map.svelte';
1112
1213
import { PUBLIC_MAPS_API_KEY } from '$env/static/public';
1314
@@ -19,7 +20,7 @@
1920

2021
<div class="flex h-screen flex-col gap-6 px-4 py-6 md:px-16">
2122
<!-- Header Section -->
22-
<div class="hidden flex-col items-center gap-2 sm:flex sm:flex-row md:gap-6">
23+
<div class="hidden w-full flex-col items-center gap-2 sm:flex sm:flex-row md:gap-6">
2324
<UserMenu></UserMenu>
2425
<Card.Root class="w-full">
2526
<!-- <Card.Content class="w-full"> -->
@@ -28,12 +29,14 @@
2829
</Card.Root>
2930
</div>
3031

31-
<div class="flex flex-row items-center gap-2 sm:hidden">
32+
<div class="flex w-full flex-row items-center gap-2 sm:hidden">
3233
<UserMenu></UserMenu>
3334
<Drawer.Root>
3435
<Drawer.Trigger>
3536
<Card.Root class="h-full w-full shadow-lg">
36-
<Card.Content class="flex min-w-[40vw] align-middle text-xl">Options</Card.Content>
37+
<Card.Content class="flex gap-2 font-bold h-full w-full items-center justify-center p-3 text-sm"
38+
><p>Options</p><Icons.pizza /></Card.Content
39+
>
3740
</Card.Root>
3841
</Drawer.Trigger>
3942
<Drawer.Content>
@@ -44,7 +47,7 @@
4447
</div>
4548

4649
<!-- Maps and Results Sections -->
47-
<div class="flex h-[70vh] flex-col gap-2 sm:flex-row md:gap-4">
50+
<div class="flex h-full flex-col gap-2 sm:h-[70vh] sm:flex-row md:gap-4">
4851
<!-- The map -->
4952
<Map
5053
class="h-full w-full rounded-lg border shadow-lg sm:w-2/3"

src/routes/(nonav)/features/user-menu.svelte

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<script lang="ts">
2+
import { ThemeToggleButton } from '$lib/components/theme';
23
import * as Card from '$lib/components/ui/card';
34
import { Separator } from '$lib/components/ui/separator';
45
import { Icons } from '$lib/icons';
56
import ProfileButton from '$lib/profile/profile-button.svelte';
6-
import { ThemeToggleButton } from '$lib/components/theme';
77
88
/* ******************************************************** */
99
@@ -17,8 +17,10 @@
1717
// let product_hs = url.searchParams.get('product');
1818
</script>
1919

20-
<Card.Root class="h-full sm:w-fit shadow-lg w-full">
21-
<Card.Content class="flex h-full flex-row sm:flex-col items-center sm:justify-between justify-around px-2 sm:pb-2 pb-0">
20+
<Card.Root class="h-full w-full shadow-lg sm:w-fit">
21+
<Card.Content
22+
class="flex h-full flex-row items-center justify-around px-2 pb-0 sm:flex-col sm:justify-between sm:pb-2"
23+
>
2224
<a href="/" class="my-2">
2325
<Icons.logoDark class="hidden rounded-full dark:block" />
2426
<Icons.logo class="rounded-full dark:hidden" />

0 commit comments

Comments
 (0)