Merge branch 'dev'

nimiq · Nov 19, 2024 · 81edf44 · 81edf44
2 parents 0b94890 + 5683dbd
commit 81edf44
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -16,8 +16,6 @@ on:
 
 jobs:
   import-validators:
-    # Only run if pull request is merged to main
-    if: github.event.pull_request.merged == true
     name: Import validators ${{ inputs.network }}
     strategy:
       fail-fast: false
@@ -36,7 +34,6 @@ jobs:
           fi
 
   sync-epoch-activity:
-    if: github.event_name != 'pull_request'
     name: Syncs the epoch activity
     strategy:
       fail-fast: false
@@ -75,7 +72,6 @@ jobs:
           done
 
   sync-validator-balances:
-    if: github.event_name != 'pull_request'
     name: Syncs the validator balances
     strategy:
       fail-fast: false

diff --git a/app/app.vue b/app/app.vue
@@ -12,7 +12,7 @@ const networkName = useRuntimeConfig().public.nimiqNetwork
 </script>
 
 <template>
-  <div flex="~ col gap-64" mx-auto dominance-screen max-h-screen max-w-1200 px-32 py-20>
+  <div flex="~ col gap-64" mx-auto size-screen max-h-screen max-w-1200 px-32 py-20>
     <header flex="~ gap-32 row items-center">
       <NuxtLink to="/" flex>
         <div aria-hidden i-nimiq:logos-nimiq-horizontal class="!ml-16 !h-24 !w-90" dark:i-nimiq:logos-nimiq-white-horizontal />

diff --git a/app/components/ScorePies.vue b/app/components/ScorePies.vue
@@ -8,19 +8,19 @@ defineProps<{ validator: ValidatorScore }>()
       <h4 nq-label text="0.5em center">
         dominance
       </h4>
-      <ScorePie text="neutral/70" mx-auto mt-6 dominance-2.75em :score="validator.dominance" />
+      <ScorePie text="neutral/70" mx-auto mt-6 size-2.75em :score="validator.dominance" />
     </div>
     <div>
       <h4 nq-label text="0.5em center">
         availability
       </h4>
-      <ScorePie text="neutral/70" mx-auto mt-6 dominance-2.75em :score="validator.availability" />
+      <ScorePie text="neutral/70" mx-auto mt-6 size-2.75em :score="validator.availability" />
     </div>
     <div>
       <h4 nq-label text="0.5em center">
         reliability
       </h4>
-      <ScorePie text="neutral/70" mx-auto mt-6 dominance-2.75em :score="validator.reliability" />
+      <ScorePie text="neutral/70" mx-auto mt-6 size-2.75em :score="validator.reliability" />
     </div>
   </div>
 </template>
diff --git a/app/components/ValidatorsTable.vue b/app/components/ValidatorsTable.vue
@@ -23,7 +23,7 @@ defineProps<{ validators: ValidatorScore[] }>()
       bg="transparent even:neutral-50 hocus:neutral-200 hocus:even:neutral-300" transition-colors py-16
     >
       <Identicon
-        :validator :alt="validator.name!" dominance-32 mr--20 ml-20 object-contain
+        :validator :alt="validator.name!" size-32 mr--20 ml-20 object-contain
         :style="{ 'view-transition-name': `logo-${validator.id}` }"
       />
 
@@ -40,7 +40,7 @@ defineProps<{ validators: ValidatorScore[] }>()
       <Copyable :content="validator.address" :style="{ 'view-transition-name': `address-${validator.id}` }" />
 
       <ScorePie
-        dominance-32 text-12 mx-auto :score="validator.total"
+        size-32 text-12 mx-auto :score="validator.total"
         :style="{ 'view-transition-name': `score-${validator.id}` }"
       />
     </NuxtLink>

diff --git a/app/pages/validator/[address].vue b/app/pages/validator/[address].vue
@@ -9,7 +9,7 @@ const validator = computed(() => getValidatorByAddress(route.params.address as s
   <div v-if="validator">
     <div flex="~ gap-16 items-center">
       <Identicon
-        :validator dominance-64 shrink-0 object-contain
+        :validator size-64 shrink-0 object-contain
         :style="{ 'view-transition-name': `logo-${validator.id}` }"
       />
       <div flex="~ col gap-12" relative>
@@ -38,7 +38,7 @@ const validator = computed(() => getValidatorByAddress(route.params.address as s
         {{ validator.name }}'s score is
       </h3>
       <ScorePie
-        mx-auto mt-32 dominance-128 text-40 :score="validator.total"
+        mx-auto mt-32 size-128 text-40 :score="validator.total"
         :style="{ 'view-transition-name': `score-${validator.id}` }"
       />