Skip to content

Commit

Permalink
Merge branch 'develop' into feature/174_oe_loader_support_text
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/components/dumb/OeLoader.vue
  • Loading branch information
wouter-adriaens committed Nov 22, 2023
2 parents 1df7c30 + 567d60b commit cc8b7eb
Showing 1 changed file with 25 additions and 23 deletions.
48 changes: 25 additions & 23 deletions src/components/dumb/OeLoader.vue
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
<template>
<DefineTemplate>
<div
class="spinner-content"
:class="{
'spinner-content--inline': props.modInline,
'spinner-content--small': props.modInline && props.modSmall,
'spinner-content--large': props.modInline && props.modLarge,
'spinner-content--xlarge': props.modInline && props.modXLarge,
}"
>
<font-awesome-icon class="spinner" :icon="['fas', 'spinner']" spin-pulse />
</div>
</DefineTemplate>

<ReuseTemplate v-if="props.modInline" />

<div v-else class="spinner-container">
<div class="spinner-overlay">
<ReuseTemplate />
<div v-if="props.title" class="title">
{{ props.title }}
<div v-if="props.subTitle" class="title__sub">
{{ props.subTitle }}
<div>
<DefineTemplate>
<div
class="spinner-content"
:class="{
'spinner-content--inline': props.modInline,
'spinner-content--small': props.modInline && props.modSmall,
'spinner-content--large': props.modInline && props.modLarge,
'spinner-content--xlarge': props.modInline && props.modXLarge,
}"
>
<font-awesome-icon class="spinner" :icon="['fas', 'spinner']" spin-pulse />
</div>
</DefineTemplate>

<ReuseTemplate v-if="props.modInline" />

<div v-else class="spinner-container">
<div class="spinner-overlay">
<ReuseTemplate />
<div v-if="props.title" class="title">
{{ props.title }}
<div v-if="props.subTitle" class="title__sub">
{{ props.subTitle }}
</div>
</div>
</div>
</div>
Expand Down

0 comments on commit cc8b7eb

Please sign in to comment.