From 051d08b499acdf7d767dc5dcc9062326416f2bba Mon Sep 17 00:00:00 2001 From: FreddleSpl0it Date: Thu, 31 Mar 2022 20:16:44 +0200 Subject: [PATCH] [BS5] bug fixes --- data/web/css/build/008-mailcow.css | 19 ++++++++++--------- data/web/css/build/013-bootstrap-icons.css | 4 ++-- data/web/inc/prerequisites.inc.php | 6 +++--- .../templates/admin/tab-config-admins.twig | 4 ++-- data/web/templates/base.twig | 2 +- data/web/templates/debug.twig | 2 +- data/web/templates/index.twig | 10 ++++++---- data/web/templates/mailbox.twig | 4 ++-- 8 files changed, 27 insertions(+), 24 deletions(-) diff --git a/data/web/css/build/008-mailcow.css b/data/web/css/build/008-mailcow.css index d04feb25..32ec1ec9 100644 --- a/data/web/css/build/008-mailcow.css +++ b/data/web/css/build/008-mailcow.css @@ -75,6 +75,12 @@ display: inline-block; font-size: inherit; } +.btn-group-xs > .btn, .btn-xs { + padding: .25rem .4rem; + font-size: .875rem; + line-height: .5; + border-radius: .2rem; +} .icon-spin { animation-name: spin; animation-duration: 2000ms; @@ -172,14 +178,6 @@ legend { .bootstrap-select.btn-group .no-results { display: none; } -.dropdown-desc { - display: block; - padding: 3px 10px; - clear: both; - font-weight: bold; - color: #5a5a5a; - white-space: nowrap; -} .haveibeenpwned { cursor: pointer; -webkit-user-select: none; @@ -206,7 +204,7 @@ legend { flex-direction: column; } .footer .version { - margin-left: auto; + margin-left: auto; margin-top: 20px; } .slave-info { @@ -256,3 +254,6 @@ code { .flag-icon { margin-right: 5px; } +.dropdown-header { + font-weight: 600; +} \ No newline at end of file diff --git a/data/web/css/build/013-bootstrap-icons.css b/data/web/css/build/013-bootstrap-icons.css index 5712315e..83e6babb 100644 --- a/data/web/css/build/013-bootstrap-icons.css +++ b/data/web/css/build/013-bootstrap-icons.css @@ -1,7 +1,7 @@ @font-face { font-family: "bootstrap-icons"; - src: url("./fonts/bootstrap-icons.woff2?524846017b983fc8ded9325d94ed40f3") format("woff2"), -url("./fonts/bootstrap-icons.woff?524846017b983fc8ded9325d94ed40f3") format("woff"); + src: url("/fonts/bootstrap-icons.woff2?524846017b983fc8ded9325d94ed40f3") format("woff2"), +url("/fonts/bootstrap-icons.woff?524846017b983fc8ded9325d94ed40f3") format("woff"); } .bi::before, diff --git a/data/web/inc/prerequisites.inc.php b/data/web/inc/prerequisites.inc.php index 3df6410a..083ee5d8 100644 --- a/data/web/inc/prerequisites.inc.php +++ b/data/web/inc/prerequisites.inc.php @@ -254,10 +254,10 @@ $css_dir = array_diff(scandir('/web/css/build'), array('..', '.')); $UI_TEXTS = customize('get', 'ui_texts'); $UI_THEME = "lumen"; // TODO: customize('get', 'ui_theme'); // minify bootstrap theme -if (file_exists('../css/themes'.$UI_THEME.'-bootstrap.css')) - $css_minifier->add('../css/themes/'.$UI_THEME.'-bootstrap.css'); +if (file_exists('/web/css/themes'.$UI_THEME.'-bootstrap.css')) + $css_minifier->add('/web/css/themes/'.$UI_THEME.'-bootstrap.css'); else - $css_minifier->add('../css/themes/lumen-bootstrap.css'); + $css_minifier->add('/web/css/themes/lumen-bootstrap.css'); // minify css build files foreach ($css_dir as $css_file) { $css_minifier->add('/web/css/build/' . $css_file); diff --git a/data/web/templates/admin/tab-config-admins.twig b/data/web/templates/admin/tab-config-admins.twig index e8f13919..7b668515 100644 --- a/data/web/templates/admin/tab-config-admins.twig +++ b/data/web/templates/admin/tab-config-admins.twig @@ -1,6 +1,6 @@
-
-
{{ lang.admin.admin_details }}
+
+
{{ lang.admin.admin_details }}
diff --git a/data/web/templates/base.twig b/data/web/templates/base.twig index c478ccb9..99068077 100644 --- a/data/web/templates/base.twig +++ b/data/web/templates/base.twig @@ -24,7 +24,7 @@