dev merge #163

Merged
sora merged 29 commits from dev into master 2025-03-05 00:11:12 +01:00
Showing only changes of commit f735e20d4e - Show all commits

View File

@ -1,34 +1,45 @@
.scroll-handler.row( .row
@mouseleave="nav_mouseleave" .mr-auto.col-auto
@mousemove="nav_mousemove") .list-group.text-dark
.list-group-item.bg-white.rounded(v-on:click.prevent="journey.leg_prev(); focus_leg();")
.col-3.col-sm-2.col-md-1
.list-group.text-dark.h-100
.fleft.list-group-item.bg-white.text-small.rounded.h-100(v-on:click.prevent="journey.leg_prev()")
i.fas.fa-angle-left i.fas.fa-angle-left
.col-6.col-sm-8.col-md-10 .col-8.col-sm-8.col-md-10.scroll-handler(
@pointerleave="nav_mouseleave"
@pointermove="nav_mousemove")
draggable.scroll-content.list-group.bg-dark( draggable.scroll-content.list-group.bg-dark(
tag="div", tag="div",
:list="journey.data.main", :list="journey.data.main",
handle=".handle" handle=".handle"
) )
.list-group-item.bg-white.text-white.show.placeholder-left(
:class="journey.sel_leg >0? '': 'bg-dark'"
slot="header"
)
.text {{'⋅'}}
.list-group-item.handle.text-dark( .list-group-item.handle.text-dark(
v-for="(element, idx) in journey.data.main", v-for="(element, idx) in journey.data.main",
:key="idx", :key="idx",
@click="journey.leg_sel(idx)", @click="journey.leg_sel(idx)",
:class="journey.sel_leg == idx ? 'bg-primary' : 'bg-white'" :class="journey.sel_leg == idx ? 'bg-primary active' : 'bg-white'"
) )
.text {{ element.title || "Leg "+idx}} .text {{ element.title || "Leg "+idx}}
i.fa.fa-times.close.fright( i.fa.fa-times.text-small.fright(
style="top: 2px; right: 2px; position: absolute", style="top: 2px; right: 2px; position: absolute",
@click="journey.rm_leg(idx)" @click="journey.rm_leg(idx); focus_leg();"
) )
.list-group-item.bg-dark .list-group-item.bg-white.text-white.show.placeholder-right(
.list-group-item.bg-white.text-dark(@click="journey.add_leg()") :class="journey.sel_leg < journey.data.main.length-1? '': 'bg-dark'"
slot="footer"
)
.text {{'⋅'}}
.list-group-item.bg-white.text-dark.add(@click="journey.add_leg(); focus_leg();"
slot="footer"
:class="journey.sel_leg >= journey.data.main.length-1? 'show': ''")
div div
i.fa.fa-plus.add() i.fa.fa-plus()
.col-3.col-sm-2.col-md-1 .ml-auto.col-auto
.list-group.text-dark.h-100 .list-group.text-dark
a.fright.list-group-item.bg-white.text-small.rounded.h-100(v-on:click.prevent="journey.leg_next()") .list-group-item.bg-white.rounded(v-on:click.prevent="journey.leg_next(); focus_leg();")
i.fas.fa-angle-right i.fas.fa-angle-right