diff --git a/public/css/app.css b/public/css/app.css index 3c15425..5424ef7 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1,19 +1,11 @@ -:root { - --dark: #020202; - --light: #fffff0; -} - /* * Typography */ body { - /*font-family: Verdana, Arial, sans-serif;*/ + font-family: Verdana, Arial, sans-serif; font-size: 16px; margin: 0; - color: var(--dark, #020202); - background-color: var(--light, #fffff0); - font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif; } .page-title { @@ -44,15 +36,6 @@ details h2 { font-size: 0.8em; } -#allCheckinsLink { - opacity: 0.7; - color: var(--dark, #020202); -} - -#allCheckinsLink:hover { - opacity: 1; -} - /* * Layout */ @@ -61,6 +44,7 @@ body { border: 5px solid black; box-sizing: border-box; height: 100vh; +/* overflow: hidden;*/ display: grid; grid-template-rows: auto 1fr; grid-template-columns: 100%; @@ -71,8 +55,8 @@ body { .page-header { grid-area: header; + background-color: #a4ecfc; border-bottom: 5px solid black; - padding-top: 1em; } .other-links { @@ -89,9 +73,10 @@ body { } .other-links li { + background-color: #5adefc; float: left; margin-left: 1.5em; - border: 2px solid var(--dark); + border: 2px solid white; border-radius: 1em; } @@ -100,7 +85,7 @@ body { } .other-links li:hover { - background-color: #ddddd2; + background-color: #2389a0; } .other-links li p { @@ -109,7 +94,7 @@ body { } .other-links li p a { - color: var(--dark, #020202); + color: #fff; font-weight: bold; text-decoration: none; } @@ -200,8 +185,6 @@ body { max-height: 45vh; margin-top: 1em; display: block; - background-color: white; - border: 2px solid var(--dark, #020202); } /* diff --git a/resources/views/no-trip.blade.php b/resources/views/no-trip.blade.php index 54dc420..decb9aa 100644 --- a/resources/views/no-trip.blade.php +++ b/resources/views/no-trip.blade.php @@ -1,6 +1,19 @@ - @include('partials.head') + + + + + Tracking | Ben Goldsworthy + + + + + diff --git a/resources/views/partials/head.blade.php b/resources/views/partials/head.blade.php deleted file mode 100644 index 449b354..0000000 --- a/resources/views/partials/head.blade.php +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Tracking | Ben Goldsworthy - - - - - diff --git a/resources/views/past-trips.blade.php b/resources/views/past-trips.blade.php index 30cc7fe..15a7609 100644 --- a/resources/views/past-trips.blade.php +++ b/resources/views/past-trips.blade.php @@ -1,6 +1,19 @@ - @include('partials.head'); + + + + + Tracking | Ben Goldsworthy + + + + +
diff --git a/resources/views/tracker.blade.php b/resources/views/tracker.blade.php index b449551..b27577e 100644 --- a/resources/views/tracker.blade.php +++ b/resources/views/tracker.blade.php @@ -1,6 +1,19 @@ - @include('partials.head') + + + + + Tracking | Ben Goldsworthy + + + + +
@@ -77,16 +90,13 @@ @foreach($trip->locations as $location) [{{ $location->latitude }}, {{ $location->longitude }}], @endforeach - ], { - color: '#3d3d3d' - }).addTo(map); + ]).addTo(map); /* * Populate all the checkins and popup texts. */ var checkinMarkers = []; var marker = null, popupMarkup = null; - L.Icon.Default.imagePath = "https://track.bengoldsworthy.net/images/"; @foreach($trip->checkins as $checkin) marker = L.marker([{{ $checkin->location->latitude }}, {{ $checkin->location->longitude }}]).addTo(map); @@ -122,15 +132,13 @@ * TODO: Revisit once fixed with other popups. */ var currLocationMarker = L.icon({ - iconUrl: 'images/current-location-icon.png', + iconUrl: 'current-location-icon.png', iconSize: [30, 45], }); var currLocation = L.marker( - [{{ end($trip->locations)->latitude }}, {{ end($trip->locations)->longitude }}], - { - icon: currLocationMarker - } + [{{ end($trip->locations)->latitude }}, {{ end($trip->locations)->longitude }}], + {icon: currLocationMarker} ).addTo(map).setZIndexOffset(1000); currLocation.bindPopup('

Current location

').openPopup();