Nixyri/AntimatterDimensionsSourceCode
1
0
Fork 0
mirror of https://github.com/IvarK/AntimatterDimensionsSourceCode.git synced 2024-11-22 04:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing eternity and infinity buttons some more on the new Ui

Browse Source
This commit is contained in:
IvarK 2019-07-27 15:47:47 +03:00
parent 44a78e3131
commit 8377a10f74
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
javascripts/components/new-ui/dimensions-tab/new-dimensions-tab.js
View File

@ -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

10
javascripts/components/new-ui/sidebar-resources/sidebar-ep.js
View File

@ -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>

2
javascripts/components/new-ui/sidebar-resources/sidebar-ip.js
View File

@ -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>

13
stylesheets/new-ui-styles.css
View File

@ -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;
}