diff --git a/components/Left/templates/left/view.html.twig b/components/Left/templates/left/view.html.twig deleted file mode 100644 index adf479b5c7..0000000000 --- a/components/Left/templates/left/view.html.twig +++ /dev/null @@ -1,24 +0,0 @@ -{% block leftpanel %} - - - -
- - -
-{% endblock leftpanel %} diff --git a/components/Left/Controller/EditFeeds.php b/components/LeftPanel/Controller/EditFeeds.php similarity index 99% rename from components/Left/Controller/EditFeeds.php rename to components/LeftPanel/Controller/EditFeeds.php index ae024e7db6..7c40663a05 100644 --- a/components/Left/Controller/EditFeeds.php +++ b/components/LeftPanel/Controller/EditFeeds.php @@ -21,7 +21,7 @@ declare(strict_types = 1); // }}} -namespace Component\Left\Controller; +namespace Component\LeftPanel\Controller; use App\Core\Cache; use App\Core\Controller; diff --git a/components/Left/Left.php b/components/LeftPanel/LeftPanel.php similarity index 93% rename from components/Left/Left.php rename to components/LeftPanel/LeftPanel.php index 2395af473b..7e09fb2d13 100644 --- a/components/Left/Left.php +++ b/components/LeftPanel/LeftPanel.php @@ -19,14 +19,14 @@ declare(strict_types = 1); // along with GNU social. If not, see . // }}} -namespace Component\Left; +namespace Component\LeftPanel; use App\Core\Event; use App\Core\Modules\Component; use App\Core\Router\RouteLoader; -use Component\Left\Controller as C; +use Component\LeftPanel\Controller as C; -class Left extends Component +class LeftPanel extends Component { public function onAddRoute(RouteLoader $r): bool { diff --git a/components/Left/templates/left/edit_feeds.html.twig b/components/LeftPanel/templates/left_panel/edit_feeds.html.twig similarity index 100% rename from components/Left/templates/left/edit_feeds.html.twig rename to components/LeftPanel/templates/left_panel/edit_feeds.html.twig diff --git a/components/LeftPanel/templates/left_panel/view.html.twig b/components/LeftPanel/templates/left_panel/view.html.twig new file mode 100644 index 0000000000..7bb03c3d9b --- /dev/null +++ b/components/LeftPanel/templates/left_panel/view.html.twig @@ -0,0 +1,25 @@ +{% block leftpanel %} + + + + +
+ +
+{% endblock leftpanel %} diff --git a/components/Right/templates/right/view.html.twig b/components/Right/templates/right/view.html.twig deleted file mode 100644 index 7c9d546cd0..0000000000 --- a/components/Right/templates/right/view.html.twig +++ /dev/null @@ -1,33 +0,0 @@ -{% block rightpanel %} - - - -
- - -
-{% endblock rightpanel %} diff --git a/components/Right/Right.php b/components/RightPanel/RightPanel.php similarity index 94% rename from components/Right/Right.php rename to components/RightPanel/RightPanel.php index 75fd92edc0..032c2fa6eb 100644 --- a/components/Right/Right.php +++ b/components/RightPanel/RightPanel.php @@ -19,12 +19,12 @@ declare(strict_types = 1); // along with GNU social. If not, see . // }}} -namespace Component\Right; +namespace Component\RightPanel; use App\Core\Event; use App\Core\Modules\Component; -class Right extends Component +class RightPanel extends Component { /** * Output our dedicated stylesheet diff --git a/components/RightPanel/templates/right_panel/view.html.twig b/components/RightPanel/templates/right_panel/view.html.twig new file mode 100644 index 0000000000..89d8cb6e20 --- /dev/null +++ b/components/RightPanel/templates/right_panel/view.html.twig @@ -0,0 +1,35 @@ +{% block rightpanel %} + + + + +
+ +
+{% endblock rightpanel %} diff --git a/public/assets/default_theme/css/base.css b/public/assets/default_theme/css/base.css index c54a06e793..566b1c4b45 100644 --- a/public/assets/default_theme/css/base.css +++ b/public/assets/default_theme/css/base.css @@ -38,7 +38,8 @@ body,input,textarea,select { color: currentColor; } -a:hover { +a:hover, +a:focus { text-decoration: underline; } diff --git a/public/assets/default_theme/css/pages/settings.css b/public/assets/default_theme/css/pages/settings.css index 26043c0dbb..d1e835c190 100644 --- a/public/assets/default_theme/css/pages/settings.css +++ b/public/assets/default_theme/css/pages/settings.css @@ -1,5 +1,6 @@ .section-settings { border: 2px solid var(--border); + box-shadow: var(--shadow); } .section-settings, @@ -9,7 +10,10 @@ border-radius: .6rem; padding: .6rem; box-sizing: border-box; - box-shadow: var(--shadow); +} + +.section-title-settings[open] { + border-left: 2px solid var(--accent); } .section-title-settings[open] > summary:first-child { diff --git a/public/assets/default_theme/css/root.css b/public/assets/default_theme/css/root.css index 2a1c3904db..aa4ae23808 100644 --- a/public/assets/default_theme/css/root.css +++ b/public/assets/default_theme/css/root.css @@ -13,8 +13,8 @@ --background-card: #131217; --border: #201f25; --accent: #5ddbcf; - --shadow: 0px 0px 199px -76px #01010166; - --shadow: 0px 25px 42px -10px rgba(0,0,0,0.09) !important; + --shadow: 0px 5px 20px -10px rgba(255,255,255,0.1) !important; + --shadow-inset-accent: inset 0 0 0 2px var(--accent); --background-checkerboard: repeating-conic-gradient(#ffffff66 0 90deg,#ffffff33 0 180deg) 0 0/40px 40px round; --gradient: linear-gradient(10deg,var(--border) 0,transparent 90%) !important; --gradient-backwards: linear-gradient(290deg,var(--border) 0,var(--background-card) 100%) !important; @@ -28,7 +28,7 @@ --background-card: #f0f0f0; --border: #d5d5d5; --accent: #a22430; - --shadow: 0px 25px 42px -10px rgba(0,0,0,0.09) !important; + --shadow: 0px 25px 42px -10px rgba(0,0,0,0.1) !important; --shadow-inset-accent: inset 0 0 0 2px var(--accent); --background-checkerboard: repeating-conic-gradient(#ffffff66 0 90deg,#ffffff33 0 180deg) 0 0/40px 40px round; --gradient: linear-gradient(10deg,var(--background-hard) 0,transparent 60%) !important; diff --git a/public/assets/default_theme/css/widgets/buttons.css b/public/assets/default_theme/css/widgets/buttons.css index 4ac5539ba4..712f7d7481 100644 --- a/public/assets/default_theme/css/widgets/buttons.css +++ b/public/assets/default_theme/css/widgets/buttons.css @@ -136,7 +136,7 @@ textarea { padding: 6px 8px !important; border-radius: var(--smaller); border: 2px solid var(--border) !important; - box-shadow: var(--shadow); + box-shadow: var(--shadow) !important; width: inherit; max-width: border-box !important; } diff --git a/public/assets/icons/logo.svg.twig b/public/assets/icons/logo.svg.twig index 98efb7dadb..68bf0d3413 100644 --- a/public/assets/icons/logo.svg.twig +++ b/public/assets/icons/logo.svg.twig @@ -1,57 +1,11 @@ - - - - - - {{ config('site', 'name') }} - - - + + + {{ config('site', 'name') }} + + - - - {{ config('site', 'name') }} - + + {{ config('site', 'name') }} diff --git a/templates/base.html.twig b/templates/base.html.twig index 1a46c3f110..7481b65bd6 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -3,7 +3,8 @@ {% block meta %} {# This is far from perfect. The response headers should already come with this. #} - {% if app.request.server.get('APP_ENV') not in ['test', 'dev'] %}{% endif %} + {% if app.request.server.get('APP_ENV') not in ['test', 'dev'] %} + {% endif %} @@ -38,7 +39,8 @@

{{ 'Here you can find fast shortcuts to various page regions!' | trans }}

{{ 'Provided the following keyboard shortcut, the link is targeted.' | trans }}


-

{{ 'Be mindful that another ' | trans }}Tab{{ ' is needed in order to focus.' | trans }}

+

{{ 'Be mindful that another ' | trans }}Tab{{ ' is needed in order to focus.' | trans }} +

{% if is_firefox() == true %} Alt + Shift + "access key" @@ -48,13 +50,10 @@


- - - -

+ {{ 'The keyboard key ' | trans }}Z{{ ' accesses this menu.' | trans }} {{ 'The other access keys are:' | trans }} -

+