From 0e7f144f6365b8ee340ed618c7c957b382e33fd6 Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Fri, 26 Aug 2022 14:45:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=BC=95=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/EnvironmentController.php | 4 +- .../Controllers/WelcomeController.php | 1 + .../Installer/Lang/en/installer_messages.php | 156 +++-------- .../Lang/zh_cn/installer_messages.php | 77 +++--- .../Views/environment-wizard.blade.php | 261 +----------------- beike/Installer/Views/finished.blade.php | 23 +- .../Installer/Views/layouts/master.blade.php | 135 ++++----- beike/Installer/Views/permissions.blade.php | 22 +- beike/Installer/Views/requirements.blade.php | 27 +- beike/Installer/Views/welcome.blade.php | 22 +- beike/Installer/assets/scss/app.scss | 39 ++- public/install/css/app.css | 18 +- 12 files changed, 246 insertions(+), 539 deletions(-) diff --git a/beike/Installer/Controllers/EnvironmentController.php b/beike/Installer/Controllers/EnvironmentController.php index db2fad03..62ce287d 100644 --- a/beike/Installer/Controllers/EnvironmentController.php +++ b/beike/Installer/Controllers/EnvironmentController.php @@ -48,7 +48,7 @@ class EnvironmentController extends Controller { $rules = config('installer.environment.form.rules'); $messages = [ - 'environment_custom.required_if' => trans('installer::installer_messages.environment.wizard.form.name_required'), + 'environment_custom.required_if' => trans('installer::installer_messages.environment.name_required'), ]; $validator = Validator::make($request->all(), $rules, $messages); @@ -59,7 +59,7 @@ class EnvironmentController extends Controller if (! $this->checkDatabaseConnection($request)) { return $redirect->route('installer.environment')->withInput()->withErrors([ - 'database_connection' => trans('installer::installer_messages.environment.wizard.form.db_connection_failed'), + 'database_connection' => trans('installer::installer_messages.environment.db_connection_failed'), ]); } diff --git a/beike/Installer/Controllers/WelcomeController.php b/beike/Installer/Controllers/WelcomeController.php index 102a7514..b54f962d 100644 --- a/beike/Installer/Controllers/WelcomeController.php +++ b/beike/Installer/Controllers/WelcomeController.php @@ -32,6 +32,7 @@ class WelcomeController extends Controller $data['languages'] = $this->languages; $data['locale'] = session('locale'); + $data['steps'] = 1; return view('installer::welcome', $data); } diff --git a/beike/Installer/Lang/en/installer_messages.php b/beike/Installer/Lang/en/installer_messages.php index 04718332..d5481ad2 100644 --- a/beike/Installer/Lang/en/installer_messages.php +++ b/beike/Installer/Lang/en/installer_messages.php @@ -11,6 +11,8 @@ return [ 'next' => 'Next Step', 'back' => 'Previous', 'finish' => 'Install', + 'environment' => 'Environmen', + 'status' => 'Status', 'forms' => [ 'errorTitle' => 'The Following errors occurred:', ], @@ -34,6 +36,7 @@ return [ */ 'requirements' => [ 'templateTitle' => 'Step 1 | Server Requirements', + 'environment' => 'Environmen', 'title' => 'Server Requirements', 'next' => 'Check Permissions', ], @@ -44,9 +47,10 @@ return [ * */ 'permissions' => [ - 'templateTitle' => 'Step 2 | Permissions', - 'title' => 'Permissions', + 'title' => 'Directory permission detection', 'next' => 'Configure Environment', + 'table' => 'Table of contents', + 'ask_permission' => '要求权限', ], /* @@ -55,120 +59,40 @@ return [ * */ 'environment' => [ - 'menu' => [ - 'templateTitle' => 'Step 3 | Environment Settings', - 'title' => 'Environment Settings', - 'desc' => 'Please select how you want to configure the apps .env file.', - 'wizard-button' => 'Form Wizard Setup', - 'classic-button' => 'Classic Text Editor', - ], - 'wizard' => [ - 'templateTitle' => 'Step 3 | Environment Settings | Guided Wizard', - 'title' => 'Guided .env Wizard', - 'tabs' => [ - 'environment' => 'Environment', - 'database' => 'Database', - 'application' => 'Application', - ], - 'form' => [ - 'name_required' => 'An environment name is required.', - 'app_name_label' => 'App Name', - 'app_name_placeholder' => 'App Name', - 'app_environment_label' => 'App Environment', - 'app_environment_label_local' => 'Local', - 'app_environment_label_developement' => 'Development', - 'app_environment_label_qa' => 'Qa', - 'app_environment_label_production' => 'Production', - 'app_environment_label_other' => 'Other', - 'app_environment_placeholder_other' => 'Enter your environment...', - 'app_debug_label' => 'App Debug', - 'app_debug_label_true' => 'True', - 'app_debug_label_false' => 'False', - 'app_log_level_label' => 'App Log Level', - 'app_log_level_label_debug' => 'debug', - 'app_log_level_label_info' => 'info', - 'app_log_level_label_notice' => 'notice', - 'app_log_level_label_warning' => 'warning', - 'app_log_level_label_error' => 'error', - 'app_log_level_label_critical' => 'critical', - 'app_log_level_label_alert' => 'alert', - 'app_log_level_label_emergency' => 'emergency', - 'app_url_label' => 'App Url', - 'app_url_placeholder' => 'App Url', - 'db_connection_failed' => 'Could not connect to the database.', - 'db_connection_label' => 'Database Connection', - 'db_connection_label_mysql' => 'mysql', - 'db_connection_label_sqlite' => 'sqlite', - 'db_connection_label_pgsql' => 'pgsql', - 'db_connection_label_sqlsrv' => 'sqlsrv', - 'db_host_label' => 'Database Host', - 'db_host_placeholder' => 'Database Host', - 'db_port_label' => 'Database Port', - 'db_port_placeholder' => 'Database Port', - 'db_name_label' => 'Database Name', - 'db_name_placeholder' => 'Database Name', - 'db_username_label' => 'Database User Name', - 'db_username_placeholder' => 'Database User Name', - 'db_password_label' => 'Database Password', - 'db_password_placeholder' => 'Database Password', - - 'app_tabs' => [ - 'more_info' => 'More Info', - 'broadcasting_title' => 'Broadcasting, Caching, Session, & Queue', - 'broadcasting_label' => 'Broadcast Driver', - 'broadcasting_placeholder' => 'Broadcast Driver', - 'cache_label' => 'Cache Driver', - 'cache_placeholder' => 'Cache Driver', - 'session_label' => 'Session Driver', - 'session_placeholder' => 'Session Driver', - 'queue_label' => 'Queue Driver', - 'queue_placeholder' => 'Queue Driver', - 'redis_label' => 'Redis Driver', - 'redis_host' => 'Redis Host', - 'redis_password' => 'Redis Password', - 'redis_port' => 'Redis Port', - - 'mail_label' => 'Mail', - 'mail_driver_label' => 'Mail Driver', - 'mail_driver_placeholder' => 'Mail Driver', - 'mail_host_label' => 'Mail Host', - 'mail_host_placeholder' => 'Mail Host', - 'mail_port_label' => 'Mail Port', - 'mail_port_placeholder' => 'Mail Port', - 'mail_username_label' => 'Mail Username', - 'mail_username_placeholder' => 'Mail Username', - 'mail_password_label' => 'Mail Password', - 'mail_password_placeholder' => 'Mail Password', - 'mail_encryption_label' => 'Mail Encryption', - 'mail_encryption_placeholder' => 'Mail Encryption', - - 'pusher_label' => 'Pusher', - 'pusher_app_id_label' => 'Pusher App Id', - 'pusher_app_id_palceholder' => 'Pusher App Id', - 'pusher_app_key_label' => 'Pusher App Key', - 'pusher_app_key_palceholder' => 'Pusher App Key', - 'pusher_app_secret_label' => 'Pusher App Secret', - 'pusher_app_secret_palceholder' => 'Pusher App Secret', - ], - 'buttons' => [ - 'setup_database' => 'Setup Database', - 'setup_application' => 'Setup Application', - 'install' => 'Install', - ], - ], - ], - 'classic' => [ - 'templateTitle' => 'Step 3 | Environment Settings | Classic Editor', - 'title' => 'Classic Environment Editor', - 'save' => 'Save .env', - 'back' => 'Use Form Wizard', - 'install' => 'Save and Install', - ], - 'success' => 'Your .env file settings have been saved.', - 'errors' => 'Unable to save the .env file, Please create it manually.', + 'title' => 'System parameter configuration', + 'name_required' => 'An environment name is required.', + 'app_name_label' => 'App Name', + 'app_name_placeholder' => 'App Name', + 'app_environment_label' => 'App Environment', + 'app_environment_label_local' => 'Local', + 'app_environment_label_developement' => 'Development', + 'app_environment_label_qa' => 'Qa', + 'app_environment_label_production' => 'Production', + 'app_environment_label_other' => 'Other', + 'app_environment_placeholder_other' => 'Enter your environment...', + 'app_url_label' => 'App Url', + 'app_url_placeholder' => 'App Url', + 'db_connection_failed' => 'Could not connect to the database.', + 'db_connection_label' => 'Database Connection', + 'db_connection_label_mysql' => 'mysql', + 'db_connection_label_sqlite' => 'sqlite', + 'db_connection_label_pgsql' => 'pgsql', + 'db_connection_label_sqlsrv' => 'sqlsrv', + 'db_host_label' => 'Database Host', + 'db_host_placeholder' => 'Database Host', + 'db_port_label' => 'Database Port', + 'db_port_placeholder' => 'Database Port', + 'db_name_label' => 'Database Name', + 'db_name_placeholder' => 'Database Name', + 'db_username_label' => 'Database User Name', + 'db_username_placeholder' => 'Database User Name', + 'db_password_label' => 'Database Password', + 'db_password_placeholder' => 'Database Password', + 'admin_email' => '后台账号', + 'admin_password' => '后台密码', + 'install' => 'Install', ], - 'install' => 'Install', /* * @@ -187,12 +111,14 @@ return [ 'final' => [ 'title' => 'Installation Finished', 'templateTitle' => 'Installation Finished', - 'finished' => 'Application has been successfully installed.', 'migration' => 'Migration & Seed Console Output:', 'console' => 'Application Console Output:', 'log' => 'Installation Log Entry:', 'env' => 'Final .env File:', 'exit' => 'Click here to exit', + 'finished' => 'Congratulations, the system is successfully installed, let\'s experience it now', + 'to_front' => 'Shop', + 'to_admin' => 'Admin Panel', ], /* diff --git a/beike/Installer/Lang/zh_cn/installer_messages.php b/beike/Installer/Lang/zh_cn/installer_messages.php index a412b851..9adcc29d 100644 --- a/beike/Installer/Lang/zh_cn/installer_messages.php +++ b/beike/Installer/Lang/zh_cn/installer_messages.php @@ -10,6 +10,8 @@ return [ 'title' => 'Laravel安装程序', 'next' => '下一步', 'finish' => '安装', + 'status' => '状态', + /* * @@ -17,8 +19,10 @@ return [ * */ 'welcome' => [ - 'title' => '欢迎来到Laravel安装程序', + 'title' => '欢迎来到安装引导程序', + 'describe' => '欢迎使用安装引导，在后面的步骤中我们将检测您的系统环境和安装条件是否达标，请根据每一步中的提示信息操作，谢谢。', 'message' => '欢迎来到安装向导.', + 'next' => '检测系统环境', ], /* @@ -27,7 +31,8 @@ return [ * */ 'requirements' => [ - 'title' => '环境要求', + 'title' => '系统环境要求检测', + 'environment' => '环境', ], /* @@ -36,41 +41,40 @@ return [ * */ 'permissions' => [ - 'title' => '权限', + 'title' => '目录权限检测', + 'table' => '目录', + 'next' => '配置环境参数', + 'ask_permission' => '要求权限', ], /* - * - * Environment page translations. - * - */ + * + * Environment page translations. + * + */ 'environment' => [ - 'wizard' => [ - 'form' => [ - 'app_url_label' => '您的应用URL', - 'app_url_placeholder' => '输入您的应用URL', - 'db_connection_failed' => '无法连接到数据库！', - 'db_connection_label' => '数据库连接', - 'db_connection_label_mysql' => 'mysql', - 'db_connection_label_sqlite' => 'sqlite', - 'db_connection_label_pgsql' => 'pgsql', - 'db_connection_label_sqlsrv' => 'sqlsrv', - 'db_host_label' => '数据库主机', - 'db_host_placeholder' => '输入数据库主机ip或url', - 'db_port_label' => '数据库端口', - 'db_port_placeholder' => '输入数据库端口', - 'db_name_label' => '数据库名', - 'db_name_placeholder' => '输入数据库名', - 'db_username_label' => '数据库账号', - 'db_username_placeholder' => '输入数据库账号', - 'db_password_label' => '数据库账号密码', - 'db_password_placeholder' => '输入数据库账号密码', - - 'buttons' => [ - 'install' => '安装', - ], - ], - ], + 'title' => '系统参数配置', + 'app_url_label' => '您的应用URL', + 'app_url_placeholder' => '输入您的应用URL', + 'db_connection_failed' => '无法连接到数据库！', + 'db_connection_label' => '数据库连接', + 'db_connection_label_mysql' => 'mysql', + 'db_connection_label_sqlite' => 'sqlite', + 'db_connection_label_pgsql' => 'pgsql', + 'db_connection_label_sqlsrv' => 'sqlsrv', + 'db_host_label' => '数据库主机', + 'db_host_placeholder' => '输入数据库主机ip或url', + 'db_port_label' => '数据库端口', + 'db_port_placeholder' => '输入数据库端口', + 'db_name_label' => '数据库名', + 'db_name_placeholder' => '输入数据库名', + 'db_username_label' => '数据库账号', + 'db_username_placeholder' => '输入数据库账号', + 'db_password_label' => '数据库账号密码', + 'db_password_placeholder' => '输入数据库账号密码', + 'admin_email' => '后台账号', + 'admin_password' => '后台密码', + 'install' => '安装', ], /* @@ -79,8 +83,9 @@ return [ * */ 'final' => [ - 'title' => '完成', - 'finished' => '应用已成功安装.', - 'exit' => '点击退出', + 'title' => '获取安装结果', + 'finished' => '恭喜您，系统安装成功，赶快体验吧', + 'to_front' => '访问前台', + 'to_admin' => '访问后台', ], ]; diff --git a/beike/Installer/Views/environment-wizard.blade.php b/beike/Installer/Views/environment-wizard.blade.php index 1fe3229b..a94135ca 100644 --- a/beike/Installer/Views/environment-wizard.blade.php +++ b/beike/Installer/Views/environment-wizard.blade.php @@ -11,204 +11,14 @@ @section('content') @php - $entry_key = 'installer::installer_messages.environment.wizard.form.'; + $entry_key = 'installer::installer_messages.environment.'; @endphp
-

系统参数配置

+

{{ __('installer::installer_messages.environment.title') }}

- - {{-- -
- - - @if ($errors->has('app_url')) - - - {{ $errors->first('app_url') }} - - @endif -
--}} - - {{--
- - - @if ($errors->has('database_connection')) - - - {{ $errors->first('database_connection') }} - - @endif -
--}} - - {{--
- - - @if ($errors->has('database_hostname')) - - - {{ $errors->first('database_hostname') }} - - @endif -
--}} - - {{--
- - - @if ($errors->has('database_port')) - - - {{ $errors->first('database_port') }} - - @endif -
--}} - - {{--
- - - @if ($errors->has('database_name')) - - - {{ $errors->first('database_name') }} - - @endif -
--}} - - {{--
- - - @if ($errors->has('database_username')) - - - {{ $errors->first('database_username') }} - - @endif -
--}} - - {{--
- - - @if ($errors->has('database_password')) - - - {{ $errors->first('database_password') }} - - @endif -
--}} - - {{--
- - - @if ($errors->has('mail_driver')) - - - {{ $errors->first('mail_driver') }} - - @endif -
--}} - {{--
- - - @if ($errors->has('mail_host')) - - - {{ $errors->first('mail_host') }} - - @endif -
--}} - {{--
- - - @if ($errors->has('mail_port')) - - - {{ $errors->first('mail_port') }} - - @endif -
--}} - {{--
- - - @if ($errors->has('mail_username')) - - - {{ $errors->first('mail_username') }} - - @endif -
--}} - {{--
- - - @if ($errors->has('mail_password')) - - - {{ $errors->first('mail_password') }} - - @endif -
--}} - {{--
- - - @if ($errors->has('mail_encryption')) - - - {{ $errors->first('mail_encryption') }} - - @endif -
--}} -
+ value="{{ old('database_hostname', 'localhost') }}" required placeholder="{{ trans($entry_key . 'db_host_placeholder') }}"> {{ $errors->has('database_hostname') ? $errors->first('database_hostname') : __('common.error_required', ['name' => trans($entry_key . 'db_host_label')]) }}
@@ -251,7 +61,7 @@ {{ trans($entry_key . 'db_port_label') }} + value="{{ old('database_port', '3306') }}" required placeholder="{{ trans($entry_key . 'db_host_placeholder') }}"> {{ $errors->has('database_port') ? $errors->first('database_port') : __('common.error_required', ['name' => trans($entry_key . 'db_port_label')]) }}
@@ -271,7 +81,7 @@ {{ trans($entry_key . 'db_username_label') }} + value="{{ old('database_username', 'root') }}" required placeholder="{{ trans($entry_key . 'db_username_placeholder') }}"> {{ $errors->has('database_username') ? $errors->first('database_username') : __('common.error_required', ['name' => trans($entry_key . 'db_username_label')]) }}
@@ -281,78 +91,37 @@ {{ trans($entry_key . 'db_password_label') }} + value="{{ old('database_password', '') }}" required placeholder="{{ trans($entry_key . 'db_password_placeholder') }}"> {{ $errors->has('database_password') ? $errors->first('database_password') : __('common.error_required', ['name' => trans($entry_key . 'db_password_label')]) }} - {{--
- - - {{ $errors->has('mail_driver') ? $errors->first('mail_driver') : __('common.error_required', ['name' => trans($entry_key . 'app_tabs.mail_driver_label')]) }} -
- -
- + {{ $errors->has('mail_host') ? $errors->first('mail_host') : __('common.error_required', ['name' => trans($entry_key . 'app_tabs.mail_host_label')]) }} + role="alert">{{ $errors->has('admin_email') ? $errors->first('admin_email') : __('common.error_required', ['name' => trans($entry_key . 'admin_email')]) }}
- + {{ $errors->has('mail_port') ? $errors->first('mail_port') : __('common.error_required', ['name' => trans($entry_key . 'app_tabs.mail_port_label')]) }} + role="alert">{{ $errors->has('admin_password') ? $errors->first('admin_password') : __('common.error_required', ['name' => trans($entry_key . 'admin_password')]) }}
-
- - - {{ $errors->has('mail_username') ? $errors->first('mail_username') : __('common.error_required', ['name' => trans($entry_key . 'app_tabs.mail_username_label')]) }} -
- -
- - - {{ $errors->has('mail_password') ? $errors->first('mail_password') : __('common.error_required', ['name' => trans($entry_key . 'app_tabs.mail_password_label')]) }} -
- -
- - - {{ $errors->has('mail_encryption') ? $errors->first('mail_encryption') : __('common.error_required', ['name' => trans($entry_key . 'app_tabs.mail_encryption_label')]) }} -
--}} -
diff --git a/beike/Installer/Views/finished.blade.php b/beike/Installer/Views/finished.blade.php index 71566399..f835912b 100644 --- a/beike/Installer/Views/finished.blade.php +++ b/beike/Installer/Views/finished.blade.php @@ -6,35 +6,22 @@ @section('title') - {{-- {{ trans('installer::installer_messages.final.title') }} --}} + {{ __('installer::installer_messages.final.title') }} @endsection @section('content')
-

安装结果

- - {{-- @if (session('message')['dbOutputLog']) -

{{ trans('installer::installer_messages.final.migration') }}

- 
{{ session('message')['dbOutputLog'] }}
- @endif - -

{{ trans('installer::installer_messages.final.console') }}

- 
{{ $finalMessages }}
- -

{{ trans('installer::installer_messages.final.log') }}

- 
{{ $finalStatusMessage }}
- -

{{ trans('installer::installer_messages.final.env') }}

- 
{{ $finalEnvFile }}
--}} +

{{ __('installer::installer_messages.final.title') }}

-
恭喜你，系统安装成功，赶快体验吧
+
{{ __('installer::installer_messages.final.finished') }}
- {{ trans('installer::installer_messages.final.exit') }} + {{ trans('installer::installer_messages.final.to_front') }} + {{ trans('installer::installer_messages.final.to_admin') }}
diff --git a/beike/Installer/Views/layouts/master.blade.php b/beike/Installer/Views/layouts/master.blade.php index ec5f384c..e0f5651f 100644 --- a/beike/Installer/Views/layouts/master.blade.php +++ b/beike/Installer/Views/layouts/master.blade.php @@ -15,78 +15,83 @@ - + {{-- --}} + @yield('style') - - -
- @if (session('message')) -

- - @if (is_array(session('message'))) - {{ session('message')['message'] }} - @else - {{ session('message') }} - @endif - -

- @endif - @if (session()->has('errors')) -
- @foreach ($errors->all() as $error) -
{{ $error }}
- @endforeach +
+ - @yield('content') +
+ @if (session('message')) +

+ + @if (is_array(session('message'))) + {{ session('message')['message'] }} + @else + {{ session('message') }} + @endif + +

+ @endif + @if (session()->has('errors')) +
+ @foreach ($errors->all() as $error) +
{{ $error }}
+ @endforeach +
+ @endif + + @yield('content') +
@yield('scripts') diff --git a/beike/Installer/Views/permissions.blade.php b/beike/Installer/Views/permissions.blade.php index 38c2ed61..59f23b54 100644 --- a/beike/Installer/Views/permissions.blade.php +++ b/beike/Installer/Views/permissions.blade.php @@ -11,30 +11,20 @@ @section('content')
-

文件夹权限检测

- {{--
    - @foreach ($permissions['permissions'] as $permission) -
  • - {{ $permission['folder'] }} - - - {{ $permission['permission'] }} - -
    • - @endforeach -
--}} - +

{{ __('installer::installer_messages.permissions.title') }}

- - + + + @foreach ($permissions['permissions'] as $permission) - + +
文件夹状态{{ __('installer::installer_messages.permissions.table') }}{{ __('installer::installer_messages.permissions.next') }}{{ __('installer::installer_messages.status') }}
{{ $permission['folder'] }} {{ $permission['permission'] }}{{ $permission['folder'] }}{{ $permission['permission'] }} diff --git a/beike/Installer/Views/requirements.blade.php b/beike/Installer/Views/requirements.blade.php index bce2d33f..8c1529f8 100644 --- a/beike/Installer/Views/requirements.blade.php +++ b/beike/Installer/Views/requirements.blade.php @@ -11,11 +11,11 @@ @section('content')
-

系统环境检测

+

{{ trans('installer::installer_messages.requirements.title') }}

- - + + @foreach ($requirements['requirements'] as $type => $requirement) @@ -39,27 +39,6 @@ aria-hidden="true"> @endforeach - - {{--
    -
  • - {{ ucfirst($type) }} - @if ($type == 'php') - (version {{ $phpSupportInfo['minimum'] }} required) - - {{ $phpSupportInfo['current'] }} - - - @endif -
    • - @foreach ($requirements['requirements'][$type] as $extention => $enabled) -
  • - {{ $extention }} - -
    • - @endforeach -
--}} @endforeach
环境状态{{ trans('installer::installer_messages.requirements.environment') }}{{ trans('installer::installer_messages.status') }}
diff --git a/beike/Installer/Views/welcome.blade.php b/beike/Installer/Views/welcome.blade.php index 2e60780d..e9d6132e 100644 --- a/beike/Installer/Views/welcome.blade.php +++ b/beike/Installer/Views/welcome.blade.php @@ -10,10 +10,28 @@ @section('content')
-

{{ trans('installer::installer_messages.welcome.message') }}

+
+

{{ __('installer::installer_messages.welcome.title') }}

+
+ + +
    + @foreach ($languages as $key => $language) +
  • {{ $language }}
    • + @endforeach +
+
+
-
欢迎使用安装引导，在后面的步骤中我们将检测您的系统环境和安装条件是否达标，请根据每一步中的提示信息操作，谢谢。
+
{{ __('installer::installer_messages.welcome.describe') }}
+

{{ trans('installer::installer_messages.welcome.next') }} diff --git a/beike/Installer/assets/scss/app.scss b/beike/Installer/assets/scss/app.scss index 5c0b0b08..4baead61 100644 --- a/beike/Installer/assets/scss/app.scss +++ b/beike/Installer/assets/scss/app.scss @@ -3,20 +3,35 @@ $primary: #fd560f; body { - // background-color: #f6f7f8; - background-color: #f3f6f8; - display: flex; - height: 100vh; + .install-box { + background-color: #f3f6f8; + display: flex; + height: 100vh; + margin: auto; - > .aside-wrap { - width: 30%; - background-color: #fff; - padding: 40px 20px 40px 40px; - } + > .aside-wrap { + width: 30%; + background-color: #fff; + padding: 40px 20px 40px 40px; + display: flex; + flex-direction: column; + justify-content: space-between; + } - > .content { - width: 70%; - padding: 40px 60px; + > .content { + width: 70%; + padding: 40px 60px; + + @media (min-width: 1441px) { + width: 60%; + } + } + + .language-switch { + .form-select { + width: auto + } + } } } diff --git a/public/install/css/app.css b/public/install/css/app.css index d57edbd7..99653fbe 100644 --- a/public/install/css/app.css +++ b/public/install/css/app.css @@ -1,17 +1,29 @@ -body { +body .install-box { background-color: #f3f6f8; display: flex; height: 100vh; + margin: auto; } -body > .aside-wrap { +body .install-box > .aside-wrap { width: 30%; background-color: #fff; padding: 40px 20px 40px 40px; + display: flex; + flex-direction: column; + justify-content: space-between; } -body > .content { +body .install-box > .content { width: 70%; padding: 40px 60px; } +@media (min-width: 1441px) { + body .install-box > .content { + width: 60%; + } +} +body .install-box .language-switch .form-select { + width: auto; +} .aside-wrap .logo img { max-width: 180px;