From 365c7c60e4d91605014ef30bf90277f639cef070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sun, 24 Jul 2022 18:08:21 +0200 Subject: [PATCH] Started to upgrade from bootstrap 4 to 5. --- assets/css/app.css | 5 + assets/js/datatables.js | 22 +-- package.json | 18 ++- .../AdminPages/EntityAdminBase.html.twig | 4 +- templates/AdminPages/_attachments.html.twig | 2 +- templates/AdminPages/_delete_form.html.twig | 6 +- templates/LabelSystem/dialog.html.twig | 2 +- .../LabelSystem/dropdown_macro.html.twig | 2 +- templates/Parts/edit/edit_part_info.html.twig | 4 +- .../Parts/info/_attachments_info.html.twig | 2 +- templates/Parts/info/_order_infos.html.twig | 2 +- templates/Parts/info/_tools.html.twig | 4 +- templates/Parts/info/show_part_info.html.twig | 2 +- templates/Parts/lists/_action_bar.html.twig | 2 +- templates/Parts/lists/_info_card.html.twig | 2 +- templates/Statistics/statistics.html.twig | 2 +- templates/Tools/ReelCalculator/main.html.twig | 6 +- templates/Users/backup_codes.html.twig | 2 +- templates/_navbar.html.twig | 125 ++++++++++-------- templates/_navbar_search.html.twig | 10 +- templates/_sidebar.html.twig | 6 +- templates/_toast.html.twig | 8 +- templates/base.html.twig | 4 +- templates/homepage.html.twig | 2 +- templates/security/2fa_base_form.html.twig | 4 +- templates/security/U2F/u2f_login.html.twig | 2 +- yarn.lock | 71 ++++------ 27 files changed, 164 insertions(+), 157 deletions(-) diff --git a/assets/css/app.css b/assets/css/app.css index 461dfb26..cff5513c 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -243,6 +243,11 @@ showing the sidebar (on devices with md or higher) * Bootstrap extensions *****************************************/ +/* Dont underline links */ +a { + text-decoration: none; +} + .w-fit { width: -moz-fit-content; width: fit-content; diff --git a/assets/js/datatables.js b/assets/js/datatables.js index e2ded416..5166fa74 100644 --- a/assets/js/datatables.js +++ b/assets/js/datatables.js @@ -1,19 +1,19 @@ "use strict"; //Styles -import 'datatables.net-bs4/css/dataTables.bootstrap4.css' -import 'datatables.net-buttons-bs4/css/buttons.bootstrap4.css' -import 'datatables.net-fixedheader-bs4/css/fixedHeader.bootstrap4.css' -import 'datatables.net-select-bs4/css/select.bootstrap4.css' -import 'datatables.net-responsive-bs4/css/responsive.bootstrap4.css'; +import 'datatables.net-bs5/css/dataTables.bootstrap5.css' +import 'datatables.net-buttons-bs5/css/buttons.bootstrap5.css' +import 'datatables.net-fixedheader-bs5/css/fixedHeader.bootstrap5.css' +import 'datatables.net-select-bs5/css/select.bootstrap5.css' +import 'datatables.net-responsive-bs5/css/responsive.bootstrap5.css'; //JS -import 'datatables.net-bs4'; -import 'datatables.net-buttons-bs4'; +import 'datatables.net-bs5'; +import 'datatables.net-buttons-bs5'; import 'datatables.net-buttons/js/buttons.colVis.js'; -import 'datatables.net-fixedheader-bs4'; -import 'datatables.net-select-bs4'; -import 'datatables.net-colreorder-bs4'; -import 'datatables.net-responsive-bs4'; +import 'datatables.net-fixedheader-bs5'; +import 'datatables.net-select-bs5'; +import 'datatables.net-colreorder-bs5'; +import 'datatables.net-responsive-bs5'; import './lib/datatables'; diff --git a/package.json b/package.json index c799f76b..0fd9d5e9 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@hotwired/turbo": "^7.0.1", "@popperjs/core": "^2.10.2", "@symfony/ux-turbo": "file:vendor/symfony/ux-turbo/Resources/assets", - "bootstrap": "^4.4.1", + "bootstrap": "^5.1.3", "jquery": "^3.5.1", "popper.js": "^1.14.7", "webpack-bundle-analyzer": "^4.3.0" @@ -24,26 +24,24 @@ "build": "encore production --progress" }, "dependencies": { - "@types/bootbox": "^5.2.0", - "@types/bootstrap": "^4.3.0", "@types/typeahead": "^0.11.32", "@zxing/library": "^0.19.1", "bootbox": "^5.4.0", "bootstrap-fileinput": "^5.0.1", "bootstrap-select": "^1.13.8", - "bootswatch": "^4.3.1", + "bootswatch": "^5.1.3", "bs-custom-file-input": "^1.3.4", "clipboard": "^2.0.4", "compression-webpack-plugin": "^10.0.0", "copy-webpack-plugin": "^11.0.0", "corejs-typeahead": "^1.2.1", "darkmode-js": "^1.5.0", - "datatables.net-bs4": "^2.0.1", - "datatables.net-buttons-bs4": "^2.2.2", - "datatables.net-colreorder-bs4": "^1.5.1", - "datatables.net-fixedheader-bs4": "^3.1.5", - "datatables.net-responsive-bs4": "^2.2.3", - "datatables.net-select-bs4": "^1.2.7", + "datatables.net-bs5": "^1.10.20", + "datatables.net-buttons-bs5": "^2.2.2", + "datatables.net-colreorder-bs5": "^1.5.1", + "datatables.net-fixedheader-bs5": "^3.1.5", + "datatables.net-responsive-bs5": "^2.2.3", + "datatables.net-select-bs5": "^1.2.7", "dompurify": "^2.0.6", "exports-loader": "^3.0.0", "jszip": "^3.2.0", diff --git a/templates/AdminPages/EntityAdminBase.html.twig b/templates/AdminPages/EntityAdminBase.html.twig index d95cb374..1b6e4b0f 100644 --- a/templates/AdminPages/EntityAdminBase.html.twig +++ b/templates/AdminPages/EntityAdminBase.html.twig @@ -54,7 +54,7 @@ {% if timeTravel is defined and timeTravel is not null %} ({{ timeTravel|format_datetime('short') }}) {% endif %} - {% block quick_links %}{% endblock %} + {% block quick_links %}{% endblock %} {% else %} {% block new_title %}{% trans %}new.caption{% endtrans %}{% endblock %} {% endif %} @@ -139,7 +139,7 @@
{{ form_widget(form.save) }} -
diff --git a/templates/AdminPages/_attachments.html.twig b/templates/AdminPages/_attachments.html.twig index 18feb2ff..6e1984b2 100644 --- a/templates/AdminPages/_attachments.html.twig +++ b/templates/AdminPages/_attachments.html.twig @@ -15,7 +15,7 @@
{{ form_widget(attachment) }}
-
+
{{ delete_btn }} {% set attach = attachment.vars.value %} diff --git a/templates/AdminPages/_delete_form.html.twig b/templates/AdminPages/_delete_form.html.twig index b05d4fc0..8ee18912 100644 --- a/templates/AdminPages/_delete_form.html.twig +++ b/templates/AdminPages/_delete_form.html.twig @@ -5,11 +5,11 @@
-
+
{% set delete_disabled = (not is_granted("delete", entity)) or (entity.group is defined and entity.id == 1) %}
-
@@ -19,7 +19,7 @@
{% if entity.parent is defined %} -
+
diff --git a/templates/LabelSystem/dialog.html.twig b/templates/LabelSystem/dialog.html.twig index ba0fbb6f..f31670d4 100644 --- a/templates/LabelSystem/dialog.html.twig +++ b/templates/LabelSystem/dialog.html.twig @@ -71,7 +71,7 @@
diff --git a/templates/LabelSystem/dropdown_macro.html.twig b/templates/LabelSystem/dropdown_macro.html.twig index 98d198f9..b100aca6 100644 --- a/templates/LabelSystem/dropdown_macro.html.twig +++ b/templates/LabelSystem/dropdown_macro.html.twig @@ -1,7 +1,7 @@ {% macro profile_dropdown(type, id = null, include_text = true, btn_type = 'btn-secondary') %}
diff --git a/templates/Parts/edit/edit_part_info.html.twig b/templates/Parts/edit/edit_part_info.html.twig index 1cd0bba6..7b850c3c 100644 --- a/templates/Parts/edit/edit_part_info.html.twig +++ b/templates/Parts/edit/edit_part_info.html.twig @@ -8,7 +8,7 @@ {% trans with {'%name%': part.name} %}part.edit.card_title{% endtrans %} {{ part.name }} -
+
{% trans %}id.label{% endtrans %}: {{ part.id }}
{% endblock %} @@ -99,7 +99,7 @@
{{ form_widget(form.save) }} -
diff --git a/templates/Parts/info/_attachments_info.html.twig b/templates/Parts/info/_attachments_info.html.twig index 1a06b4e6..7a998375 100644 --- a/templates/Parts/info/_attachments_info.html.twig +++ b/templates/Parts/info/_attachments_info.html.twig @@ -69,7 +69,7 @@
-
ID: {{ attachment.iD }} diff --git a/templates/Parts/info/_order_infos.html.twig b/templates/Parts/info/_order_infos.html.twig index e050120a..9d6dcdaa 100644 --- a/templates/Parts/info/_order_infos.html.twig +++ b/templates/Parts/info/_order_infos.html.twig @@ -64,7 +64,7 @@ {# Action for order information #}
-
diff --git a/templates/Parts/info/_tools.html.twig b/templates/Parts/info/_tools.html.twig index f6f424ed..ab9537b0 100644 --- a/templates/Parts/info/_tools.html.twig +++ b/templates/Parts/info/_tools.html.twig @@ -15,7 +15,7 @@ {% trans %}part.clone.btn{% endtrans %} -