Merge pull request #3260 from bolt/fix/responsiveness

Improve responsiveness
bolt · Jun 30, 2022 · 3538e8a · 3538e8a
2 parents 16cb410 + 3b84a25
commit 3538e8a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/assets/js/app/common.js b/assets/js/app/common.js
@@ -23,12 +23,14 @@ $(document).ready(function() {
         if ($('.admin__sidebar').hasClass('admin__sidebar--is-collapsed')) {
             $('.admin__sidebar')
                 .addClass('admin__sidebar--is-expanded')
-                .removeClass('admin__sidebar--is-collapsed');
+                .removeClass('admin__sidebar--is-collapsed')
+                .removeClass('d-none');
             $(this).toggleClass('is-active');
         } else {
             $('.admin__sidebar')
                 .addClass('admin__sidebar--is-collapsed')
-                .removeClass('admin__sidebar--is-expanded');
+                .removeClass('admin__sidebar--is-expanded')
+                .removeClass('d-none');
             $(this).toggleClass('is-active');
         }
     });

diff --git a/templates/_base/layout.html.twig b/templates/_base/layout.html.twig
@@ -92,7 +92,7 @@
         'action.new': 'action.new'|trans,
         'action.view': 'action.view'|trans,
     }|json_encode %}
-    <div class="admin__sidebar">
+    <div class="admin__sidebar d-none d-lg-block">
         <div class="sidebar sidebar--sticky" id="bolt--sidebar">
             <admin-sidebar
               :menu="{{ admin_menu_json }}"

diff --git a/templates/_partials/fields/_collection_buttons.html.twig b/templates/_partials/fields/_collection_buttons.html.twig
@@ -2,11 +2,11 @@
     <div class="btn-group ms-auto me-2" role="group" aria-label="Collection buttons">
     <button class='action-move-up-collection-item btn btn-light btn-sm' style="white-space: nowrap" {% if is_first is defined and is_first %} disabled {% endif %}>
         <i class="fas fa-fw fa-chevron-up"></i>
-        {{ 'collection.move_item_up'|trans }}
+        <span class="d-none d-sm-inline-block">{{ 'collection.move_item_up'|trans }}</span>
     </button>
     <button class='action-move-down-collection-item btn btn-light btn-sm' style="white-space: nowrap" {% if is_last is defined and is_last %} disabled {% endif %}>
         <i class="fas fa-fw fa-chevron-down"></i>
-        {{ 'collection.move_item_down'|trans }}
+        <span class="d-none d-sm-inline-block">{{ 'collection.move_item_down'|trans }}</span>
     </button>
     <button class='action-remove-collection-item btn btn-light-danger btn-sm'
             style="white-space: nowrap"
@@ -16,8 +16,8 @@
             data-modal-button-accept="Delete"
             data-bs-toggle="modal"
             data-bs-target="#resourcesModal">
-        <i class="fas fa-fw fa-trash"></i>
-        {{ 'collection.remove_item'|trans }}
+        <i class="fas fa-fw fa-trash me-xs-0 me-md-1"></i>
+        <span class="d-none d-sm-inline-block">{{ 'collection.remove_item'|trans }}</span>
     </button>
     </div>
 {% endif %}