Merge branch 'master' of github.com:HE-Arc/PandaMD

HE-Arc · Dec 19, 2018 · c0aec7a · c0aec7a
2 parents 77e2193 + 8977eed
commit c0aec7a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -56,10 +56,6 @@
                                 <button type="submit" class="btn btn-primary">
                                     {{ __('Login') }}
                                 </button>
-
-                                <a class="btn btn-link" href="{{ route('password.request') }}">
-                                    {{ __('Forgot Your Password?') }}
-                                </a>
                             </div>
                         </div>
                     </form>

diff --git a/resources/views/home/index.blade.php b/resources/views/home/index.blade.php
@@ -8,9 +8,9 @@
         <div class="card-group">
             <div class="col-sm">
                 <div class="card bg-light">
+                    <h5 class="card-header bg-dark text-white">Convert markdown to PDF</h5>
                     <img class="card-img-top" src="{{asset('images/MD_TO_PDF.png')}}">
                     <div class="card-body">
-                        <h5 class="card-title">Convert markdown to PDF</h5>
                         <p class="card-text">
                             Convert your markdown files to PDF without installing anything. Just upload your file,
                             select the options you want and let our server run pandoc for you.
@@ -21,9 +21,9 @@
             </div>
             <div class="col-sm">
                 <div class="card bg-light">
+                    <h5 class="card-header bg-dark text-white">Write, save and edit online</h5>
                     <img class="card-img-top" src="{{asset('images/edit_demo2.png')}}">
                     <div class="card-body">
-                        <h5 class="card-title">Write, save and edit online</h5>
                         <p class="card-text">
                             Our built-in editor allows you to take notes directly on
                             our website, and access them from anywhere.
@@ -33,9 +33,9 @@
             </div>
             <div class="col-sm">
                 <div class="card bg-light">
+                    <h5 class="card-header bg-dark text-white">Share your notes</h5>
                     <img class="card-img-top" src="{{asset('images/share_1.png')}}">
                     <div class="card-body">
-                        <h5 class="card-title">Share your notes</h5>
                         <p class="card-text">
                             Thanks to our file system, you can share your notes exactly
                             the way you like: keep them private, allow read only or full edition.

diff --git a/resources/views/layout/app.blade.php b/resources/views/layout/app.blade.php
@@ -39,7 +39,7 @@
             </li>
             <li class="nav-item">
                 <a class="nav-link {{{ (Request::is('folders/*') ? 'active' : '') }}}"
-                   href="{{route('folders.index')}}"><i class="fal fa-folder fa-fw"></i> Folder</a>
+                   href="{{route('folders.index')}}"><i class="fal fa-folder fa-fw"></i> Folders</a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" href="{{route('newFile')}}"><i class="fal fa-pencil fa-fw"></i> Create</a>