merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bagisto/bagisto into issue4121

This commit is contained in:
mohd asif 2020-10-21 15:45:26 +05:30
parent b8ef29a922 83f84fe171
commit bdc69ded8f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
View File

@ -12,7 +12,7 @@
@else
<link rel="icon" sizes="16x16" href="{{ asset('vendor/webkul/ui/assets/images/favicon.ico') }}" />
@endif
<link rel="stylesheet" href="{{ asset('vendor/webkul/admin/assets/css/admin.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/webkul/ui/assets/css/ui.css') }}">
@ -81,8 +81,8 @@
<div class="adjacent-center">
<div class="brand-logo">
@if (core()->getConfigData('general.design.admin_logo.logo_image'))
<img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
@if (core()->getConfigData('general.design.admin_logo.logo_image', core()->getCurrentChannelCode()))
<img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image', core()->getCurrentChannelCode())) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
@else
<img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
@endif

6
packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
View File

@ -2,8 +2,8 @@
<div class="navbar-top-left">
<div class="brand-logo">
<a href="{{ route('admin.dashboard.index') }}">
@if (core()->getConfigData('general.design.admin_logo.logo_image'))
<img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
@if (core()->getConfigData('general.design.admin_logo.logo_image', core()->getCurrentChannelCode()))
<img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image', core()->getCurrentChannelCode())) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
@else
<img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
@endif
@ -32,7 +32,7 @@
<div class="dropdown-list bottom-right">
<span class="app-version">{{ __('admin::app.layouts.app-version', ['version' => 'v' . config('app.version')]) }}</span>
<div class="dropdown-container">
<label>Account</label>
<ul>

2
public/installer/Classes/Requirement.php
View File

@ -80,7 +80,7 @@ class Requirement {
*
* @var _minPhpVersion
*/
$_minPhpVersion = '7.2.0';
$_minPhpVersion = '7.3.0';
$currentPhpVersion = $this->getPhpVersionInfo();
$supported = false;