Merge Minor into main #113

Manually merged
niggl merged 416 commits from dev into main 2021-03-26 16:34:56 +00:00
2 changed files with 21 additions and 20 deletions
Showing only changes of commit 7ff1d50079 - Show all commits

View File

@ -123,7 +123,7 @@
<div class="col-span-6">
<label
for="track"
class="block text-sm font-medium text-gray-700">Tracks</label>
class="block text-sm font-medium text-gray-700">Track</label>
<select
name="track"
bind:value={track}

View File

@ -9,7 +9,7 @@
);
import store from "../../store";
import ScanStationsEmptyState from "./ScanStationsEmptyState.svelte";
import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte";
import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte";
$: searchvalue = "";
$: active_deletes = [];
let delete_station = {};
@ -80,7 +80,8 @@ import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte";
<div class="text-sm font-medium text-gray-900">
<a
href="../tracks"
class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800"> {s.track.name || s.track.distance + "m"}</a>
class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">
{s.track.name || s.track.distance + 'm'}</a>
</div>
</div>
</div>