diff --git a/TeamForge/settings.py b/TeamForge/settings.py index ab62fd6..4e3c908 100644 --- a/TeamForge/settings.py +++ b/TeamForge/settings.py @@ -140,6 +140,7 @@ AUTHENTICATION_BACKENDS = [ CONSTANCE_BACKEND = "constance.backends.database.DatabaseBackend" CONSTANCE_CONFIG = { "TF_CLUB_NAME": (config("TF_CLUB_NAME", default="TeamForge", cast=str), "Club Name", str), + "TF_CLUB_LOGO": (config("TF_CLUB_LOGO", default="teamforge/logo.png", cast=str), "Club Logo", str), "TF_CLUB_HOME": (config("TF_CLUB_HOME", default="TeamForge Home", cast=str), "Club Location", str), "TF_DEFAULT_SEASON_MONTH": (config("TF_DEFAULT_SEASON_MONTH", default=8, cast=int), "Default season start month", int), "TF_DEFAULT_SEASON_DAY": (config("TF_DEFAULT_SEASON_DAY", default=1, cast=int), "Default season start day", int), diff --git a/static/teamforge/logo.png b/static/teamforge/logo.png index 58e1594..0fb4ff3 100644 Binary files a/static/teamforge/logo.png and b/static/teamforge/logo.png differ diff --git a/templates/backend/base.html b/templates/backend/base.html index 5cb6467..63913c1 100644 --- a/templates/backend/base.html +++ b/templates/backend/base.html @@ -1,2 +1 @@ -{% extends "base.html" %} - +{% extends "base.html" %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 8481d61..3640d3a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -25,6 +25,45 @@ - {% block content %}{% endblock content %} +
+
+ + +
+ {% if config.TF_CLUB_LOGO != "teamforge/logo.png" %} + {{ config.TF_CLUB_NAME }} Logo + {% else %} + {{ config.TF_CLUB_NAME }} Logo + {% endif %} + + {{ config.TF_CLUB_NAME }} +
+
+ +
+
+
+ BS +
+
+
+
+ +
+ +
+ {% block content %}PAGE CONTENT{% endblock content %} +
+ +
+ +
+ {% block sidebar %}SIDEBAR CONTENT{% endblock sidebar %} +
+
+
\ No newline at end of file diff --git a/theme/static_src/src/styles.css b/theme/static_src/src/styles.css index 76422f5..e8b2e53 100644 --- a/theme/static_src/src/styles.css +++ b/theme/static_src/src/styles.css @@ -1,4 +1,10 @@ +@import url('https://fonts.googleapis.com/css2?family=Cabin:ital,wght@0,400..700;1,400..700&family=Catamaran:wght@100..900&family=Fira+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Noto+Sans:ital,wght@0,100..900;1,100..900&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Graduate&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Barlow+Semi+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Barlow+Semi+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap'); + @import "tailwindcss"; + @plugin "daisyui"; /** @@ -9,3 +15,8 @@ * the scope of this path. */ @source "../../../**/*.{html,py,js}"; + +@theme { + --font-jersey: Graduate, sans-serif; + --font-sans: Open Sans, Noto Sans, Barlow Semi Condensed, Ubuntu, Fira Sans, Catamaran, Cabin, Roboto, sans-serif; +} \ No newline at end of file