diff --git a/assets/controllers/progress_bar_controller.js b/assets/controllers/progress_bar_controller.js index aef6a30..eb37deb 100644 --- a/assets/controllers/progress_bar_controller.js +++ b/assets/controllers/progress_bar_controller.js @@ -5,13 +5,14 @@ export default class extends Controller { static targets = ["bar"]; connect() { - document.addEventListener("click", this.handleInteraction); + this.boundHandleInteraction = this.handleInteraction.bind(this); + document.addEventListener("click", this.boundHandleInteraction); document.addEventListener("touchstart", this.handleTouchStart); document.addEventListener("touchend", this.handleTouchEnd); } disconnect() { - document.removeEventListener("click", this.handleInteraction); + document.removeEventListener("click", this.boundHandleInteraction); document.removeEventListener("touchstart", this.handleTouchStart); document.removeEventListener("touchend", this.handleTouchEnd); } diff --git a/assets/styles/app.css b/assets/styles/app.css index 8694975..6516747 100644 --- a/assets/styles/app.css +++ b/assets/styles/app.css @@ -32,7 +32,8 @@ h1.brand { -h1.brand a { +h1.brand a, +.publisher a { color: var(--brand-color); } diff --git a/assets/styles/layout.css b/assets/styles/layout.css index 50ed060..d0bd88e 100644 --- a/assets/styles/layout.css +++ b/assets/styles/layout.css @@ -81,7 +81,7 @@ header { } /* Mobile Styles */ -@media (max-width: 768px) { +@media (max-width: 1024px) { .header__logo { justify-content: space-around; } @@ -158,7 +158,7 @@ dt { } /* Responsive adjustments */ -@media (max-width: 768px) { +@media (max-width: 1024px) { nav, aside { display: none; /* Hide the sidebars on small screens */ } diff --git a/assets/styles/theme.css b/assets/styles/theme.css index 6fceda1..60e4570 100644 --- a/assets/styles/theme.css +++ b/assets/styles/theme.css @@ -21,34 +21,3 @@ --brand-color: white; } -[data-theme="light"] { - --color-bg: #f4f1ee; - --color-bg-light: #e8e4df; - --color-text: #2a2a2a; - --color-text-mid: #3a3a3a; /* Warm light gray */ - --color-text-contrast: #f4f1ee; - --brand-color: black; -} - -[data-theme="space"] { - --color-bg: #141120; /* Deep violet-black */ - --color-bg-light: #1e1a2e; /* Slightly lighter for contrast */ - --color-bg-primary: #251634; /* Rich purple base (darkened brand tone) */ - - --color-text: #f4f0fc; /* Near-white with a lavender hue */ - --color-text-mid: #c9b9eb; /* Soft pastel lavender */ - --color-text-contrast: #0c0712; /* Near-black for contrast */ - - --color-primary: #c095f4; /* Vibrant purple (the new brand) */ - --color-primary-light: #c9b9eb; /* Lighter variant for hovers/effects */ - --color-secondary: #e8bb8d; /* Warm tan/peach for complementary balance */ - --color-secondary-light: #f4d6b6; /* Lighter peach tone */ - --color-secondary-bg: #fbebdb; /* Ultra-light background variant */ - - --color-border: #322c44; /* Subtle purple-gray */ - - --brand-color: rgb(147, 51, 234); - --brand-font: 'Poppins', sans-serif; /* A classic, refined branding font */ - -} - diff --git a/assets/theme/default/theme.css b/assets/theme/default/theme.css index 9dfa056..3953af7 100644 --- a/assets/theme/default/theme.css +++ b/assets/theme/default/theme.css @@ -1,25 +1,3 @@ -@import url('https://fonts.googleapis.com/css2?family=Newsreader:ital,opsz,wght@0,6..72,200..800;1,6..72,200..800&family=Playfair+Display:ital,wght@0,400..900;1,400..900&display=swap'); -@import url('https://fonts.googleapis.com/css2?family=Montserrat&display=swap'); -@import url('https://fonts.googleapis.com/css2?family=Lobster&display=swap'); - - -:root { - --color-bg: #1a1a1a; /* Deep charcoal background */ - --color-bg-light: #2a2a2a; /* Slightly lighter charcoal */ - --color-bg-primary: #2e1f2e; /* Muted aubergine for a rich, elegant feel */ - --color-text: #f5f5f5; /* Soft white for readability */ - --color-text-mid: #d8d8d8; /* Warm light gray */ - --color-text-contrast: #000; /* Black text for contrast */ - --color-primary: #5F7355; /* Plum primary color */ - --color-secondary: #495544; /* secondary color */ - --color-border: #3a3a3a; /* Subtle gray border */ - --font-family: 'Montserrat', serif; /* Set the Montserrat font as default */ - --main-body-font: 'Newsreader', serif; /* Set the font for the main body */ - --heading-font: 'EB Garamond', serif; /* Set the font for headings */ - --brand-font: 'Lobster', serif; /* A classic, refined branding font */ - --brand-color: white; -} - [data-theme="light"] { --color-bg: #f4f1ee; --color-bg-light: #e8e4df; diff --git a/assets/theme/local/.gitignore b/assets/theme/local/.gitignore index e69de29..745aff3 100644 --- a/assets/theme/local/.gitignore +++ b/assets/theme/local/.gitignore @@ -0,0 +1,2 @@ +icons +theme.css diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml index d17a0f4..71fac17 100644 --- a/config/packages/twig.yaml +++ b/config/packages/twig.yaml @@ -1,6 +1,7 @@ twig: file_name_pattern: '*.twig' globals: + publisher_npub: '%npub%' website_name: '%name%' website_short_name: '%short_name%' website_description: '%description%' diff --git a/config/unfold.yaml b/config/unfold.yaml index 0fc4b9e..167e0be 100644 --- a/config/unfold.yaml +++ b/config/unfold.yaml @@ -1,5 +1,5 @@ parameters: - name: 'Unfold Magazine' + name: 'Unfold Demo' short_name: 'Unfold' description: 'Unfolding nostr magazines and community articles' default_relay: 'wss://TheForest.nostr1.com' diff --git a/templates/base.html.twig b/templates/base.html.twig index 002bdf5..1057131 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -16,12 +16,12 @@ {% block ogtags %} {% endblock %} - - {% block stylesheets %} - {% endblock %} {% block javascripts %} {% block importmap %}{{ importmap('app') }}{% endblock %} {% endblock %} + {% block stylesheets %} + + {% endblock %}
diff --git a/templates/components/Footer.html.twig b/templates/components/Footer.html.twig index 45617dd..d0b4b0b 100644 --- a/templates/components/Footer.html.twig +++ b/templates/components/Footer.html.twig @@ -9,5 +9,5 @@ {% endfor %} -{{ "now"|date("Y") }} {{ website_name }}
+{{ "now"|date("Y") }} {{ website_name }} by