upgrade tabler to beta21 (#599)

* upgrade tabler to beta21 * upgrade tabler to beta21 * upgrade tabler to beta21 * upgrade tabler to beta21
jowilf · Oct 26, 2024 · a5717c0 · a5717c0
1 parent 64ce44b
commit a5717c0
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 30 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,6 +5,8 @@ repos:
     rev: v5.0.0
     hooks:
     -   id: check-added-large-files
+        args:
+            - --maxkb=1024
     -   id: check-toml
     -   id: check-yaml
         args:

diff --git a/starlette_admin/statics/css/tabler.min.beta21.css b/starlette_admin/statics/css/tabler.min.beta21.css
diff --git a/starlette_admin/statics/css/tabler.min.css b/starlette_admin/statics/css/tabler.min.css
diff --git a/starlette_admin/statics/js/vendor/tabler.min.beta21.js b/starlette_admin/statics/js/vendor/tabler.min.beta21.js
diff --git a/starlette_admin/statics/js/vendor/tabler.min.js b/starlette_admin/statics/js/vendor/tabler.min.js
diff --git a/starlette_admin/templates/base.html b/starlette_admin/templates/base.html
@@ -9,7 +9,7 @@
     {% endif %}
     {% block head_meta %}{% endblock %}
     {% block title %}<title>{{ title or app_title }}</title>{% endblock %}
-    <link rel="stylesheet" href="{{ url_for(__name__ ~ ':statics', path='css/tabler.min.css') }}">
+    <link rel="stylesheet" href="{{ url_for(__name__ ~ ':statics', path='css/tabler.min.beta21.css') }}">
     <link rel="stylesheet" href="{{ url_for(__name__ ~ ':statics', path='css/fontawesome.min.css') }}">
     <style>
         @import url('https://rsms.me/inter/inter.css');
@@ -21,6 +21,11 @@
         body {
             font-feature-settings: "cv03", "cv04", "cv11";
         }
+
+        .navbar-logo {
+            width: auto;
+            height: 2rem;
+        }
     </style>
     {% block head_css %}{% endblock %}
 </head>
@@ -30,7 +35,8 @@
 {% block modal %}{% endblock %}
 <script type="text/javascript" src="{{ url_for(__name__ ~ ':statics', path='js/vendor/jquery.min.js') }}"></script>
 <script type="text/javascript" src="{{ url_for(__name__ ~ ':statics', path='js/vendor/js.cookie.min.js') }}"></script>
-<script type="text/javascript" src="{{ url_for(__name__ ~ ':statics', path='js/vendor/tabler.min.js') }}"></script>
+<script type="text/javascript"
+        src="{{ url_for(__name__ ~ ':statics', path='js/vendor/tabler.min.beta21.js') }}"></script>
 {% block script %}{% endblock %}
 <script>
     $(function () {

diff --git a/starlette_admin/templates/layout.html b/starlette_admin/templates/layout.html
@@ -9,7 +9,7 @@
 {% block body %}
     <div class="page">
         {% block sidebar %}
-            <aside class="navbar navbar-vertical navbar-expand-lg navbar-dark">
+            <aside class="navbar navbar-vertical navbar-expand-lg" data-bs-theme="dark">
                 <div class="container-fluid">
                     <button class="navbar-toggler"
                             type="button"
@@ -23,9 +23,7 @@ <h1 class="navbar-brand navbar-brand-autodark">
                         <a class="brand-link" href="{{ url_for(__name__ ~ ':index') }}">
                             {% if logo_url %}
                                 <img src="{{ logo_url }}"
-                                     width="110"
-                                     height="32"
-                                     class="navbar-brand-image"/>
+                                     class="navbar-logo"/>
                             {% else %}
                                 <h3>{{ app_title }}</h3>
                             {% endif %}