diff --git a/app/Config/App.php b/app/Config/App.php index 4d2227c0..2c5e100f 100644 --- a/app/Config/App.php +++ b/app/Config/App.php @@ -447,4 +447,6 @@ class App extends BaseConfig '192' => '/icon-192.png', '512' => '/icon-512.png', ]; + + public string $theme = 'crimson'; } diff --git a/app/Resources/styles/colorRadioBtn.css b/app/Resources/styles/colorRadioBtn.css new file mode 100644 index 00000000..73a39d5a --- /dev/null +++ b/app/Resources/styles/colorRadioBtn.css @@ -0,0 +1,26 @@ +@layer components { + .color-radio-btn { + @apply absolute opacity-0; + + &:focus + label { + @apply ring-accent; + } + + &:checked { + @apply ring-2 ring-contrast; + + & + label { + @apply flex items-center justify-center text-2xl text-accent-contrast bg-accent-base; + + &::before { + content: "✓"; + } + } + } + + & + label { + @apply inline-block w-16 h-16 text-sm font-semibold rounded-full cursor-pointer border-contrast bg-accent-base text-accent-contrast border-3; + color: hsl(var(--color-text-muted)); + } + } +} diff --git a/app/Resources/styles/colors.css b/app/Resources/styles/colors.css index eb285c50..27b5a5b4 100644 --- a/app/Resources/styles/colors.css +++ b/app/Resources/styles/colors.css @@ -1,54 +1,3 @@ -/* ---color-brand-lighter: hsl(173 44% 96%); ---color-brand-light: hsl(111 64% 94%); ---color-brand-base: hsl(174 100% 29%); ---color-brand-dark: hsl(172 100% 17%); ---color-brand-darker: hsl(131 100% 12%); - ---color-background-elevated: hsl(0 0% 100%); ---color-background-base: hsl(173 44% 96%); - ---color-text-base: hsl(240 17% 2%); ---color-text-muted: hsl(240 8% 63%); ---color-text-inverted: hsl(0 0% 100%); - ---color-brand-lighter: 173 44% 96%; ---color-brand-light: 111 64% 94%; ---color-brand-base: 174 100% 29%; ---color-brand-dark: 172 100% 17%; ---color-brand-darker: 131 100% 12%; - ---color-background-elevated: 0 0% 100%; ---color-background-base: 173 44% 96%; - ---color-text-base: 240 17% 2%; ---color-text-muted: 240 8% 63%; ---color-text-inverted: 0 0% 100%; -*/ - -/* - --color-accent-base: 0 100% 38%; - --color-accent-hover: 0 100% 48%; - --color-accent-muted: 0 8% 63%; - - --color-heading-foreground: 0 64% 94%; - --color-heading-background: 0 100% 17%; - - --color-background-elevated: 209 35% 15%; - --color-background-base: 210 34% 13%; - --color-background-navigation: 210 34% 11%; - --color-background-header: 200 38% 15%; - --color-background-highlight: 200 38% 25%; - --color-background-backdrop: 0 0% 50%; - - --color-border-subtle: 240 8% 27%; - --color-border-contrast: 240 8% 78%; - --color-border-navigation: 210 34% 4%; - - --color-text-base: 240 17% 100%; - --color-text-muted: 240 8% 63%; -*/ - @layer base { :root { --color-accent-base: 174 100% 29%; diff --git a/app/Resources/styles/index.css b/app/Resources/styles/index.css index fb24c427..62c82209 100644 --- a/app/Resources/styles/index.css +++ b/app/Resources/styles/index.css @@ -2,10 +2,12 @@ @import "./custom.css"; @import "./fonts.css"; @import "./colors.css"; +@import "./themes.css"; @import "./breadcrumb.css"; @import "./dropdown.css"; @import "./choices.css"; @import "./radioBtn.css"; +@import "./colorRadioBtn.css"; @import "./switch.css"; @import "./radioToggler.css"; @import "./formInputTabs.css"; diff --git a/app/Resources/styles/radioBtn.css b/app/Resources/styles/radioBtn.css index 30bbc18c..509ec4c6 100644 --- a/app/Resources/styles/radioBtn.css +++ b/app/Resources/styles/radioBtn.css @@ -1,22 +1,22 @@ @layer components { .form-radio-btn { @apply absolute mt-3 ml-3 border-contrast border-3 text-accent-base; - } - .form-radio-btn:focus + label { - @apply ring-accent; - } + &:focus { + @apply ring-accent; + } - .form-radio-btn + label { - @apply inline-block py-2 pl-8 pr-2 text-sm font-semibold rounded-lg cursor-pointer border-contrast bg-elevated border-3; - color: hsl(var(--color-text-muted)); - } + &:checked { + @apply ring-2 ring-contrast; - .form-radio-btn:checked + label { - @apply text-accent-contrast bg-accent-base; - } + & + label { + @apply text-accent-contrast bg-accent-base; + } + } - .form-radio-btn:checked { - @apply ring-2 ring-contrast; + & + label { + @apply inline-block py-2 pl-8 pr-2 text-sm font-semibold rounded-lg cursor-pointer border-contrast bg-elevated border-3; + color: hsl(var(--color-text-muted)); + } } } diff --git a/app/Resources/styles/themes.css b/app/Resources/styles/themes.css new file mode 100644 index 00000000..2df7654a --- /dev/null +++ b/app/Resources/styles/themes.css @@ -0,0 +1,139 @@ +/* Castopod's brand color */ +.theme-pine { + --color-accent-base: 174 100% 29%; + --color-accent-hover: 172 100% 17%; + --color-accent-muted: 131 100% 12%; + --color-accent-contrast: 0 0% 100%; + + --color-heading-foreground: 172 100% 17%; + --color-heading-background: 111 64% 94%; + + --color-background-elevated: 0 0% 100%; + --color-background-base: 173 44% 96%; + --color-background-navigation: 172 100% 17%; + --color-background-header: 172 100% 17%; + --color-background-highlight: 111 64% 94%; + --color-background-backdrop: 0 0% 50%; + + --color-border-subtle: 111 42% 86%; + --color-border-contrast: 0 0% 0%; + --color-border-navigation: 131 100% 12%; + + --color-text-base: 158 8% 3%; + --color-text-muted: 172 8% 38%; +} + +/* Red / Rose color */ +.theme-crimson { + --color-accent-base: 350 87% 61%; + --color-accent-hover: 348 75% 40%; + --color-accent-muted: 348 73% 32%; + --color-accent-contrast: 0 0% 100%; + + --color-heading-foreground: 348 73% 32%; + --color-heading-background: 344 79% 96%; + + --color-background-elevated: 0 0% 100%; + --color-background-base: 350 44% 96%; + --color-background-header: 348 75% 40%; + --color-background-highlight: 344 79% 96%; + --color-background-backdrop: 0 0% 50%; + + --color-border-subtle: 348 42% 86%; + --color-border-contrast: 0 0% 0%; + + --color-text-base: 340 8% 3%; + --color-text-muted: 345 8% 38%; +} + +/* Blue color */ +.theme-lake { + --color-accent-base: 194 100% 44%; + --color-accent-hover: 194 100% 22%; + --color-accent-muted: 195 100% 11%; + --color-accent-contrast: 0 0% 100%; + + --color-heading-foreground: 194 100% 22%; + --color-heading-background: 195 100% 92%; + + --color-background-elevated: 0 0% 100%; + --color-background-base: 196 44% 96%; + --color-background-header: 194 100% 22%; + --color-background-highlight: 195 100% 92%; + --color-background-backdrop: 0 0% 50%; + + --color-border-subtle: 195 42% 86%; + --color-border-contrast: 0 0% 0%; + + --color-text-base: 194 8% 3%; + --color-text-muted: 195 8% 38%; +} + +/* Orange color */ +.theme-amber { + --color-accent-base: 17 100% 57%; + --color-accent-hover: 17 100% 35%; + --color-accent-muted: 17 100% 24%; + --color-accent-contrast: 0 0% 100%; + + --color-heading-foreground: 17 100% 35%; + --color-heading-background: 17 100% 89%; + + --color-background-elevated: 0 0% 100%; + --color-background-base: 15 44% 96%; + --color-background-header: 17 100% 35%; + --color-background-highlight: 17 100% 89%; + --color-background-backdrop: 0 0% 50%; + + --color-border-subtle: 17 42% 86%; + --color-border-contrast: 0 0% 0%; + + --color-text-base: 15 8% 3%; + --color-text-muted: 17 8% 38%; +} + +/* Violet color */ +.theme-jacaranda { + --color-accent-base: 254 72% 52%; + --color-accent-hover: 254 73% 30%; + --color-accent-muted: 254 71% 19%; + --color-accent-contrast: 0 0% 100%; + + --color-heading-foreground: 254 73% 30%; + --color-heading-background: 254 73% 84%; + + --color-background-elevated: 0 0% 100%; + --color-background-base: 253 44% 96%; + --color-background-header: 254 73% 30%; + --color-background-highlight: 254 88% 91%; + --color-background-backdrop: 0 0% 50%; + + --color-border-subtle: 254 42% 86%; + --color-border-contrast: 0 0% 0%; + + --color-text-base: 253 8% 3%; + --color-text-muted: 254 8% 38%; +} + +/* Black color */ +.theme-onyx { + --color-accent-base: 240 17% 2%; + --color-accent-hover: 240 17% 17%; + --color-accent-muted: 240 17% 17%; + --color-accent-contrast: 0 0% 100%; + + --color-heading-foreground: 240 17% 17%; + --color-heading-background: 240 17% 94%; + + --color-background-elevated: 0 0% 100%; + --color-background-base: 240 17% 96%; + --color-background-header: 240 12% 17%; + --color-background-highlight: 240 17% 94%; + --color-background-backdrop: 0 0% 50%; + + --color-border-subtle: 240 17% 86%; + --color-border-contrast: 0 0% 0%; + + --color-text-base: 240 8% 3%; + --color-text-muted: 240 8% 38%; +} diff --git a/app/Views/Components/Forms/ColorRadioButton.php b/app/Views/Components/Forms/ColorRadioButton.php new file mode 100644 index 00000000..906eb693 --- /dev/null +++ b/app/Views/Components/Forms/ColorRadioButton.php @@ -0,0 +1,35 @@ +isChecked = $value === 'true'; + } + + public function render(): string + { + $radioInput = form_radio( + [ + 'id' => $this->value, + 'name' => $this->name, + 'class' => 'color-radio-btn', + ], + $this->value, + old($this->name) ? old($this->name) === $this->value : $this->isChecked, + ); + + return << + {$radioInput} + + + HTML; + } +} diff --git a/modules/Admin/Config/Routes.php b/modules/Admin/Config/Routes.php index 210f9b31..7f2435b0 100644 --- a/modules/Admin/Config/Routes.php +++ b/modules/Admin/Config/Routes.php @@ -31,6 +31,14 @@ $routes->group( 'as' => 'settings-instance-delete-icon', 'filter' => 'permission:settings-manage', ]); + $routes->get('theme', 'SettingsController::theme', [ + 'as' => 'settings-theme', + 'filter' => 'permission:settings-manage', + ]); + $routes->post('theme', 'SettingsController::attemptSetInstanceTheme', [ + 'as' => 'settings-theme', + 'filter' => 'permission:settings-manage', + ]); }); $routes->group('persons', function ($routes): void { diff --git a/modules/Admin/Controllers/SettingsController.php b/modules/Admin/Controllers/SettingsController.php index 0362c823..d9e9a531 100644 --- a/modules/Admin/Controllers/SettingsController.php +++ b/modules/Admin/Controllers/SettingsController.php @@ -88,7 +88,7 @@ class SettingsController extends BaseController ]); } - return redirect()->back(); + return redirect('settings-general')->with('message', lang('Settings.general.instanceEditSuccess')); } public function deleteIcon(): RedirectResponse @@ -100,6 +100,25 @@ class SettingsController extends BaseController service('settings') ->forget('App.siteIcon'); - return redirect()->back(); + return redirect('settings-general')->with('message', lang('Settings.general.deleteIconSuccess')); + } + + public function theme(): string + { + helper('form'); + return view('settings/theme'); + } + + public function attemptSetInstanceTheme(): RedirectResponse + { + $theme = $this->request->getPost('theme'); + service('settings') + ->set('App.theme', $theme); + + // delete all pages cache + cache() + ->deleteMatching('page*'); + + return redirect('settings-theme')->with('message', lang('Settings.theme.setInstanceThemeSuccess')); } } diff --git a/modules/Admin/Language/en/AdminNavigation.php b/modules/Admin/Language/en/AdminNavigation.php deleted file mode 100644 index c2e8e4b6..00000000 --- a/modules/Admin/Language/en/AdminNavigation.php +++ /dev/null @@ -1,39 +0,0 @@ - 'View site', - 'go_to_admin' => 'Go to admin', - 'dashboard' => 'Dashboard', - 'admin' => 'Home', - 'podcasts' => 'Podcasts', - 'podcast-list' => 'All podcasts', - 'podcast-create' => 'New podcast', - 'podcast-import' => 'Import a podcast', - 'persons' => 'Persons', - 'person-list' => 'All persons', - 'person-create' => 'New person', - 'fediverse' => 'Fediverse', - 'fediverse-blocked-actors' => 'Blocked accounts', - 'fediverse-blocked-domains' => 'Blocked domains', - 'users' => 'Users', - 'user-list' => 'All users', - 'user-create' => 'New user', - 'pages' => 'Pages', - 'page-list' => 'All pages', - 'page-create' => 'New Page', - 'settings' => 'Settings', - 'settings-general' => 'General', - 'account' => [ - 'my-account' => 'My account', - 'change-password' => 'Change password', - 'logout' => 'Logout', - ], -]; diff --git a/modules/Admin/Language/en/Breadcrumb.php b/modules/Admin/Language/en/Breadcrumb.php index 63564f79..2e8c52b6 100644 --- a/modules/Admin/Language/en/Breadcrumb.php +++ b/modules/Admin/Language/en/Breadcrumb.php @@ -17,6 +17,7 @@ return [ 'contributors' => 'contributors', 'pages' => 'pages', 'settings' => 'settings', + 'theme' => 'theme', 'add' => 'add', 'new' => 'new', 'edit' => 'edit', diff --git a/modules/Admin/Language/en/Navigation.php b/modules/Admin/Language/en/Navigation.php index 92a5f59b..a51ceff8 100644 --- a/modules/Admin/Language/en/Navigation.php +++ b/modules/Admin/Language/en/Navigation.php @@ -10,6 +10,7 @@ declare(strict_types=1); return [ 'go_to_website' => 'View site', + 'go_to_admin' => 'Go to admin', 'dashboard' => 'Dashboard', 'admin' => 'Home', 'podcasts' => 'Podcasts', @@ -28,6 +29,9 @@ return [ 'pages' => 'Pages', 'page-list' => 'All pages', 'page-create' => 'New Page', + 'settings' => 'Settings', + 'settings-general' => 'General', + 'settings-theme' => 'Theme', 'account' => [ 'my-account' => 'My account', 'change-password' => 'Change password', diff --git a/modules/Admin/Language/en/Settings.php b/modules/Admin/Language/en/Settings.php index 8864c87f..ed97dd4e 100644 --- a/modules/Admin/Language/en/Settings.php +++ b/modules/Admin/Language/en/Settings.php @@ -10,7 +10,7 @@ declare(strict_types=1); return [ 'title' => 'General settings', - 'form' => [ + 'general' => [ 'site_section_title' => 'Instance', 'site_icon' => 'Site icon', 'site_icon_delete' => 'Delete site icon', @@ -19,5 +19,20 @@ return [ 'site_name' => 'Site name', 'site_description' => 'Site description', 'submit' => 'Save', + 'instanceEditSuccess' => 'Instance has been updated successfully!', + 'deleteIconSuccess' => 'Site icon has been remove successfully!', + ], + 'theme' => [ + 'title' => 'Theme', + 'accent_section_title' => 'Accent color', + 'accent_section_subtitle' => 'Choose the color to determine the look and feel of all public pages.', + 'pine' => 'Pine', + 'crimson' => 'Crimson', + 'amber' => 'Amber', + 'lake' => 'Lake', + 'jacaranda' => 'Jacaranda', + 'onyx' => 'Onyx', + 'submit' => 'Save', + 'setInstanceThemeSuccess' => 'Theme has been updated successfully!', ], ]; diff --git a/modules/Admin/Language/fr/AdminNavigation.php b/modules/Admin/Language/fr/AdminNavigation.php deleted file mode 100644 index b85b1a30..00000000 --- a/modules/Admin/Language/fr/AdminNavigation.php +++ /dev/null @@ -1,38 +0,0 @@ - 'Visiter le site', - 'dashboard' => 'Tableau de bord', - 'admin' => 'Accueil', - 'podcasts' => 'Podcasts', - 'podcast-list' => 'Tous les podcasts', - 'podcast-create' => 'Créer un podcast', - 'podcast-import' => 'Importer un podcast', - 'persons' => 'Intervenants', - 'person-list' => 'Tous les intervenants', - 'person-create' => 'Nouvel intervenant', - 'fediverse' => 'Fédiverse', - 'fediverse-blocked_actors' => 'Utilisateurs blockés', - 'fediverse-blocked_domains' => 'Domaines blockés', - 'users' => 'Utilisateurs', - 'user-list' => 'Tous les utilisateurs', - 'user-create' => 'Créer un utilisateur', - 'pages' => 'Pages', - 'page-list' => 'Toutes les pages', - 'page-create' => 'Créer une page', - 'settings' => 'Paramètres', - 'settings-general' => 'Général', - 'account' => [ - 'my-account' => 'Mon compte', - 'change-password' => 'Modifier le mot de passe', - 'logout' => 'Déconnexion', - ], -]; diff --git a/modules/Admin/Language/fr/Breadcrumb.php b/modules/Admin/Language/fr/Breadcrumb.php index 91b6e0d9..d1bfa0fc 100644 --- a/modules/Admin/Language/fr/Breadcrumb.php +++ b/modules/Admin/Language/fr/Breadcrumb.php @@ -16,6 +16,8 @@ return [ 'episodes' => 'épisodes', 'contributors' => 'contributeurs', 'pages' => 'pages', + 'settings' => 'paramètres', + 'theme' => 'thème', 'add' => 'ajouter', 'new' => 'créer', 'edit' => 'modifier', diff --git a/modules/Admin/Language/fr/Navigation.php b/modules/Admin/Language/fr/Navigation.php index 357b64ff..469a43ed 100644 --- a/modules/Admin/Language/fr/Navigation.php +++ b/modules/Admin/Language/fr/Navigation.php @@ -28,6 +28,9 @@ return [ 'pages' => 'Pages', 'page-list' => 'Toutes les pages', 'page-create' => 'Créer une page', + 'settings' => 'Paramètres', + 'settings-general' => 'Général', + 'settings-themes' => 'Thèmes', 'account' => [ 'my-account' => 'Mon compte', 'change-password' => 'Modifier le mot de passe', diff --git a/modules/Admin/Language/fr/Settings.php b/modules/Admin/Language/fr/Settings.php index 08cb0a64..35e603af 100644 --- a/modules/Admin/Language/fr/Settings.php +++ b/modules/Admin/Language/fr/Settings.php @@ -10,15 +10,28 @@ declare(strict_types=1); return [ 'title' => 'Paramètres généraux', - 'form' => [ + 'general' => [ 'site_section_title' => 'Instance', - 'site_section_subtitle' => 'configuration de l’instance', 'site_icon' => 'Favicon du site', 'site_icon_delete' => 'Supprimer la favicon du site', 'site_icon_hint' => 'Les favicons sont ce que vous voyez sur les onglets de votre navigateur, dans votre barre de favoris, et lorsque vous ajoutez un site web en raccourci sur des appareils mobiles.', 'site_icon_helper' => 'La favicon doit être carrée, avec au minimum 512px de largeur et de hauteur.', 'site_name' => 'Titre du site', 'site_description' => 'Description du site', - 'submit' => 'Save', + 'submit' => 'Sauvegarder', + 'instanceEditSuccess' => 'L’instance a bien été mise à jour !', + 'deleteIconSuccess' => 'La favicon du site a bien été retirée !', + ], + 'theme' => [ + 'title' => 'Thème', + 'accent_section_title' => 'Couleur d’accentuation', + 'accent_section_subtitle' => 'Sélectionnez une couleur qui déterminera l’apparence de toutes les pages publiques.', + 'pine' => 'Pin', + 'crimson' => 'Cramoisi', + 'amber' => 'Ambre', + 'lake' => 'Lac', + 'jacaranda' => 'Jacaranda', + 'onyx' => 'Onyx', + 'setInstanceThemeSuccess' => 'Le thème a bien été mis à jour !', ], ]; diff --git a/tailwind.config.js b/tailwind.config.js index 5e6b5c93..e902d879 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -107,6 +107,7 @@ module.exports = { podcastMain: "1fr minmax(200px, 300px)", cards: "repeat(auto-fill, minmax(14rem, 1fr))", latestEpisodes: "repeat(5, 1fr)", + colorButtons: "repeat(auto-fill, minmax(4rem, 1fr))", }, gridTemplateRows: { admin: "40px 1fr", diff --git a/themes/cp_admin/_partials/_nav_header.php b/themes/cp_admin/_partials/_nav_header.php index 5ec745c3..6152c47e 100644 --- a/themes/cp_admin/_partials/_nav_header.php +++ b/themes/cp_admin/_partials/_nav_header.php @@ -11,7 +11,7 @@ - + @@ -48,12 +48,12 @@ $menuItems = [ [ 'type' => 'link', - 'title' => lang('AdminNavigation.account.my-account'), + 'title' => lang('Navigation.account.my-account'), 'uri' => route_to('my-account'), ], [ 'type' => 'link', - 'title' => lang('AdminNavigation.account.change-password'), + 'title' => lang('Navigation.account.change-password'), 'uri' => route_to('change-password'), ], [ @@ -61,7 +61,7 @@ ], [ 'type' => 'link', - 'title' => lang('AdminNavigation.account.logout'), + 'title' => lang('Navigation.account.logout'), 'uri' => route_to('logout'), ], ]; diff --git a/themes/cp_admin/_sidebar.php b/themes/cp_admin/_sidebar.php index 353f2799..8f53e815 100644 --- a/themes/cp_admin/_sidebar.php +++ b/themes/cp_admin/_sidebar.php @@ -24,7 +24,7 @@ $navigation = [ ], 'settings' => [ 'icon' => 'settings', - 'items' => ['settings-general'], + 'items' => ['settings-general', 'settings-theme'], ], ]; ?> @@ -33,7 +33,7 @@ $navigation = [
- + diff --git a/themes/cp_admin/settings/theme.php b/themes/cp_admin/settings/theme.php new file mode 100644 index 00000000..6cf76d50 --- /dev/null +++ b/themes/cp_admin/settings/theme.php @@ -0,0 +1,34 @@ +extend('_layout') ?> + +section('title') ?> + +endSection() ?> + +section('pageTitle') ?> + +endSection() ?> + +section('content') ?> + +
+ + + +
+ + + +
+ + + +
+ +
+endSection() ?> \ No newline at end of file diff --git a/themes/cp_app/_admin_navbar.php b/themes/cp_app/_admin_navbar.php index 6d66f662..5b704bdd 100644 --- a/themes/cp_app/_admin_navbar.php +++ b/themes/cp_app/_admin_navbar.php @@ -4,7 +4,7 @@ - + @@ -43,12 +43,12 @@ $menuItems = [ [ 'type' => 'link', - 'title' => lang('AdminNavigation.account.my-account'), + 'title' => lang('Navigation.account.my-account'), 'uri' => route_to('my-account'), ], [ 'type' => 'link', - 'title' => lang('AdminNavigation.account.change-password'), + 'title' => lang('Navigation.account.change-password'), 'uri' => route_to('change-password'), ], [ @@ -56,7 +56,7 @@ ], [ 'type' => 'link', - 'title' => lang('AdminNavigation.account.logout'), + 'title' => lang('Navigation.account.logout'), 'uri' => route_to('logout'), ], ]; diff --git a/themes/cp_app/_layout.php b/themes/cp_app/_layout.php index 2cdf1c0f..d80ecb99 100644 --- a/themes/cp_app/_layout.php +++ b/themes/cp_app/_layout.php @@ -29,12 +29,13 @@ ->asset('js/audio-player.ts', 'js') ?> - + check()): ?> include('_admin_navbar') ?> -
+
() + $podcasts, + ) ?>)
diff --git a/themes/cp_app/map.php b/themes/cp_app/map.php index 1a1d41ce..f064a54f 100644 --- a/themes/cp_app/map.php +++ b/themes/cp_app/map.php @@ -20,12 +20,13 @@ ->asset('js/map.ts', 'js') ?> - + check()): ?> include('_admin_navbar') ?> -
+
diff --git a/themes/cp_app/podcast/_layout.php b/themes/cp_app/podcast/_layout.php index fda22ff2..cf38f6d0 100644 --- a/themes/cp_app/podcast/_layout.php +++ b/themes/cp_app/podcast/_layout.php @@ -27,7 +27,8 @@ ->asset('js/audio-player.ts', 'js') ?> - +
include('_admin_navbar') ?> diff --git a/themes/cp_app/podcast/_partials/funding_links_modal.php b/themes/cp_app/podcast/_partials/funding_links_modal.php index e528e17a..aff193c4 100644 --- a/themes/cp_app/podcast/_partials/funding_links_modal.php +++ b/themes/cp_app/podcast/_partials/funding_links_modal.php @@ -14,7 +14,7 @@ data-toggle="funding-links" data-toggle-class="hidden" aria-label="" - class="self-start p-1 text-2xl"> + class="self-start p-1 text-2xl rounded-full focus:ring-accent">
fundingPlatforms as $fundingPlatform): ?> @@ -24,7 +24,7 @@ title="link_content ?>" target="_blank" rel="noopener noreferrer" - class="inline-flex items-center font-semibold text-accent-base"> + class="inline-flex items-center font-semibold text-accent-base hover:text-accent-hover focus:ring-accent"> type . '/' . diff --git a/themes/cp_app/podcast/about.php b/themes/cp_app/podcast/about.php index 9d914d61..ce00cbb1 100644 --- a/themes/cp_app/podcast/about.php +++ b/themes/cp_app/podcast/about.php @@ -33,13 +33,13 @@
description_html ?>
- + category->code, ) ?> other_categories as $other_category): ?> - + code, ) ?> diff --git a/themes/cp_app/podcast/follow.php b/themes/cp_app/podcast/follow.php index 3ff1b93e..c491d46e 100644 --- a/themes/cp_app/podcast/follow.php +++ b/themes/cp_app/podcast/follow.php @@ -33,9 +33,10 @@ - +
-

@@ -52,7 +53,7 @@
-
+ @@ -62,18 +63,15 @@ hint="" required="true" /> - +
diff --git a/themes/cp_app/post/remote_action.php b/themes/cp_app/post/remote_action.php index 3ad01744..2dd36fe5 100644 --- a/themes/cp_app/post/remote_action.php +++ b/themes/cp_app/post/remote_action.php @@ -34,9 +34,10 @@ ->asset('js/podcast.ts', 'js') ?> - -
-

get('App.theme') ?>"> +
+

@@ -47,7 +48,7 @@ 'post' => $post, ]) ?> -
+ @@ -60,4 +61,11 @@

+