fix badges container in menu (#167)

Co-authored-by: Remy Keignart <[email protected]> Co-authored-by: Kevin Papst <[email protected]>
kevinpapst · Oct 5, 2021 · 8b06c35 · 8b06c35
1 parent 139cc55
commit 8b06c35
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Resources/views/Macros/menu.html.twig b/Resources/views/Macros/menu.html.twig
@@ -5,7 +5,9 @@
             <a href="{{ item.hasChildren ? '#': '/' in item.route ? item.route : path(item.route|route_alias, item.routeArgs) }}">
                 {% if item.icon %} <i class="{{ item.icon }}"></i> {% endif %}
                 {% if item.badge is not same as(false) %}
+                <span class="pull-right-container">
                     <small class="label pull-right bg-{{ item.badgeColor }}">{{ item.badge }}</small>
+                </span>
                 {% endif %}
                 {% if item.hasChildren %}<i class="fas fa-angle-left pull-right"></i>{% endif %}
                 <span>{{ item.label|trans }}</span>
@@ -38,6 +40,8 @@
     <i class="{{ item.icon|default(defaultIcon) }}"></i>
     <span>{{ item.label|trans }}</span>
     {% if item.badge is not same as(false) %}
+    <span class="pull-right-container">
         <small class="label pull-right bg-{{ item.badgeColor }}">{{ item.badge }}</small>
+    </span>
     {% endif %}
 {% endmacro %}
diff --git a/Resources/views/Partials/_menu.html.twig b/Resources/views/Partials/_menu.html.twig
@@ -21,11 +21,15 @@
 {% macro badges(item) %}
     {% import _self as selfMacros %}
     {% if item.getExtra('badge') is not null %}
-        {{ selfMacros.badge(item.getExtra('badge')) }}
+        <span class="pull-right-container">
+            {{ selfMacros.badge(item.getExtra('badge')) }}
+        </span>
     {% elseif item.getExtra('badges') is not null %}
-        {% for badge in item.getExtra('badges') %}
-            {{ selfMacros.badge(badge) }}
-        {% endfor %}
+        <span class="pull-right-container">
+            {% for badge in item.getExtra('badges') %}
+                {{ selfMacros.badge(badge) }}
+            {% endfor %}
+        </span>
     {% endif %}
 {% endmacro %}