Merge remote-tracking branch 'origin/modular' into modular
# Conflicts: # src/utils/productAssets.ts # src/views/base/products/components/ProductItem.vue # src/views/base/transactions/DefaultTransactionsPage.vue
This commit is contained in:
@@ -7,7 +7,8 @@
|
||||
</template>
|
||||
</MobilePageHeader>
|
||||
|
||||
<div ref="el" :class="loading ? 'h-screen' : ''" class="px-3 mpage-content pb-10">
|
||||
<!-- <div ref="el" :class="loading ? 'h-screen' : ''" class="px-3 mpage-content pb-10">-->
|
||||
<div ref="el" class="transactions-page-body px-3 pt-16">
|
||||
<list-anim v-if="!loading">
|
||||
<Item v-for="item in items" :key="item.id" :item="item" />
|
||||
<div :ref="bindMobileObserver" v-show="!loading" class="w-full opacity-0 relative">
|
||||
|
||||
@@ -35,7 +35,7 @@ useTransactionsPageProvider({ boursecu: isBoursecu })
|
||||
|
||||
<style scoped>
|
||||
.transactions-page-root {
|
||||
min-height: 100%;
|
||||
min-height: 0;
|
||||
height: 100%;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user