solving conflicts

telosnetwork · Jan 8, 2024 · e1b9881 · e1b9881
2 parents bde97d8 + 6c14bcb
commit e1b9881
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/antelope/config/AntelopeConfig.ts b/src/antelope/config/AntelopeConfig.ts
@@ -277,4 +277,3 @@ export class AntelopeConfig {
     }
 
 }
-
diff --git a/src/antelope/index.ts b/src/antelope/index.ts
@@ -3,7 +3,7 @@ import { App, toRaw } from 'vue';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { Store } from 'pinia';
 
-import { AntelopeConfig, AntelopeDebug, chainNetworkNames } from 'src/antelope/config/';
+import { AntelopeConfig, AntelopeDebug, chainNetworkNames } from 'src/antelope/config';
 import installPinia from 'src/antelope/stores';
 
 import { AccountModel } from 'src/antelope/stores/account';

diff --git a/src/boot/antelope.ts b/src/boot/antelope.ts
@@ -100,7 +100,8 @@ export default boot(({ app }) => {
     ant.config.debug.allowDebugMode(
         process.env.NODE_ENV !== 'production' ||
         document.location.hostname === 'localhost' ||
-        document.location.hostname.includes('netlify'),
+        document.location.hostname.includes('netlify') ||
+        true, // this is temporal for the demo
     );
 
     // Finally, we check if the url has the network parameter and if so, we connect to that network

diff --git a/src/pages/home/HomePage.vue b/src/pages/home/HomePage.vue
@@ -41,11 +41,11 @@ onMounted(() => {
     <q-page-container class="c-home__page-container">
         <div class="c-home">
             <div class="c-home__container">
-                <img
+                <div class="c-home__logo-container"><img
                     src="branding/telos-wallet-light.png"
                     :alt="$t('home.wallet_logo_alt')"
                     class="c-home__logo"
-                >
+                ></div>
                 <div class="c-home__button-container">
                     <div v-if="showLoginBtns" class="c-home__network-toggle-container" role="tablist">
                         <button
@@ -154,11 +154,16 @@ onMounted(() => {
         justify-content: space-between;
     }
 
+    &__logo-container {
+        flex-grow: 1;
+        align-self: center;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-evenly;
+    }
+
     &__logo {
         width: 220px;
-        align-self: center;
-        margin-top: 10rem;
-        margin-bottom: 10rem;
     }
 
     &__button-container {