Skip to content

Commit

Permalink
Merge pull request #1488 from ThatConference/next/feature
Browse files Browse the repository at this point in the history
fix: typos in links and activity filter. plus lint requirement
  • Loading branch information
brettski authored Oct 19, 2023
2 parents 9c56986 + b869326 commit 862e43c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "that-us",
"version": "3.14.2",
"version": "3.14.3",
"description": "THAT.us website",
"main": "index.js",
"type": "module",
Expand Down
14 changes: 7 additions & 7 deletions src/_components/activities/List.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
(activity) =>
(activity.category === 'FAMILY' ? family : false) ||
(activity.category === 'PROFESSIONAL' ? professional : false) ||
activities.category === null
activity.category === null
);
$: activitiesLocationCategoryFiltered = primaryCategorySort.filter(
Expand Down Expand Up @@ -199,7 +199,7 @@
</script>

<div class="relative">
<div class="sticky top-0 z-30 ">
<div class="sticky top-0 z-30">
<div class="absolute right-0 top-0 flex content-center border-gray-200 pt-4">
<div class="form-check mr-2 mt-2 flex content-center">
<input
Expand All @@ -226,7 +226,7 @@
</button>
<input
use:autoFocus
class="form-input hidden h-10 rounded-md p-2 sm:inline sm:text-sm sm:leading-5 "
class="form-input hidden h-10 rounded-md p-2 sm:inline sm:text-sm sm:leading-5"
bind:value={searchterm}
placeholder="type to search..." />
</div>
Expand Down Expand Up @@ -254,17 +254,17 @@
<div>
<h2
id={dayjs(day.dayOfYear).format('dddd').toLowerCase()}
class="sticky top-0 z-20 -ml-5 -mr-5 mb-7 whitespace-nowrap
bg-gray-100 pl-5 pt-4 text-xl
class="sticky top-0 z-20 -ml-5 -mr-5 mb-7 whitespace-nowrap
bg-gray-100 pl-5 pt-4 text-xl
font-extrabold leading-9 tracking-tight text-thatBlue-800 sm:-ml-6 sm:-mr-6 sm:mb-9 sm:pl-6 sm:leading-10 md:text-4xl">
{dayjs(day.dayOfYear).format("dddd, MMMM D, 'YY")}
</h2>

{#each day.timeSlots as ts}
<div class="relative">
<h2
class="sm:top-13 sticky top-11 z-10 -ml-5 -mr-5 whitespace-nowrap bg-gray-100
pl-5 pt-2 text-xl font-extrabold
class="sm:top-13 sticky top-11 z-10 -ml-5 -mr-5 whitespace-nowrap bg-gray-100
pl-5 pt-2 text-xl font-extrabold
leading-9 tracking-tight text-thatOrange-400 sm:-ml-6 sm:-mr-6 sm:pl-6 sm:leading-10 md:text-4xl">
{#if !dayjs(ts.timeSlot).isValid()}
Unscheduled
Expand Down
2 changes: 1 addition & 1 deletion src/_components/footer/links.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export const myProfileLinks = [
},
{
text: 'My Profile',
href: '/my/profile/'
href: '/my/profiles/'
},
{
text: 'My Settings',
Expand Down
2 changes: 1 addition & 1 deletion src/app.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down

1 comment on commit 862e43c

@vercel
Copy link

@vercel vercel bot commented on 862e43c Oct 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.