From 73c5cffabbb8b36d877811c4d1b56abf6939bda5 Mon Sep 17 00:00:00 2001 From: quietreading Date: Mon, 7 Jul 2025 17:00:11 -0400 Subject: edits --- public/css/style.css | 74 +++++++++++++++++++++++---------- public/fonts/charter_bold.woff2 | Bin 0 -> 15028 bytes public/fonts/charter_bold_italic.woff2 | Bin 0 -> 16108 bytes public/fonts/charter_italic.woff2 | Bin 0 -> 15376 bytes public/fonts/charter_regular.woff2 | Bin 0 -> 14648 bytes public/hex.ico | Bin 0 -> 224674 bytes public/js/modules/new.js | 49 +++++++++++++--------- public/logo2-min.png | Bin 0 -> 65648 bytes public/pictures/bookclub.jpg | Bin 0 -> 325685 bytes public/pictures/jefferson.jpg | Bin 0 -> 183898 bytes public/pictures/marthas.jpg | Bin 0 -> 232435 bytes public/pictures/mccarren.jpg | Bin 0 -> 406425 bytes 12 files changed, 82 insertions(+), 41 deletions(-) create mode 100644 public/fonts/charter_bold.woff2 create mode 100644 public/fonts/charter_bold_italic.woff2 create mode 100644 public/fonts/charter_italic.woff2 create mode 100644 public/fonts/charter_regular.woff2 create mode 100644 public/hex.ico create mode 100644 public/logo2-min.png create mode 100644 public/pictures/bookclub.jpg create mode 100644 public/pictures/jefferson.jpg create mode 100644 public/pictures/marthas.jpg create mode 100644 public/pictures/mccarren.jpg (limited to 'public') diff --git a/public/css/style.css b/public/css/style.css index 3060098..70c6657 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,4 +1,29 @@ /* TYPOGRAPHY */ +@font-face { + font-family: Charter; + src: url(/fonts/charter_regular.woff2) format('woff2-variations'); + font-style: normal; +} + +@font-face { + font-family: Charter; + src: url(/fonts/charter_italic.woff2) format('woff2-variations'); + font-style: italic; +} + +@font-face { + font-family: Charter; + src: url(/fonts/charter_bold.woff2) format('woff2-variations'); + font-weight: bold; +} + +@font-face { + font-family: Charter; + src: url(/fonts/charter_bold_italic.woff2) format('woff2-variations'); + font-style: italic; + font-weight: bold; +} + @font-face { font-family: "Fredoka"; font-style: normal; @@ -12,13 +37,14 @@ } body { + font-family: "", sans-serif; color: var(--color--black); } h1, h2, h3 { - font-family: "Fredoka", sans-serif; + font-family: "Charter", sans-serif; font-weight: 400; font-optical-sizing: auto; font-weight: 400; @@ -26,7 +52,7 @@ h3 { } .lead { - font-family: "Fredoka", sans-serif; + font-family: "Charter", sans-serif; font-weight: 300; font-optical-sizing: auto; font-style: normal; @@ -225,26 +251,25 @@ html { } body { - background: var(--color-grey-97); + background: #fdfdfd; } body > #container { min-height: 100vh; width: 100%; - max-width: 75rem; + max-width: 55em; display: grid; margin: 0 auto; - grid-template-columns: 1fr; - grid-template-rows: min-content auto; padding: 0; } #container > #content { overflow: hidden; border: 1px solid var(--color-grey-90); - background: #fff; + background: #fdfdfd; display: flex; flex-direction: column; + padding: 1em; } #container > #content > main { @@ -252,7 +277,7 @@ body > #container { } #container > #content > main.page { - padding: 1rem; + /* padding: 1rem; */ } #container > #content > main.event > *:not(.event-header-image,.event__editing-banner) { @@ -274,29 +299,22 @@ body > #container { @media (min-width: 768px) { body > #container { padding: 1rem; - grid-template-columns: 1fr 4fr; - grid-template-rows: auto; + margin-top: 6%; gap: 1rem; } #container > #content { - border-radius: 1rem; - box-shadow: 0 0 6px rgba(0, 0, 0, 0.1); - } - #container > #content > main.page { - padding: 2rem; + border-radius: 4px; + border: 1px DarkSlateGrey dotted; + box-shadow: 4px 4px 0px rgba(0, 0, 0, .5); } + #container > #content > main.page {} } -@media (min-width: 992px) { - body > #container { - grid-template-columns: 1fr 5fr; - } -} /* SIDEBAR */ #sidebar h1 { - font-family: "Fredoka", sans-serif; + font-family: "Charter", sans-serif; font-weight: 700; font-optical-sizing: auto; font-style: normal; @@ -799,3 +817,17 @@ article.static-page header { margin-bottom: 1rem; border-bottom: 1px solid #e0e0e0; } + +.navi { + text-align: center; +} + +.instance-description { + text-align: center; +} + +.logo { + width: 250px; + max-width: 60%; + margin: 3em; +3 diff --git a/public/fonts/charter_bold.woff2 b/public/fonts/charter_bold.woff2 new file mode 100644 index 0000000..008c4f5 Binary files /dev/null and b/public/fonts/charter_bold.woff2 differ diff --git a/public/fonts/charter_bold_italic.woff2 b/public/fonts/charter_bold_italic.woff2 new file mode 100644 index 0000000..8a2cacc Binary files /dev/null and b/public/fonts/charter_bold_italic.woff2 differ diff --git a/public/fonts/charter_italic.woff2 b/public/fonts/charter_italic.woff2 new file mode 100644 index 0000000..ea15e1a Binary files /dev/null and b/public/fonts/charter_italic.woff2 differ diff --git a/public/fonts/charter_regular.woff2 b/public/fonts/charter_regular.woff2 new file mode 100644 index 0000000..d4bc9e0 Binary files /dev/null and b/public/fonts/charter_regular.woff2 differ diff --git a/public/hex.ico b/public/hex.ico new file mode 100644 index 0000000..304edfb Binary files /dev/null and b/public/hex.ico differ diff --git a/public/js/modules/new.js b/public/js/modules/new.js index 70df641..1dd8843 100644 --- a/public/js/modules/new.js +++ b/public/js/modules/new.js @@ -32,25 +32,34 @@ $(document).ready(function () { }); function newEventForm() { + data = { + eventName: "", + eventLocation: "", + eventStart: "", + eventEnd: "", + timezone: "", + eventDescription: "", + eventURL: "", + hostName: "", + creatorEmail: "", + eventGroupID: "", + eventGroupEditToken: "", + publicCheckbox: false, + interactionCheckbox: false, + joinCheckbox: false, + maxAttendeesCheckbox: false, + maxAttendees: "", + } + const urlParams = new URLSearchParams(window.location.search); + var els = ['eventName', 'eventLocation', 'eventStart', 'eventEnd', 'timezone', 'eventDescription', 'eventURL', 'hostName', 'creatorEmail', 'interactionCheckbox', 'joinCheckbox', 'maxAttendeesCheckbox', 'maxAttendees'] + for (var el of els) { + const attr = urlParams.get(el); + if (attr) { + data[el] = attr + } + } return { - data: { - eventName: "", - eventLocation: "", - eventStart: "", - eventEnd: "", - timezone: "", - eventDescription: "", - eventURL: "", - hostName: "", - creatorEmail: "", - eventGroupID: "", - eventGroupEditToken: "", - publicCheckbox: false, - interactionCheckbox: false, - joinCheckbox: false, - maxAttendeesCheckbox: false, - maxAttendees: "", - }, + data: data, errors: [], submitting: false, init() { @@ -66,7 +75,7 @@ function newEventForm() { this.data.interactionCheckbox = false; this.data.joinCheckbox = false; this.data.maxAttendeesCheckbox = false; - this.data.publicCheckbox = false; + this.data.publicCheckbox = true; }, updateEventEnd() { if (this.data.eventEnd === "" || this.data.eventEnd < this.data.eventStart) { @@ -129,7 +138,7 @@ function newEventGroupForm() { }, init() { // Reset checkboxes - this.data.publicCheckbox = false; + this.data.publicCheckbox = true; }, errors: [], submitting: false, diff --git a/public/logo2-min.png b/public/logo2-min.png new file mode 100644 index 0000000..96579e0 Binary files /dev/null and b/public/logo2-min.png differ diff --git a/public/pictures/bookclub.jpg b/public/pictures/bookclub.jpg new file mode 100644 index 0000000..b323e4b Binary files /dev/null and b/public/pictures/bookclub.jpg differ diff --git a/public/pictures/jefferson.jpg b/public/pictures/jefferson.jpg new file mode 100644 index 0000000..d8dd448 Binary files /dev/null and b/public/pictures/jefferson.jpg differ diff --git a/public/pictures/marthas.jpg b/public/pictures/marthas.jpg new file mode 100644 index 0000000..f7cee87 Binary files /dev/null and b/public/pictures/marthas.jpg differ diff --git a/public/pictures/mccarren.jpg b/public/pictures/mccarren.jpg new file mode 100644 index 0000000..6a580f3 Binary files /dev/null and b/public/pictures/mccarren.jpg differ -- cgit v1.2.3