From 41d97fcf2472681e88fadb135bc7f4604b8ac384 Mon Sep 17 00:00:00 2001 From: leafcompost <90290371+leafcompost@users.noreply.github.com> Date: Fri, 27 Sep 2024 09:47:24 -0700 Subject: [PATCH 1/6] Move the full postal address to the wiki; drop hover hack --- index.html | 37 +++++++++++++++++++++---------------- style.css | 17 ----------------- 2 files changed, 21 insertions(+), 33 deletions(-) diff --git a/index.html b/index.html index 4a605a5..d030ce9 100644 --- a/index.html +++ b/index.html @@ -6,25 +6,30 @@ + -

/dev/hack -$ -

-

seattle hackerspace

-

- 4534½ University Way NE, Seattle, WA 98105-4511 - (getting here) -

-

calendar

-
- -
-

contact

- -һëⅼⅼо@devhack.net + һëⅼⅼо@devhack.net - + + \ No newline at end of file diff --git a/style.css b/style.css index 893f96d..1b75cf3 100644 --- a/style.css +++ b/style.css @@ -32,20 +32,3 @@ dt::before { ul { list-style-type: '- '; } - -.address-hide { - opacity: 0.5; -} - -@media only screen and (min-width: 768px) { - /* For desktop, only show the address on hover. For mobile devices let's not - make people go through that. */ - .address-hide { - display: none; - } -} - -.address:hover .address-hide, -.address-hide:hover .address-hide { - display: inline; -} \ No newline at end of file -- 2.49.1 From 207727bdf7e4914552bdedf30be9923860d5102c Mon Sep 17 00:00:00 2001 From: leafcompost <90290371+leafcompost@users.noreply.github.com> Date: Fri, 27 Sep 2024 09:53:10 -0700 Subject: [PATCH 2/6] Improve [TM] link style (make same color, add hover color, remove underline) --- style.css | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/style.css b/style.css index 1b75cf3..84ba1bb 100644 --- a/style.css +++ b/style.css @@ -18,12 +18,15 @@ h1,p { margin: 40px 0px; } -a { - color: cyan; -} -a:visited { - color: mediumaquamarine; +a, a:visited { + color: #84d7ba; + text-decoration: none; } + +a:hover { + color: #d784a1; + } + dt::before { content: ">"; padding-right: 0.5em; -- 2.49.1 From 07ef33e5bafba7784472a87a01d40410abdef49b Mon Sep 17 00:00:00 2001 From: leafcompost <90290371+leafcompost@users.noreply.github.com> Date: Fri, 27 Sep 2024 10:17:23 -0700 Subject: [PATCH 3/6] Add end time; split each entry into multiple lines because we've got space --- index-cal.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/index-cal.js b/index-cal.js index dbf1bb5..d7191a8 100644 --- a/index-cal.js +++ b/index-cal.js @@ -19,15 +19,19 @@ function drawEventList(events) { weekday: 'long', month: "numeric", day: "numeric", + }; + const timeOptions = { hour: "numeric", minute: "numeric", }; const ul = document.createElement('ul'); events.forEach(event => { const li = document.createElement('li'); - const dateStr = `${event.start.toLocaleString('en-US', dateOptions)}`.toLocaleLowerCase(); + const dateStr = `${event.start.toLocaleDateString('en-US', dateOptions)}`.toLocaleLowerCase(); + const timeStr = `${event.start.toLocaleTimeString('en-US', timeOptions)}–${event.end.toLocaleTimeString('en-US', timeOptions)}`.toLocaleLowerCase(); const recurrenceStr = event.recurrence ? ` (${event.recurrence})` : ''; - li.textContent = `${event.summary}: ${dateStr}${recurrenceStr}`; + const descriptionStr = event.description ? `
${event.description}` : ''; + li.innerHTML = `${event.summary}${descriptionStr}
${dateStr}${recurrenceStr}
${timeStr}`; ul.appendChild(li); }); return ul; @@ -93,7 +97,9 @@ function getUpcomingEvents(vcalendar, numEvents = 10) { if (next.compare(sixHoursAgo) >= 0) { upcomingEvents.push({ summary: icalEvent.summary, + description: icalEvent.description, start: next.toJSDate(), + end: icalEvent.endDate.toJSDate(), recurrence: describeRecurrence(icalEvent) }); break; @@ -104,7 +110,9 @@ function getUpcomingEvents(vcalendar, numEvents = 10) { if (eventStart.compare(sixHoursAgo) >= 0) { upcomingEvents.push({ summary: icalEvent.summary, - start: eventStart.toJSDate() + description: icalEvent.description, + start: eventStart.toJSDate(), + end: icalEvent.endDate.toJSDate(), }); } } -- 2.49.1 From 40cacda826e80de9e2f818ea18989ffbae383531 Mon Sep 17 00:00:00 2001 From: leafcompost <90290371+leafcompost@users.noreply.github.com> Date: Fri, 27 Sep 2024 10:17:37 -0700 Subject: [PATCH 4/6] Add ICS link Closes #7 --- index.html | 2 +- style.css | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index d030ce9..f4a8b68 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,7 @@ (getting here)

-

calendar

+

calendar (ics)