Upgrade: Align the icons again properly on Moodle 4.4.

CHANGES.md

@@ -6,6 +6,7 @@ Changes
 
 ### Unreleased
 
+* 2024-08-22 - Upgrade: Align the icons again properly on Moodle 4.4.
 * 2024-08-20 - Prepare compatibility for Moodle 4.4.
 
 ### v4.3-r2

lib.php

@@ -135,8 +135,10 @@ function local_navbarplus_render_navbar_output() {
                     $linkattributes['target'] = '_blank';
                     $linkattributes['rel'] = 'noopener noreferrer';
                 }
+                // Set classes.
+                $linkattributes = ['class' => 'nav-link position-relative icon-no-margin'];
                 // Define classes for all icons.
-                $itemclasses = 'localnavbarplus nav-link';
+                $itemclasses = 'localnavbarplus';
                 // Add optional individual classes.
                 if (!empty($itemadditionalclasses)) {
                     $itemclasses .= ' ' . $itemadditionalclasses;

styles.css

@@ -1,23 +1,4 @@
-/* Float the icons left to be placed next to the existing icons "messages" and "notifications". */
-.navbar .localnavbarplus.nav-link {
-    float: left;
-}
-
-/* Remove the right margin from each but the last icon to achieve the same margins for moodle and navbarplus icons. */
-.navbar .localnavbarplus.nav-link .icon {
-    margin-right: 0;
-}
-.navbar .localnavbarplus.nav-link:last-child .icon {
-    margin-right: .5rem;
-}
-
-/* Do not display the icon if a user has disabled Javascript in his browser. */
+/* Do not display the reset user tour icon if a user has disabled Javascript in his browser. */
 body:not(.jsenabled) #localnavbarplus-resetusertour {
     display: none;
 }
-
-/* Inherit the colors. */
-.navbar .localnavbarplus a,
-.navbar .localnavbarplus .icon {
-    color: inherit;
-}