From 76cdb6f4a5a400fc415c53e80118a82a0d04ad60 Mon Sep 17 00:00:00 2001 From: Gareth Barnard <1058419+gjb2048@users.noreply.github.com> Date: Sat, 4 May 2019 19:25:12 +0100 Subject: [PATCH] Navbar on small displays and login link fixes. --- classes/output/core_renderer_toolbox.php | 6 +++--- scss/theme/_navbar.scss | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/classes/output/core_renderer_toolbox.php b/classes/output/core_renderer_toolbox.php index 2185f94..7cd36c3 100644 --- a/classes/output/core_renderer_toolbox.php +++ b/classes/output/core_renderer_toolbox.php @@ -208,7 +208,7 @@ public function user_menu($user = null, $withlinks = null) { } // Add a class for when $withlinks is false. - $usermenuclasses = 'usermenu nav-link'; + $usermenuclasses = 'usermenu'; if (!$withlinks) { $usermenuclasses .= ' withoutlinks'; } @@ -231,7 +231,7 @@ public function user_menu($user = null, $withlinks = null) { return html_writer::div( html_writer::span( $returnstr, - 'login' + 'login nav-link' ), $usermenuclasses ); @@ -248,7 +248,7 @@ public function user_menu($user = null, $withlinks = null) { return html_writer::div( html_writer::span( $returnstr, - 'login' + 'login nav-link' ), $usermenuclasses ); diff --git a/scss/theme/_navbar.scss b/scss/theme/_navbar.scss index ceb1c9c..cd2c358 100644 --- a/scss/theme/_navbar.scss +++ b/scss/theme/_navbar.scss @@ -1,5 +1,6 @@ // Navbar. .navbar { + flex-wrap: nowrap; .popover-region { margin-top: 4px; }