From bd04ac097a0a29ba7c48a5f4a46d99ae7d86eea1 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Mon, 16 Jul 2018 18:55:47 +0200
Subject: Added bottom navbar
---
resources/assets/js/app.js | 1 +
resources/assets/sass/app.scss | 30 ++++++++++++++---
resources/views/layouts/app.blade.php | 62 +++++------------------------------
3 files changed, 35 insertions(+), 58 deletions(-)
(limited to 'resources')
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 @@
-
-
@yield('content')