From e67a9529840318e1d4479e939fff1072bc01182f Mon Sep 17 00:00:00 2001 From: SamuelmdLow Date: Sat, 2 Nov 2024 19:00:51 +0000 Subject: [PATCH] Added mastodon to sharebar with tootpick, swapped back logo, added fonts for science supplement --- .../article_page_supplement_2024_science.html | 25 ++++++----- .../templates/article/objects/share_bar.html | 3 +- events/models.py | 2 +- events/templates/events/event_page.html | 4 +- .../templates/navigation/headers/main.html | 6 +-- .../templates/navigation/headers/mobile.html | 4 +- .../templates/navigation/headers/topbar.html | 4 +- .../headers/visual-essay-header.html | 4 +- .../ubyssey-logo-blue-dark.svg} | 0 .../ubyssey-logo-blue-light.svg} | 0 .../src/js/components/Events/calendar.jsx | 4 +- ubyssey/static_src/src/js/main.js | 6 +++ .../static_src/src/styles/science-2024.scss | 42 ++++++++++++++++--- ubyssey/templates/500.html | 2 +- ubyssey/templates/headers/mobile.html | 2 +- ubyssey/templates/headers/topbar.html | 2 +- 16 files changed, 76 insertions(+), 34 deletions(-) rename ubyssey/static_src/src/images/{ubyssey-logo 1.svg => logos/ubyssey-logo-blue-dark.svg} (100%) rename ubyssey/static_src/src/images/{ubyssey-logo-small.svg => logos/ubyssey-logo-blue-light.svg} (100%) diff --git a/article/templates/article/article_page_supplement_2024_science.html b/article/templates/article/article_page_supplement_2024_science.html index 2aa74c6bb..8003a7112 100644 --- a/article/templates/article/article_page_supplement_2024_science.html +++ b/article/templates/article/article_page_supplement_2024_science.html @@ -13,7 +13,7 @@ {% block stylesheet %} - + {% endblock %} @@ -33,17 +33,19 @@
-

science supplement 2024//    edited by Gloria Klein

+

science supplement 2024//    edited by Gloria Klein

Food for thought

@@ -93,25 +95,28 @@

+

diff --git a/article/templates/article/objects/share_bar.html b/article/templates/article/objects/share_bar.html index be167dd39..e12ae05ce 100644 --- a/article/templates/article/objects/share_bar.html +++ b/article/templates/article/objects/share_bar.html @@ -2,8 +2,9 @@ diff --git a/events/models.py b/events/models.py index e5121ac96..e12edb70e 100644 --- a/events/models.py +++ b/events/models.py @@ -375,7 +375,7 @@ async def ubcevents_judge_hidden(self, event, ical): # Hide events with certain terms in the title # The first two listed right now are on an inaccurate repeating schedule, the last was an advertisment for a sale that lasted too long - for i in ['coffee hour', 'advanced research computing summer school', 'Student Indoor Plant Sale at UBC Botanical Garden']: + for i in ['coffee hour', 'advanced research computing summer school', 'Student Indoor Plant Sale at UBC Botanical Garden', 'Grapes to Glass']: if i.lower() in title.lower(): return True diff --git a/events/templates/events/event_page.html b/events/templates/events/event_page.html index 3bd6a0038..a3650fc5d 100644 --- a/events/templates/events/event_page.html +++ b/events/templates/events/event_page.html @@ -40,8 +40,8 @@
- - + +
diff --git a/navigation/templates/navigation/headers/main.html b/navigation/templates/navigation/headers/main.html index 81ecc23b8..5f1aa488b 100644 --- a/navigation/templates/navigation/headers/main.html +++ b/navigation/templates/navigation/headers/main.html @@ -5,10 +5,8 @@
- - - - + +

diff --git a/navigation/templates/navigation/headers/mobile.html b/navigation/templates/navigation/headers/mobile.html index 8bcc5e2f0..8856b73cb 100644 --- a/navigation/templates/navigation/headers/mobile.html +++ b/navigation/templates/navigation/headers/mobile.html @@ -26,8 +26,8 @@

Links

{% comment %} {% endcomment %} diff --git a/navigation/templates/navigation/headers/topbar.html b/navigation/templates/navigation/headers/topbar.html index 202d46f97..b58404342 100644 --- a/navigation/templates/navigation/headers/topbar.html +++ b/navigation/templates/navigation/headers/topbar.html @@ -8,8 +8,8 @@
- - + +