Merge branch 'master' of https://github.com/creativetimofficial/black-dashboard-laravel

Author: AndreiDecuseara

changelog.md

@@ -19,4 +19,8 @@ All notable changes to `Black Dashboard` frontend preset for Laravel will be doc
 ## Version 1.0.4 - 2019-09-23
 
   - Update to Laravel 6.x
+  
+## Version 1.0.5 - 2020-03-18
+
+  - Update to Laravel 7.x
 

readme.md

@@ -67,7 +67,7 @@ You can access the dashboard either by using the "**Dashboard**" link in the lef
 
 You have the option to edit the current logged in user's profile (change name, email and password). To access this page just click the "**User profile**" link in the left sidebar or by adding **/profile** in the url.
 
-The `App\Htttp\Controlers\ProfileController` handles the update of the user information. 
+The `App\Http\Controllers\ProfileController` handles the update of the user information. 
 
 ```
 public function update(ProfileRequest $request)

src/black-stubs/resources/views/layouts/navbars/navs/auth.blade.php

@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-lg navbar-absolute navbar-transparent">
     <div class="container-fluid">
-        <div class="navbar-wrapper">
+        <div class="navbar-wrapper d-none">
             <div class="navbar-toggle d-inline">
                 <button type="button" class="navbar-toggler">
                     <span class="navbar-toggler-bar bar1"></span>

src/black-stubs/resources/views/users/index.blade.php

@@ -130,7 +130,7 @@
                                                 <p>{{ _('RTL Support') }}</p>
                                             </a>
                                         </li>
-                                        <li>
+                                        <li class=" {{ $pageSlug == 'upgrade' ? 'active' : '' }} bg-info">
                                             <a href="{{ route('pages.upgrade') }}">
                                                 <i class="tim-icons icon-spaceship"></i>
                                                 <p>{{ _('Upgrade to PRO') }}</p>
@@ -528,4 +528,4 @@
     <img height="1" width="1" style="display:none" src="https://www.facebook.com/tr?id=111649226022273&ev=PageView&noscript=1" />
     </noscript>
 </body>
-</html>
+</html>