Whitespace changes

This commit is contained in:
Waiting Idly 2021-06-07 07:34:01 -07:00
parent 0c8fffaf6a
commit 3aa40d8bc8
8 changed files with 106 additions and 115 deletions

View File

@ -12,17 +12,12 @@ Vue.component("modal-delete-companion", {
},
message() {
switch (this.messageIndex) {
case 0:
return "Are you sure you want to get rid of your Companion Glyph?";
case 1:
return "You will not receive any cake.";
case 2:
return "This is permanent! You will not get another Companion Glyph!";
case 3:
return "You deleted your faithful Companion Glyph more quickly than any " +
"other test subject on record. Congratulations.";
default:
return "Invalid message index";
case 0: return "Are you sure you want to get rid of your Companion Glyph?";
case 1: return "You will not receive any cake.";
case 2: return "This is permanent! You will not get another Companion Glyph!";
case 3: return `You deleted your faithful Companion Glyph more quickly than any
other test subject on record. Congratulations.`;
default: return "Invalid message index";
}
}
},
@ -78,4 +73,4 @@ Vue.component("modal-delete-companion", {
>Thank you</primary-button>
</div>
</div>`
});
});

View File

@ -41,31 +41,30 @@ Vue.component("modal-h2p", {
}
},
template: `
<div class="l-h2p-modal">
<div class="l-h2p-header">
<div class="c-h2p-title">
How To Play
<div class="l-h2p-modal">
<div class="l-h2p-header">
<div class="c-h2p-title">
How To Play
</div>
<div class="c-modal__close-btn o-primary-btn o-primary-btn--modal-close" @click="exit">×</div>
</div>
<div class="c-modal__close-btn o-primary-btn o-primary-btn--modal-close" @click="exit">×</div>
</div>
<div class="l-h2p-container">
<div class="l-h2p-search-tab">
<input v-model="searchValue" placeholder="Type to search..." class="c-h2p-search-bar"/>
<div class="l-h2p-tab-list">
<div v-for="tab in matchingTabs"
:key="tab.name"
class="o-h2p-tab-button"
:class="tab === activeTab ? 'o-h2p-tab-button--selected' : ''"
@click="setActiveTab(tab)">
{{tab.alias}}
<div class="l-h2p-container">
<div class="l-h2p-search-tab">
<input v-model="searchValue" placeholder="Type to search..." class="c-h2p-search-bar"/>
<div class="l-h2p-tab-list">
<div v-for="tab in matchingTabs"
:key="tab.name"
class="o-h2p-tab-button"
:class="tab === activeTab ? 'o-h2p-tab-button--selected' : ''"
@click="setActiveTab(tab)">
{{tab.alias}}
</div>
</div>
</div>
<div class="l-h2p-info">
<div class="c-h2p-body--title"> {{activeTab.name}} </div>
<div class="l-h2p-body c-h2p-body" v-html="activeTab.info()" />
</div>
</div>
<div class="l-h2p-info">
<div class="c-h2p-body--title"> {{activeTab.name}} </div>
<div class="l-h2p-body c-h2p-body" v-html="activeTab.info()" />
</div>
</div>
</div>
`
</div>`
});

View File

@ -25,4 +25,4 @@ Vue.component("modal-close-button", {
class="o-primary-btn--modal-close c-modal__close-btn"
@click="emitClick"
>&times;</primary-button>`
});
});

View File

@ -66,44 +66,38 @@ Vue.component("modal-preferred-tree", {
},
},
template: `
<div class="c-modal-message l-modal-content--centered">
<modal-close-button @click="emitClose"/>
<br>
<h2>Dimension Split Preference</h2>
<div style="display: flex; flex-direction: row; align-items: center;">
<button
v-for="(id, name) in dimensionOptions"
@click="select(name)"
:class="classList(name)"
>
<div
v-if="isPreferred(name)"
class="l-dim-path-priority o-hint-text"
>
{{isPreferred(name)}}
<div class="c-modal-message l-modal-content--centered">
<modal-close-button @click="emitClose"/>
<br>
<h2>Dimension Split Preference</h2>
<div style="display: flex; flex-direction: row; align-items: center;">
<button
v-for="(id, name) in dimensionOptions"
@click="select(name)"
:class="classList(name)">
<div v-if="isPreferred(name)" class="l-dim-path-priority o-hint-text">
{{isPreferred(name)}}
</div>
<div>
{{name}}
</div>
</button>
</div>
<div>
{{name}}
<br>
<h2>Pace split Preference</h2>
<div style="display: flex; flex-direction: row; align-items: center;">
<button
v-for="(id, name) in paceOptions"
@click="select(name)"
:class="classList(name)">
<div>
{{name}}
</div>
</button>
</div>
</button>
</div>
<br>
<h2>Pace split Preference</h2>
<div style="display: flex; flex-direction: row; align-items: center;">
<button
v-for="(id, name) in paceOptions"
@click="select(name)"
:class="classList(name)"
>
<div>
{{name}}
</div>
</button>
</div>
<primary-button
class="o-primary-btn--width-medium c-modal-import-tree__import-btn c-modal__confirm-btn"
@click="confirmPrefs"
>Confirm</primary-button>
</div>
`
});
<primary-button
class="o-primary-btn--width-medium c-modal-import-tree__import-btn c-modal__confirm-btn"
@click="confirmPrefs"
>Confirm</primary-button>
</div>`
});

