admin/hermione-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://dev.azure.com/olympusai/Olympus/_git/hermione-fe into develop

Browse Source
This commit is contained in:
Florinda
2024-12-04 15:12:52 +01:00
parent 9f2c8d39a0 e056337adc
commit 9e19c57243
15 changed files with 227 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/layout/AppTopbar.vue
View File

@@ -86,17 +86,17 @@ watch(() => userPrefStore.getSelApp, appUpdated, { immediate: true });
<div class="layout-config-menu">
<div v-if="loadingStore.isLoading">
<!--<ProgressSpinner v-if="loadingStore.loadingType=='data'" style="width: 25px; height: 25px; margin-top: 6px" strokeWidth="2" fill="transparent"/>-->
<JellyfishLoader v-if="loadingStore.loadingType=='ai'" scale="0.5" style="width: 25px; height: 10px; margin-right: 25px; margin-top:-5px" />
<RiseLoader v-if="loadingStore.loadingType=='data'" style="scale: 0.5; height: 10px; margin-top:5px"/>
<JellyfishLoader v-if="loadingStore.loadingType=='ai'" scale="0.5" color="#a100ff" style="width: 25px; height: 10px; margin-right: 25px; margin-top:-5px"/>
<RiseLoader v-if="loadingStore.loadingType=='data'" color="#a100ff" style="scale: 0.5; height: 10px; margin-top:5px"/>
</div>
<button @click="router.push('/mdcanvas')" class="layout-topbar-action" >
<!-- <button @click="router.push('/mdcanvas')" class="layout-topbar-action" >
<i class="pi pi-pencil"></i>
</button >
</button > -->
<div class="relative">
<!----> <button
<!-- <div class="relative">
<button
v-styleclass="{ selector: '@next', enterFromClass: 'hidden', enterActiveClass: 'animate-scalein', leaveToClass: 'hidden', leaveActiveClass: 'animate-fadeout', hideOnOutsideClick: true }"
type="button"
class="layout-topbar-action layout-topbar-action-highlight"
@@ -104,7 +104,7 @@ watch(() => userPrefStore.getSelApp, appUpdated, { immediate: true });
<i class="pi pi-palette"></i>
</button>
<AppConfigurator />
</div>
</div> -->