From 8377a10f74543d4c7a72b90e184fb435394afb99 Mon Sep 17 00:00:00 2001
From: IvarK <ivarkera@gmail.com>
Date: Sat, 27 Jul 2019 15:47:47 +0300
Subject: [PATCH] fixing eternity and infinity buttons some more on the new Ui

---
 .../new-ui/dimensions-tab/new-dimensions-tab.js     |  2 +-
 .../new-ui/sidebar-resources/sidebar-ep.js          | 10 +++++-----
 .../new-ui/sidebar-resources/sidebar-ip.js          |  2 +-
 stylesheets/new-ui-styles.css                       | 13 +++++++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/javascripts/components/new-ui/dimensions-tab/new-dimensions-tab.js b/javascripts/components/new-ui/dimensions-tab/new-dimensions-tab.js
index 437172c06..c4d8e0358 100644
--- a/javascripts/components/new-ui/dimensions-tab/new-dimensions-tab.js
+++ b/javascripts/components/new-ui/dimensions-tab/new-dimensions-tab.js
@@ -103,7 +103,7 @@ Vue.component("new-dimensions-tab", {
   },
   template:
   `<div class="l-normal-dim-tab">
-    <div class="information-header" ><span v-if="isInAnyChallenge">You are currently in {{challengeDisplay}}</span> <span v-if="isChallengePowerVisible">{{challengePower}}</span></div>
+    <div class="information-header" ><span v-if="isInAnyChallenge">You are currently in {{challengeDisplay}}</span><br><span v-if="isChallengePowerVisible">{{challengePower}}</span></div>
     <div class="modes-container">
       <button class="storebtn" @click="toggleUntil10" style="width: 100px; height: 30px; padding: 0;">{{ getUntil10Display() }}</button>
       <primary-button
diff --git a/javascripts/components/new-ui/sidebar-resources/sidebar-ep.js b/javascripts/components/new-ui/sidebar-resources/sidebar-ep.js
index d3863c0ff..c41a2887e 100644
--- a/javascripts/components/new-ui/sidebar-resources/sidebar-ep.js
+++ b/javascripts/components/new-ui/sidebar-resources/sidebar-ep.js
@@ -25,9 +25,9 @@ Vue.component("sidebar-ep", {
     update() {
       this.ep.copyFrom(player.eternityPoints);
       this.showEternity = player.infinityPoints.gte(Player.eternityGoal)
-      if (!this.showEternity) return;
       if (player.eternities === 0) {
         this.type = EPButtonDisplayType.FIRST_TIME;
+        console.log(this.type)
         return;
       }
 
@@ -89,11 +89,11 @@ Vue.component("sidebar-ep", {
     @click="eternity"
     :class=" { 'resource-eternity-canreset': showEternity }"
     v-tooltip="eternityPeaks">
-    <div v-if="cond">
+    <div v-if="cond || showEternity">
       <h2 v-if="type !== 0" id="ep">{{ shorten(ep, 2, 0) }}</h2>
 
       <template v-if="type === 0">
-        Other times await... I need to become Eternal
+        <div class="o-eternity-button__eternity-text">Other times await... I need to become Eternal</div>
       </template>
 
       <template v-else-if="type === 1">
@@ -104,7 +104,7 @@ Vue.component("sidebar-ep", {
       </template>
 
       <template v-else-if="type === 2">
-        <div class="resource-information">
+        <div class="resource-information o-eternity-button__eternity-text">
           Other challenges await... I need to become Eternal
         </div>
       </template>
@@ -121,7 +121,7 @@ Vue.component("sidebar-ep", {
       <!-- TODO: add type 4 and 5 -->
 
       <template v-else-if="type === 6">
-        <div class="resource-information">
+        <div class="resource-information o-eternity-button__eternity-text">
           <span class="resource-name">Other challenges await...</span>
           <template v-if="fullyCompleted">
             <br>
diff --git a/javascripts/components/new-ui/sidebar-resources/sidebar-ip.js b/javascripts/components/new-ui/sidebar-resources/sidebar-ip.js
index b14ccf4e9..04a8d6a07 100644
--- a/javascripts/components/new-ui/sidebar-resources/sidebar-ip.js
+++ b/javascripts/components/new-ui/sidebar-resources/sidebar-ip.js
@@ -41,7 +41,7 @@ Vue.component("sidebar-ip", {
     @click="infinity"
     :class=" { 'resource-infinity-canreset': showCrunch }"
     v-tooltip="crunchPeaks">
-    <div v-if="cond">
+    <div v-if="cond || showCrunch">
       <h2 id="ip">{{ shorten(ip, 2, 0) }}</h2>
       <div class="resource-information">
         <span class="resource-name">{{ showCrunch ? "Infinity now for" : "Infinity Points" }}</span>
diff --git a/stylesheets/new-ui-styles.css b/stylesheets/new-ui-styles.css
index f7f50f3aa..8b6e2b964 100644
--- a/stylesheets/new-ui-styles.css
+++ b/stylesheets/new-ui-styles.css
@@ -902,4 +902,17 @@ body.t-dark {
 
 .c-reality-upgrade-btn {
   width: 15.6rem;
+}
+
+.resource-eternity-canreset > div {
+  height: 100%;
+}
+
+.o-eternity-button__eternity-text {
+  color: var(--color-eternity);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  padding: 0 10px;
 }
\ No newline at end of file