View File

@ -21,16 +21,22 @@ Vue.component("modal-progress-bar", {
methods: {
},
template: `
<div class="l-modal-overlay c-modal-overlay" style="z-index: 8">
<div class="l-modal-progress-bar c-modal">
<div class="c-modal-progress-bar__label"> {{progress.label}} </div>
<div>Ticks: {{ formatInt(progress.current) }}/{{ formatInt(progress.max) }}</div>
<div>Remaining: {{ remaining }} seconds</div>
<div class="l-modal-progress-bar__hbox">
<div class="l-modal-progress-bar__bg c-modal-progress-bar__bg">
<div class="l-modal-progress-bar__fg c-modal-progress-bar__fg" :style="foregroundStyle"/>
<div class="l-modal-overlay c-modal-overlay" style="z-index: 8">
<div class="l-modal-progress-bar c-modal">
<div class="c-modal-progress-bar__label">
{{progress.label}}
</div>
<div>
Ticks: {{ formatInt(progress.current) }}/{{ formatInt(progress.max) }}
</div>
<div>
Remaining: {{ remaining }} seconds
</div>
<div class="l-modal-progress-bar__hbox">
<div class="l-modal-progress-bar__bg c-modal-progress-bar__bg">
<div class="l-modal-progress-bar__fg c-modal-progress-bar__fg" :style="foregroundStyle"/>
</div>
</div>
</div>
</div>
</div>`,
</div>`,
});

View File

@ -142,6 +142,5 @@ Vue.component("modal-reality", {
@click="confirmModal(false)"
>Confirm</primary-button>
</div>
</div>
`
</div>`
});

View File

@ -12,22 +12,21 @@ Vue.component("modal-std-store", {
this.emitClose();
}
},
template:
`<div class="l-modal-content--centered">
<modal-close-button v-if="modal.closeButton" class="c-modal__close-btn" @click="emitClose"/>
<h2>Support The Developer -coins</h2>
<div class="l-modal-store-content">
<img src="images/std_coin.png"/>
<div class="c-modal-store-buttons">
<std-store-btn-row :amount="20" :cost="20"/>
<std-store-btn-row :amount="60" :cost="50"/>
<std-store-btn-row :amount="140" :cost="100"/>
<std-store-btn-row :amount="300" :cost="200"/>
<std-store-btn-row :amount="1000" :cost="500"/>
template:
`<div class="l-modal-content--centered">
<modal-close-button v-if="modal.closeButton" class="c-modal__close-btn" @click="emitClose"/>
<h2>Support The Developer -coins</h2>
<div class="l-modal-store-content">
<img src="images/std_coin.png"/>
<div class="c-modal-store-buttons">
<std-store-btn-row :amount="20" :cost="20"/>
<std-store-btn-row :amount="60" :cost="50"/>
<std-store-btn-row :amount="140" :cost="100"/>
<std-store-btn-row :amount="300" :cost="200"/>
<std-store-btn-row :amount="1000" :cost="500"/>
</div>
</div>
</div>
</div>
`
</div>`
});
Vue.component("std-store-btn-row", {
@ -41,11 +40,10 @@ Vue.component("std-store-btn-row", {
}
},
template:
`<div class="c-modal-store-btn-container">
<div class="o-modal-store-label">{{ amount }} STDs</div>
<button class="o-modal-store-btn" @click="purchase()">
<span>{{ cost }}</span><img src="images/kred_single.png"/>
</button>
</div>
`
});
`<div class="c-modal-store-btn-container">
<div class="o-modal-store-label">{{ amount }} STDs</div>
<button class="o-modal-store-btn" @click="purchase()">
<span>{{ cost }}</span><img src="images/kred_single.png"/>
</button>
</div>`
});

View File

@ -178,11 +178,11 @@ function applyRealityUpgradesAfterEternity() {
}
function askEternityConfirmation() {
if (!player.options.confirmations.eternity) {
eternity();
return;
}
Modal.eternity.show();
if (!player.options.confirmations.eternity) {
eternity();
return;
}
Modal.eternity.show();
}
class EternityMilestoneState {