forked from potsda.mn/mobilizon
Merge branch 'update-number-of-events-on-explore' into 'master'
Make the number of events fit the page on Explore Closes #809 et #826 See merge request framasoft/mobilizon!1031
This commit is contained in:
commit
993a27b93c
|
@ -62,14 +62,21 @@
|
|||
<b-loading :active.sync="$apollo.loading" />
|
||||
</p>
|
||||
<b-loading :active.sync="$apollo.loading" />
|
||||
<div v-if="this.events.total > 0" class="columns is-multiline">
|
||||
<div
|
||||
class="column is-one-third-desktop"
|
||||
v-for="event in this.events.elements.slice(0, 6)"
|
||||
:key="event.uuid"
|
||||
>
|
||||
<EventCard :event="event" />
|
||||
<div v-if="this.events.total > 0">
|
||||
<div class="columns is-multiline">
|
||||
<div
|
||||
class="column is-one-third-desktop"
|
||||
v-for="event in this.events.elements.slice(0, 6)"
|
||||
:key="event.uuid"
|
||||
>
|
||||
<EventCard :event="event" />
|
||||
</div>
|
||||
</div>
|
||||
<span class="view-all">
|
||||
<router-link :to="{ name: RouteName.SEARCH }"
|
||||
>{{ $t("View everything") }} >></router-link
|
||||
>
|
||||
</span>
|
||||
</div>
|
||||
<b-message v-else type="is-danger">{{
|
||||
$t("No events found")
|
||||
|
@ -308,14 +315,21 @@
|
|||
<b-loading :active.sync="$apollo.loading" />
|
||||
</p>
|
||||
|
||||
<div v-if="this.events.total > 0" class="columns is-multiline">
|
||||
<div
|
||||
class="column is-one-third-desktop"
|
||||
v-for="event in this.events.elements.slice(0, 6)"
|
||||
:key="event.uuid"
|
||||
>
|
||||
<recent-event-card-wrapper :event="event" />
|
||||
<div v-if="this.events.total > 0">
|
||||
<div class="columns is-multiline">
|
||||
<div
|
||||
class="column is-one-third-desktop"
|
||||
v-for="event in this.events.elements.slice(0, 6)"
|
||||
:key="event.uuid"
|
||||
>
|
||||
<recent-event-card-wrapper :event="event" />
|
||||
</div>
|
||||
</div>
|
||||
<span class="view-all">
|
||||
<router-link :to="{ name: RouteName.SEARCH }"
|
||||
>{{ $t("View everything") }} >></router-link
|
||||
>
|
||||
</span>
|
||||
</div>
|
||||
<b-message v-else type="is-danger"
|
||||
>{{ $t("No events found") }}<br />
|
||||
|
@ -635,7 +649,7 @@ main > div > .container {
|
|||
}
|
||||
|
||||
.columns {
|
||||
margin: 1rem auto 3rem;
|
||||
margin: 1rem auto 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -212,9 +212,9 @@ interface ISearchTimeOption {
|
|||
end?: Date | null;
|
||||
}
|
||||
|
||||
const EVENT_PAGE_LIMIT = 10;
|
||||
const EVENT_PAGE_LIMIT = 12;
|
||||
|
||||
const GROUP_PAGE_LIMIT = 10;
|
||||
const GROUP_PAGE_LIMIT = 12;
|
||||
|
||||
const DEFAULT_RADIUS = 25; // value to set if radius is null but location set
|
||||
|
||||
|
|
Loading…
Reference in a new issue