Skip to content

Commit 9b8ecf4

Browse files
committed
Merge branch 'devel'
2 parents e14ada5 + bed53f3 commit 9b8ecf4

8 files changed

+1399
-1765
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 CoreUI
3+
Copyright (c) 2020 CoreUI
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

package-lock.json

+1,382-1,752
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-laravel-admin-template",
3-
"version": "1.0.5",
3+
"version": "2.0.1",
44
"description": "CoreUI Free Laravel Bootstrap Admin Template",
55
"keywords": [
66
"admin",

resources/views/dashboard/authBase.blade.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<!DOCTYPE html>
22
<!--
3-
* CoreUI - Free Bootstrap Admin Template
4-
* @version v3.0.0-alpha.1
3+
* CoreUI Free Laravel Bootstrap Admin Template
4+
* @version v2.0.1
55
* @link https://coreui.io
6-
* Copyright (c) 2019 creativeLabs Łukasz Holeczek
6+
* Copyright (c) 2020 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
88
-->
99

resources/views/dashboard/base.blade.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<!DOCTYPE html>
22
<!--
3-
* CoreUI - Free Bootstrap Admin Template
4-
* @version v3.0.0-alpha.1
3+
* CoreUI Free Laravel Bootstrap Admin Template
4+
* @version v2.0.1
55
* @link https://coreui.io
6-
* Copyright (c) 2019 creativeLabs Łukasz Holeczek
6+
* Copyright (c) 2020 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
88
-->
99

resources/views/dashboard/errorBase.blade.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<!DOCTYPE html>
22
<!--
3-
* CoreUI - Free Bootstrap Admin Template
4-
* @version v3.0.0-alpha.1
3+
* CoreUI Free Laravel Bootstrap Admin Template
4+
* @version v2.0.1
55
* @link https://coreui.io
6-
* Copyright (c) 2019 creativeLabs Łukasz Holeczek
6+
* Copyright (c) 2020 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
88
-->
99

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<footer class="c-footer">
2-
<div><a href="https://coreui.io">CoreUI</a> &copy; 2019 creativeLabs.</div>
2+
<div><a href="https://coreui.io">CoreUI</a> &copy; 2020 creativeLabs.</div>
33
<div class="ml-auto">Powered by&nbsp;<a href="https://coreui.io/">CoreUI</a></div>
44
</footer>

resources/views/dashboard/shared/nav-builder.blade.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ function renderDropdown($data){
3030
}
3131
?>
3232

33-
<div class="c-sidebar-brand"><img class="c-sidebar-brand-full" src="{{ url('/assets/brand/coreui-base-white.svg') }}" width="118" height="46" alt="CoreUI Logo"><img class="c-sidebar-brand-minimized" src="assets/brand/coreui-signet-white.svg" width="118" height="46" alt="CoreUI Logo"></div>
33+
34+
<div class="c-sidebar-brand">
35+
<img class="c-sidebar-brand-full" src="{{ url('/assets/brand/coreui-base-white.svg') }}" width="118" height="46" alt="CoreUI Logo">
36+
<img class="c-sidebar-brand-minimized" src="{{ url('assets/brand/coreui-signet-white.svg') }}" width="118" height="46" alt="CoreUI Logo">
37+
</div>
3438
<ul class="c-sidebar-nav">
3539
@if(isset($appMenus['sidebar menu']))
3640
@foreach($appMenus['sidebar menu'] as $menuel)

0 commit comments

Comments
 (0)