From bbab9caf7bff7d159267b588d5afc2d2f18e18d5 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Sun, 3 Oct 2021 13:27:09 +0200 Subject: [PATCH] Display: Improve installation process style --- assets/css/app.scss | 7 ++++--- public/main/install/index.php | 9 ++++----- public/main/install/install.lib.php | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/assets/css/app.scss b/assets/css/app.scss index e50a252eeb..956b67f252 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -66,15 +66,15 @@ } .btn-warning { - @apply text-ch-text-warning bg-ch-warning hover:bg-ch-warning-dark focus:bg-ch-warning-light; + @apply text-ch-text-warning bg-ch-warning hover:bg-ch-warning-dark focus:ring-ch-warning-light; } .btn-success { - @apply text-ch-text-success bg-ch-success hover:bg-ch-success-dark focus:bg-ch-success-light; + @apply text-ch-text-success bg-ch-success hover:bg-ch-success-dark focus:ring-ch-success-light; } .btn-danger { - @apply text-ch-text-error bg-ch-error hover:bg-ch-error-dark focus:bg-ch-error-light; + @apply text-ch-text-error bg-ch-error hover:bg-ch-error-dark focus:ring-ch-error-light; } // Buttons with icons. @@ -224,6 +224,7 @@ // Forms input { appearance: auto !important; + border-width: 1px !important; } // Special diff --git a/public/main/install/index.php b/public/main/install/index.php index 1c8cc3704d..c36b5dc987 100644 --- a/public/main/install/index.php +++ b/public/main/install/index.php @@ -506,7 +506,7 @@ if (isset($_POST['step2'])) { if ('new' === $installType) { echo Display::return_message( - '

'.get_lang( + '

'.get_lang( 'Warning' ).'

'. get_lang('The install script will erase all tables of the selected database. We heavily recommend you do a full backup of them before confirming this last install step.'), @@ -774,9 +774,8 @@ $poweredBy = 'Powered by Chami - - + - +
@@ -903,7 +902,7 @@ $poweredBy = 'Powered by Chami
- + trans('Read the installation guide'); ?> diff --git a/public/main/install/install.lib.php b/public/main/install/install.lib.php index a646746c04..c42a366369 100644 --- a/public/main/install/install.lib.php +++ b/public/main/install/install.lib.php @@ -440,11 +440,11 @@ function display_language_selection()
+
-
@@ -881,7 +881,7 @@ function display_requirements(
'; if (INSTALL_TYPE_UPDATE != $installType) { ?> - @@ -1414,7 +1414,7 @@ function display_configuration_parameter( $displayWhenUpdate = 'true' ) { $html = '
'; - $html .= ''; + $html .= ''; if (INSTALL_TYPE_UPDATE == $installType && $displayWhenUpdate) { $html .= 'trans('Go to your newly created portal.').' ';