diff --git a/compass/app/Http/Controllers/Controller.php b/compass/app/Http/Controllers/Controller.php index dff6b3a..14f9612 100644 --- a/compass/app/Http/Controllers/Controller.php +++ b/compass/app/Http/Controllers/Controller.php @@ -91,6 +91,9 @@ class Controller extends BaseController return view('map', [ 'displayURL' => self::displayURL(), 'database' => $db, + 'menu' => [ + '/settings/'.$name => 'Settings' + ] ]); } @@ -115,7 +118,10 @@ class Controller extends BaseController return view('settings', [ 'displayURL' => self::displayURL(), 'database' => $db, - 'users' => $users + 'users' => $users, + 'menu' => [ + '/map/'.$name => 'Map' + ] ]); } diff --git a/compass/public/assets/map.css b/compass/public/assets/map.css index 5b08fbe..0a8da41 100644 --- a/compass/public/assets/map.css +++ b/compass/public/assets/map.css @@ -9,9 +9,9 @@ html, body { #calendar { z-index: 100; width: 200px; - height: calc(100% - 180px); + height: calc(100% - 240px); position: absolute; - top: 10px; + top: 60px; right: 10px; border: 3px #888 solid; background: white; diff --git a/compass/public/assets/styles.css b/compass/public/assets/styles.css index c010fb6..2912b7a 100644 --- a/compass/public/assets/styles.css +++ b/compass/public/assets/styles.css @@ -19,24 +19,6 @@ } -.corner-logo { - position: absolute; - z-index: 2000; - top: 6px; - left: 20px; -} -.logged-in { - position: absolute; - z-index: 2000; - top: 6px; - right: 20px; - font-size: 80%; - padding: 4px 16px; -} -.logged-in .logout { - margin-left: 16px; -} - .dashboard { max-width: 500px; diff --git a/compass/resources/views/index.blade.php b/compass/resources/views/index.blade.php index 0454628..96b3afa 100644 --- a/compass/resources/views/index.blade.php +++ b/compass/resources/views/index.blade.php @@ -6,13 +6,13 @@
-