From ace3c52c8e1b60031323c8404d6558c7f00b3213 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 5 Feb 2020 21:06:03 +0000 Subject: [PATCH 1/2] Accessibility again: Notifications are now accessible --- src/Content/Nav.php | 1 + view/theme/frio/css/style.css | 5 +++ view/theme/frio/php/default.php | 2 +- view/theme/frio/php/standard.php | 2 +- view/theme/frio/templates/nav.tpl | 70 ++++++++++++++++++------------- 5 files changed, 50 insertions(+), 30 deletions(-) diff --git a/src/Content/Nav.php b/src/Content/Nav.php index 8f565cc3d2..cbca1314ac 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -73,6 +73,7 @@ class Nav '$userinfo' => $nav_info['userinfo'], '$sel' => self::$selected, '$apps' => self::getAppMenu(), + '$home' => DI::l10n()->t('Go back'), '$clear_notifs' => DI::l10n()->t('Clear notifications'), '$search_hint' => DI::l10n()->t('@name, !forum, #tags, content') ]); diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 295c065bb0..337817553a 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -454,6 +454,8 @@ nav.navbar { #topbar-first .nav>li>a:hover, #topbar-first .nav>li>a:focus, #topbar-first .nav>.open>a, +#dropdownMenu1:hover, +#dropdownMenu1:focus, nav.navbar .nav>li>a:hover, nav.navbar .nav>li>a:focus{ background-color: $nav_icon_hover_color; @@ -860,6 +862,9 @@ nav.navbar a, nav.navbar .btn-link { } /* Dropdown Menus */ +#dropdownMenu1 { + padding: 15px 15px; +} .nav > li > .btn-link { position: relative; display: block; diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php index 451fdfc5e4..bdc6eeb49b 100644 --- a/view/theme/frio/php/default.php +++ b/view/theme/frio/php/default.php @@ -64,7 +64,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser"; "> - Skip to main content + t('Skip to main content'); ?> -Skip to main content +t('Skip to main content'); ?> get('config','sitename'), diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 25af5aeea1..b8fcb3475c 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -7,12 +7,12 @@ @@ -38,46 +38,60 @@ {{* Left section of the NavBar with navigation shortcuts/icons *}}