aboutsummaryrefslogtreecommitdiffhomepage
path: root/resources
diff options
context:
space:
mode:
authorMarvin Borner2018-07-16 18:55:47 +0200
committerMarvin Borner2018-07-16 18:55:47 +0200
commitbd04ac097a0a29ba7c48a5f4a46d99ae7d86eea1 (patch)
tree7c9ebae2ddaab3c49d49be1641cc2fd98967a559 /resources
parent85deb97977ac700a94210b93dd1f85e3b15ff9b5 (diff)
Added bottom navbar
Diffstat (limited to 'resources')
-rwxr-xr-xresources/assets/js/app.js1
-rwxr-xr-xresources/assets/sass/app.scss30
-rwxr-xr-xresources/views/layouts/app.blade.php62
3 files changed, 35 insertions, 58 deletions
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 7a42989..7cb052d 100755
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -7,6 +7,7 @@
window.openpgp = require('openpgp');
window.Vue = require('vue');
require('./bootstrap');
+require('@fortawesome/fontawesome-free/js/all');
require('./setup');
require('./profile');
require('./chat'); \ No newline at end of file
diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
index bd5e1a5..ad83043 100755
--- a/resources/assets/sass/app.scss
+++ b/resources/assets/sass/app.scss
@@ -1,20 +1,42 @@
// Fonts
@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
-
// Variables
@import "variables";
-
// Bootstrap
@import "~bootstrap/scss/bootstrap";
-
// Chat
@import "chat";
.navbar-laravel {
- background-color: #fff;
+ margin: 0;
+ padding: 0;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
}
+.navbar.fixed-bottom {
+ width: 100%;
+ background-color: #555;
+ overflow: auto;
+}
+
+.navbar.fixed-bottom .navbar-icon {
+ float: left;
+ width: 20%;
+ text-align: center;
+ padding: 12px 0;
+ transition: all 0.3s ease;
+ color: white;
+ font-size: 36px;
+}
+
+.navbar.fixed-bottom a:hover {
+ background-color: #000;
+}
+
+.active {
+ background-color: #4CAF50 !important;
+}
+
.alert {
display: none;
} \ No newline at end of file
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 2d8b36c..af1be47 100755
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -27,65 +27,19 @@
<body>
<div id="app">
- <nav class="navbar navbar-expand-md navbar-light navbar-laravel">
- <div class="container">
- <a class="navbar-brand" href="{{ url('/') }}">
- {{ config('app.name', 'Laravel') }}
- </a>
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
- aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
- <span class="navbar-toggler-icon"></span>
- </button>
-
- <div class="collapse navbar-collapse" id="navbarSupportedContent">
- <!-- Left Side Of Navbar -->
- <ul class="navbar-nav mr-auto">
-
- </ul>
-
- <!-- Right Side Of Navbar -->
- <ul class="navbar-nav ml-auto">
- <!-- Authentication Links -->
- @guest
- <li class="nav-item">
- <a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
- </li>
- <li class="nav-item">
- <a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
- </li>
- @else
- <li class="nav-item dropdown">
- <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true"
- aria-expanded="false" v-pre>
- {{ Auth::user()->name }}
- <span class="caret"></span>
- </a>
-
- <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
- <a class="dropdown-item" href="/profile">
- User Profile
- </a>
- <a class="dropdown-item" href="{{ route('logout') }}" onclick="event.preventDefault();
- document.getElementById('logout-form').submit();">
- {{ __('Logout') }}
- </a>
-
- <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
- @csrf
- </form>
- </div>
- </li>
- @endguest
- </ul>
- </div>
- </div>
- </nav>
-
<main class="py-4">
@yield('content')
</main>
</div>
+ <nav class="navbar fixed-bottom navbar-expand-md navbar-light navbar-laravel">
+ <span class="navbar-icon active"><i class="fas fa-home"></i></span>
+ <span class="navbar-icon"><i class="fas fa-search"></i></span>
+ <span class="navbar-icon"><i class="far fa-comments"></i></span>
+ <span class="navbar-icon"><i class="far fa-heart"></i></span>
+ <span class="navbar-icon"><i class="far fa-user"></i></span>
+ </nav>
+
{{ csrf_field() }}
<script>