deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to Laravel 5.8 and AdminLTE3

Browse Source
This commit is contained in:
Deon George
2019-06-02 15:35:48 +10:00
parent 5a036cdc64
commit 41d6a07196
135 changed files with 20724 additions and 103787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
resources/theme/frontend/metronic/layouts/partials/htmlheader.blade.php
View File

@@ -1,13 +1,11 @@
<head>
<meta charset="UTF-8">
<title>{{ config('app.name') }} - {{ $so->site_name }}</title>
<meta content="width=device-width, initial-scale=1.0" name="viewport" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>{{ config('app.name') }} - @yield('htmlheader_title', 'Your title here')</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta property="og:site_name" content="{{ config('app.name') }}" />
<meta property="og:title" content="{{ $so->site_name }}" />
<meta property="og:description" content="{{ $so->site_description }}" />
@@ -17,22 +15,21 @@
<link rel="shortcut icon" href="{{ object_get($so,'favicon','favicon.ico') }}" />
{{-- Fonts START --}}
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|PT+Sans+Narrow|Source+Sans+Pro:200,300,400,600,700,900&amp;subset=all" rel="stylesheet" type="text/css">
{{-- Fonts END --}}
@css('/assets/font-awesome/css/font-awesome.min.css')
@css('/site/js/bootstrap/3.3.5/css/bootstrap.min.css')
{{-- Theme styles START --}}
<!-- Font Awesome Icons -->
@css('/plugin/font-awesome/css/font-awesome.min.css','font-awesome','app')
<!-- Theme style -->
@css('/site/css/components.css')
@css('/site/css/slider.css')
@css('/site/css/style.css')
@css('/site/css/style-responsive.css')
@css('/site/css/themes/blue.css')
@css('/site/css/custom.css')
{{-- Theme styles END --}}
<!-- Google Font: Source Sans Pro -->
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|PT+Sans+Narrow|Source+Sans+Pro:200,300,400,600,700,900&amp;subset=all" rel="stylesheet" type="text/css">
@css('/site/js/bootstrap/3.3.5/css/bootstrap.min.css')
{{-- Styles --}}
<!-- STYLESHEETS -->
{!! Asset::styles() !!}
</head>

4
resources/theme/frontend/metronic/layouts/partials/mainheader.blade.php
View File

@@ -62,8 +62,8 @@
<div class="input-group">
<input type="text" placeholder="Search" class="form-control">
<span class="input-group-btn">
<button class="btn btn-primary" type="submit">Search</button>
</span>
<button class="btn btn-primary" type="submit">Search</button>
</span>
</div>
</form>
</div>

12
resources/theme/frontend/metronic/layouts/partials/scripts.blade.php
View File

@@ -1,2 +1,10 @@
<!-- Compiled app javascript -->
{{-- <script src="{{ url (mix('/js/app.js')) }}"></script> --}}
<!-- REQUIRED JS SCRIPTS -->
<script type="text/javascript">
// Our CSRF token to each interaction
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
}
});
</script>