Tabler Beta 19 (#161)

* theme usage for navbars * bootstrap 5.3 - replace deprecated text-muted class * bump to tabler beta 19 (mainly navbar and dark mode fixes)
kevinpapst · May 15, 2023 · c5986da · c5986da
1 parent ec9ce01
commit c5986da
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 41 deletions.
diff --git a/config/packages/tabler.yaml b/config/packages/tabler.yaml
@@ -9,7 +9,7 @@ tabler:
         # true = dark mode (light colors on dark background), false = normal mode (dark colors on light background)
         dark_mode: true
         # for cache busting, can be dynamically changed woth the ContextHelper
-        asset_version: "beta18"
+        asset_version: "beta19"
         # condensed = one nav-bar, false = two nav-bars
         navbar_condensed: true
         # true = dark mode, false = light mode (on header)

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
     "dependencies": {
         "@fortawesome/fontawesome-free": "^5.15.4",
         "@symfony/webpack-encore": "^1.6.1",
-        "@tabler/core": "1.0.0-beta18",
+        "@tabler/core": "1.0.0-beta19",
         "file-loader": "^6.2.0",
         "sass": "^1.58.3",
         "sass-loader": "^11.0"

diff --git a/public/entrypoints.json b/public/entrypoints.json
@@ -2,18 +2,18 @@
   "entrypoints": {
     "tabler": {
       "js": [
-        "/bundles/tabler/tabler.js?849e883466e796705064"
+        "/bundles/tabler/tabler.js?2eeb1221ae180d4abdd1"
       ],
       "css": [
-        "/bundles/tabler/tabler.css?c9e416416be27f284eb5"
+        "/bundles/tabler/tabler.css?0482084a8ee981d8d341"
       ]
     },
     "tabler-rtl": {
       "js": [
-        "/bundles/tabler/tabler-rtl.js?0b2769c68192066858d1"
+        "/bundles/tabler/tabler-rtl.js?a9fa64567d83463f755b"
       ],
       "css": [
-        "/bundles/tabler/tabler-rtl.css?e9fca6a99c3999859603"
+        "/bundles/tabler/tabler-rtl.css?f83f902d3c6780bf1583"
       ]
     }
   }

diff --git a/public/manifest.json b/public/manifest.json
@@ -1,8 +1,8 @@
 {
-  "bundles/tabler/tabler.js": "/bundles/tabler/tabler.js?849e883466e796705064",
-  "bundles/tabler/tabler.css": "/bundles/tabler/tabler.css?c9e416416be27f284eb5",
-  "bundles/tabler/tabler-rtl.js": "/bundles/tabler/tabler-rtl.js?0b2769c68192066858d1",
-  "bundles/tabler/tabler-rtl.css": "/bundles/tabler/tabler-rtl.css?e9fca6a99c3999859603",
+  "bundles/tabler/tabler.js": "/bundles/tabler/tabler.js?2eeb1221ae180d4abdd1",
+  "bundles/tabler/tabler.css": "/bundles/tabler/tabler.css?0482084a8ee981d8d341",
+  "bundles/tabler/tabler-rtl.js": "/bundles/tabler/tabler-rtl.js?a9fa64567d83463f755b",
+  "bundles/tabler/tabler-rtl.css": "/bundles/tabler/tabler-rtl.css?f83f902d3c6780bf1583",
   "bundles/tabler/images/fa-solid-900.svg": "/bundles/tabler/images/fa-solid-900.svg?7a8b4f13",
   "bundles/tabler/images/fa-brands-400.svg": "/bundles/tabler/images/fa-brands-400.svg?2f517e09",
   "bundles/tabler/fonts/fa-solid-900.eot": "/bundles/tabler/fonts/fa-solid-900.eot?9bbb245e",

diff --git a/public/tabler-rtl.css b/public/tabler-rtl.css
diff --git a/public/tabler-rtl.js.LICENSE.txt b/public/tabler-rtl.js.LICENSE.txt
@@ -5,8 +5,8 @@
 	  */
 
 /*!
-* Tabler v1.0.0-beta18 (https://tabler.io)
-* @version 1.0.0-beta18
+* Tabler v1.0.0-beta19 (https://tabler.io)
+* @version 1.0.0-beta19
 * @link https://tabler.io
 * Copyright 2018-2023 The Tabler Authors
 * Copyright 2018-2023 codecalm.net Paweł Kuna

diff --git a/public/tabler.css b/public/tabler.css
diff --git a/public/tabler.js.LICENSE.txt b/public/tabler.js.LICENSE.txt
@@ -5,8 +5,8 @@
 	  */
 
 /*!
-* Tabler v1.0.0-beta18 (https://tabler.io)
-* @version 1.0.0-beta18
+* Tabler v1.0.0-beta19 (https://tabler.io)
+* @version 1.0.0-beta19
 * @link https://tabler.io
 * Copyright 2018-2023 The Tabler Authors
 * Copyright 2018-2023 codecalm.net Paweł Kuna

diff --git a/templates/components/alert.html.twig b/templates/components/alert.html.twig
@@ -47,7 +47,7 @@
                         {% if _background %}
                             <p class="m-0">{{ _raw ? _description|raw : _description }}</p>
                         {% else %}
-                            <div class="text-muted">{{ _raw ? _description|raw : _description }}</div>
+                            <div class="text-body-secondary">{{ _raw ? _description|raw : _description }}</div>
                         {% endif %}
                     {% endif %}
                 </div>

diff --git a/templates/components/timeline.html.twig b/templates/components/timeline.html.twig
@@ -18,7 +18,7 @@
                             <p class="list-timeline-title">{{ item.title }}</p>
                         {% endif %}
                         {% if item.text is defined and item.text is not null %}
-                            <p class="text-muted">{{ item.text }}</p>
+                            <p class="text-body-secondary">{{ item.text }}</p>
                         {% elseif item.textHtml is defined and item.textHtml is not null %}
                             {{ item.textHtml|raw }}
                         {% endif %}

diff --git a/templates/error.html.twig b/templates/error.html.twig
@@ -41,7 +41,7 @@
                     {% endif %}
                 {% endblock %}
             </p>
-            <p class="empty-subtitle text-muted">
+            <p class="empty-subtitle text-body-secondary">
                 {% block error_subtitle %}
                     {{ errorMessageTrans }}
                 {% endblock %}

diff --git a/templates/includes/navbar_user.html.twig b/templates/includes/navbar_user.html.twig
@@ -15,7 +15,7 @@
             <div class="d-none d-xl-block ps-2">
                 <div>{{ user.name }}</div>
                 {% if user.title is not empty %}
-                    <div class="mt-1 small text-muted">{{ user.title }}</div>
+                    <div class="mt-1 small text-body-secondary">{{ user.title }}</div>
                 {% endif %}
             </div>
             {% endif %}

diff --git a/templates/layout-horizontal.html.twig b/templates/layout-horizontal.html.twig
@@ -27,7 +27,7 @@ Enjoy your theme!
 
     {# *** Layout type changes *** #}
     {% block header %}
-        <header id="{% block header_id %}{% endblock %}" class="navbar navbar-expand-md{% block header_class %} {% if tabler_bundle.isNavbarOverlapping() %}navbar-dark navbar-overlap{% else %}{{ tabler_bundle.isHeaderDark() ? 'navbar-dark' : 'navbar-light' }}{% endif %}{% endblock %} d-print-none">
+        <header id="{% block header_id %}{% endblock %}" class="navbar navbar-expand-md{% block header_class %} {% if tabler_bundle.isNavbarOverlapping() %}navbar-overlap{% endif %}{% endblock %} d-print-none" data-bs-theme="{{ tabler_bundle.isNavbarOverlapping() or tabler_bundle.isHeaderDark() ? 'dark' : 'light' }}">
             <div class="{{ ''|tabler_container }}">
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-menu">
                     <span class="navbar-toggler-icon"></span>
@@ -64,7 +64,7 @@ Enjoy your theme!
         {% if not tabler_bundle.isCondensedNavbar() %}
             <div id="{% block navbar_id %}{% endblock %}" class="navbar-expand-md">
                 <div class="collapse navbar-collapse" id="navbar-menu">
-                    <div class="navbar {{ tabler_bundle.isNavbarDark() ? 'navbar-dark' : 'navbar-light' }}">
+                    <div class="navbar" data-bs-theme="{{ tabler_bundle.isNavbarDark() ? 'dark' : 'light' }}">
                         <div class="{{ ''|tabler_container }}">
                             {% block navbar_menu %}
                                 {% include '@Tabler/includes/menu.html.twig' %}
@@ -97,7 +97,7 @@ Enjoy your theme!
                                 {% block page_title %}Dashboard{% endblock %}
                             </h2>
                             {% block page_subtitle %}
-                                <div class="text-muted mt-1">
+                                <div class="text-body-secondary mt-1">
                                     1-10 of 100
                                 </div>
                             {% endblock %}

diff --git a/templates/layout-vertical.html.twig b/templates/layout-vertical.html.twig
@@ -31,7 +31,7 @@ Enjoy your theme!
 
     {# *** Layout type changes *** #}
     {% block navbar %}
-        <aside id="{% block sidebar_id %}{% endblock %}" class="navbar navbar-vertical navbar-expand-lg {{ tabler_bundle.isNavbarDark() ? 'navbar-dark' : 'navbar-light' }}">
+        <aside id="{% block sidebar_id %}{% endblock %}" class="navbar navbar-vertical navbar-expand-lg" data-bs-theme="{{ tabler_bundle.isNavbarDark() ? 'dark' : 'light' }}">
             <div class="{{ ''|tabler_container }}">
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-menu">
                     <span class="navbar-toggler-icon"></span>
@@ -55,7 +55,7 @@ Enjoy your theme!
 
     {% block header %}
         {% if not tabler_bundle.isCondensedNavbar() %}
-            <header id="{% block header_id %}{% endblock %}" class="navbar navbar-expand-md {{ tabler_bundle.isHeaderDark() ? 'navbar-dark' : 'navbar-light' }} d-none d-lg-flex d-print-none">
+            <header id="{% block header_id %}{% endblock %}" class="navbar navbar-expand-md d-none d-lg-flex d-print-none" data-bs-theme="{{ tabler_bundle.isHeaderDark() ? 'dark' : 'light' }}">
                 <div class="{{ ''|tabler_container }}">
                     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-menu">
                         <span class="navbar-toggler-icon"></span>
@@ -93,7 +93,7 @@ Enjoy your theme!
                                 {% block page_title %}Dashboard{% endblock %}
                             </h2>
                             {% block page_subtitle %}
-                                <div class="text-muted mt-1">
+                                <div class="text-body-secondary mt-1">
                                     1-10 of 100
                                 </div>
                             {% endblock %}

diff --git a/templates/security.html.twig b/templates/security.html.twig
@@ -96,7 +96,7 @@
         {% block login_actions %}
             {% block registration %}
                 {% if 'tabler_registration'|tabler_route != 'tabler_registration' %}
-                    <div class="text-center text-muted mt-3">
+                    <div class="text-center text-body-secondary mt-3">
                         <a href="{{ path('tabler_registration'|tabler_route) }}">
                             {{ 'Register a new account'|trans({}, 'TablerBundle') }}
                         </a>

diff --git a/templates/security/password-reset.html.twig b/templates/security/password-reset.html.twig
@@ -20,7 +20,7 @@
 {% endblock %}
 
 {% block login_actions %}
-    <div class="text-center text-muted mt-3">
+    <div class="text-center text-body-secondary mt-3">
         <a href="{{ path('tabler_login'|tabler_route) }}">
             {{ 'Back to login'|trans({}, 'TablerBundle') }}
         </a>

diff --git a/templates/security/registration.html.twig b/templates/security/registration.html.twig
@@ -17,7 +17,7 @@
 {% endblock %}
 
 {% block login_actions %}
-    <div class="text-center text-muted mt-3">
+    <div class="text-center text-body-secondary mt-3">
         <a href="{{ path('tabler_login'|tabler_route) }}">
             {{ 'Back to login'|trans({}, 'TablerBundle') }}
         </a>