Merge branch 'develop' into release

MindTooth · Dec 4, 2023 · 1375ba0 · 1375ba0
2 parents 27f939c + 9700fa7
commit 1375ba0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/src/components/atoms/ProgressBar.vue b/src/components/atoms/ProgressBar.vue
@@ -57,9 +57,9 @@ export default class ProgressBar extends Vue {
 
   &.infinite::after {
     background-color: var(--color-primary-button);
-    animation: leftToRight 3s ease-in-out infinite;
+    animation: leftToRight2 3s ease-in-out infinite;
 
-    @keyframes leftToRight {
+    @keyframes leftToRight2 {
       0% {
         opacity: .8;
         left: -100%;

diff --git a/src/core/context/menus/instanceMenu.ts b/src/core/context/menus/instanceMenu.ts
@@ -29,7 +29,6 @@ let folderOptions: MenuItem<InstanceMenuContext>[] = []
 folderOptions.push({
   title: 'Instance folder',
   async action(context) {
-    console.log(context)
     await platform.get.io.openFinder(context.instance.path);
   },
 })

diff --git a/src/views/Home.vue b/src/views/Home.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="home page-spacing">    
+  <div class="home page-spacing">
     <template v-if="recentInstances.length">
       <h2 class="text-lg font-bold text-white mb-4">Jump back in where you left off</h2>
 

diff --git a/src/views/Settings/InstanceSettings.vue b/src/views/Settings/InstanceSettings.vue
@@ -252,7 +252,6 @@ export default class InstanceSettings extends Vue {
     const migrationResult = await new Promise((res) => {
       const onMoveProgress = (data: any) => {
         if (data.type !== "operationUpdate" && data.type !== "moveInstancesReply") return;
-        console.log("crap", data);
         if (data.type === "operationUpdate") {
           const typedData = data as OperationProgressUpdateData;
           if (typedData.stage === "FINISHED") {