From e01a9ef6034e3012c89f88af88203b4a86e797a6 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 13 Aug 2020 14:11:49 -0400
Subject: [PATCH] tab-bar
---
src/003-assets/CSS/tabs.css | 20 ++++++++++----------
src/Mods/SecExp/buildings/secBarracks.tw | 2 +-
src/Mods/SpecialForce/Firebase.tw | 2 +-
src/events/intro/introSummary.tw | 2 +-
src/facilities/nursery/nursery.tw | 2 +-
src/gui/multipleInspect.js | 2 +-
src/gui/options/options.tw | 2 +-
src/interaction/policies/policies.tw | 2 +-
src/js/rulesAssistantOptions.js | 2 +-
src/js/slaveListing.js | 6 +++---
src/npc/slaveStats.tw | 2 +-
src/npc/startingGirls/startingGirls.tw | 2 +-
src/personalAssistant/assistantOptions.tw | 2 +-
src/uncategorized/economics.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 2 +-
src/uncategorized/slaveInteract.tw | 2 +-
src/uncategorized/underperformingSlaves.tw | 2 +-
17 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/003-assets/CSS/tabs.css b/src/003-assets/CSS/tabs.css
index a5e31ab91e1..2e52d21325e 100644
--- a/src/003-assets/CSS/tabs.css
+++ b/src/003-assets/CSS/tabs.css
@@ -1,8 +1,8 @@
-div.tabbar {
+div.tab-bar {
overflow: hidden;
}
-div.tabbar button {
+div.tab-bar button {
background-color: var(--button-color);
border: solid 2px var(--button-color);
color: var(--link-color);
@@ -14,39 +14,39 @@ div.tabbar button {
font-size: large;
}
-div.tabbar button.card {
+div.tab-bar button.card {
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border: none;
}
-div.tabbar button.card.active {
+div.tab-bar button.card.active {
background-color: #1a1a1a;
}
-div.tabbar button:hover {
+div.tab-bar button:hover {
background-color: var(--button-hover-color);
}
-div.tabbar button.active {
+div.tab-bar button.active {
background-color: var(--button-selected-color);
color: #c7cedf;
}
-div.tabbar button.show-warning { /* dumb name, but warning and error already exist */
+div.tab-bar button.show-warning { /* dumb name, but warning and error already exist */
background-color: #b30000;
border-color: #b30000;
}
-div.tabbar button.show-warning:hover {
+div.tab-bar button.show-warning:hover {
background-color: #e60000
}
-div.tabbar button.show-warning.active {
+div.tab-bar button.show-warning.active {
background-color: #4d0000;
}
-div.tabbar a.active {
+div.tab-bar a.active {
color: white;
pointer-events: none;
cursor: default;
diff --git a/src/Mods/SecExp/buildings/secBarracks.tw b/src/Mods/SecExp/buildings/secBarracks.tw
index 7663aa95c19..637c1334d6e 100644
--- a/src/Mods/SecExp/buildings/secBarracks.tw
+++ b/src/Mods/SecExp/buildings/secBarracks.tw
@@ -138,7 +138,7 @@ Your current maximum number of units is <<print App.SecExp.battle.maxUnits()>> (
<<if $mercenaries === 0>>
<br>Mercenaries are not allowed inside the arcology. You will not be able to recruit mercenary units.
<</if>>
-<div class="tabbar">
+<div class="tab-bar">
<<if $arcologyUpgrade.drones == 1>>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Bots')" id="tab Bots">Security Drones</button>
<</if>>
diff --git a/src/Mods/SpecialForce/Firebase.tw b/src/Mods/SpecialForce/Firebase.tw
index 18e3e4694f0..0ac357d8f6e 100644
--- a/src/Mods/SpecialForce/Firebase.tw
+++ b/src/Mods/SpecialForce/Firebase.tw
@@ -28,7 +28,7 @@
<<if $SF.FS.Tension !== -1>> The Colonel's current Tension: $SF.FS.Tension<</if>>
<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Firebase)>>
- <div class="tabbar">
+ <div class="tab-bar">
<<if _size !== _max>>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Upgrades')" id="tab Upgrades">Upgrades</button>
<</if>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index f0a64a14c38..108a10c3041 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -97,7 +97,7 @@ You may review your settings before clicking "Continue" to begin.<br>
<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.IntroSummary)>>
-<div class="tabbar">
+<div class="tab-bar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'World')" id="tab World">World</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'slaves')" id="tab slaves">Slaves</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'PC')" id="tab PC">Player Character</button>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 865b94b3d5d..ab79855ef37 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -96,7 +96,7 @@
<</if>>
</p>
-<div class="tabbar">
+<div class="tab-bar">
/* <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'nannies')" id="tab nannies">Nannies</button> */
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'pregnantSlaves')" id="tab pregnantSlaves">Pregnant Slaves</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'children')" id="tab children">Children</button>
diff --git a/src/gui/multipleInspect.js b/src/gui/multipleInspect.js
index 552529e88e7..f4c106b7f58 100644
--- a/src/gui/multipleInspect.js
+++ b/src/gui/multipleInspect.js
@@ -9,7 +9,7 @@ App.UI.MultipleInspect = (function() {
*/
function MultipleInspectDOM(slaves, showFamilyTree, market) {
const frag = document.createDocumentFragment();
- const tabbar = App.UI.DOM.appendNewElement("div", frag, "", "tabbar");
+ const tabbar = App.UI.DOM.appendNewElement("div", frag, "", "tab-bar");
for (const slave of slaves) {
tabbar.append(App.UI.tabbar.tabButtonDOM(`slave${slave.ID}`, slave.slaveName));
diff --git a/src/gui/options/options.tw b/src/gui/options/options.tw
index 47d65b942ae..ee3820525a8 100644
--- a/src/gui/options/options.tw
+++ b/src/gui/options/options.tw
@@ -69,7 +69,7 @@
<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Options)>>
-<div class="tabbar">
+<div class="tab-bar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Display')" id="tab Display">Display</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'CONTENT&FLAVOR')" id="tab CONTENT&FLAVOR">Content & flavour</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'MODS')" id="tab MODS">Mods</button>
diff --git a/src/interaction/policies/policies.tw b/src/interaction/policies/policies.tw
index 24176214ba7..8a0c8d80952 100644
--- a/src/interaction/policies/policies.tw
+++ b/src/interaction/policies/policies.tw
@@ -27,7 +27,7 @@
<</if>>
More policies will become available as the arcology develops.
</p>
-<div class="tabbar">
+<div class="tab-bar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'SMRs')" id="tab SMRs">Slave Market Regulations</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'ST')" id="tab ST">Sexual Trendsetting</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Population')" id="tab Population">Population & Domestic</button>
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 1bfef6859f4..1f6a99430c7 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1574,7 +1574,7 @@ globalThis.rulesAssistantOptions = (function() {
const element = document.createElement("div");
element.className = "ra-setters";
this.tabButtons_ = document.createElement("div");
- this.tabButtons_.className = "tabbar";
+ this.tabButtons_.className = "tab-bar";
element.appendChild(this.tabButtons_);
return element;
}
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 8052c5bd808..f6df4dfb166 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -622,7 +622,7 @@ App.UI.SlaveList.listSJFacilitySlaves = function(facility, facilityPassage, show
if (V.sortSlavesMain) {
frag.append(this.sortingLinks(facilityPassage));
}
- const tabbar = App.UI.DOM.appendNewElement("div", frag, '', "tabbar");
+ const tabbar = App.UI.DOM.appendNewElement("div", frag, '', "tab-bar");
tabbar.append(
App.UI.tabbar.tabButtonDOM('assign', tabCaptions.assign),
App.UI.tabbar.tabButtonDOM('remove', tabCaptions.remove),
@@ -710,7 +710,7 @@ App.UI.SlaveList.listNGPSlaves = function() {
const frag = document.createDocumentFragment();
frag.append(this.sortingLinks(thisPassage));
- const tabbar = App.UI.DOM.appendNewElement("div", frag, '', "tabbar");
+ const tabbar = App.UI.DOM.appendNewElement("div", frag, '', "tab-bar");
tabbar.append(
App.UI.tabbar.tabButtonDOM('assign', "Import a slave"),
App.UI.tabbar.tabButtonDOM('remove', "Remove from import")
@@ -1032,7 +1032,7 @@ App.UI.SlaveList.penthousePage = function() {
}
const div = document.createElement("div");
- div.classList.add("tabbar");
+ div.classList.add("tab-bar");
if (V.useSlaveSummaryTabs === 0) {
const links = [];
for (const tab of tabs) {
diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw
index 0b081889179..6efbb5c0b47 100644
--- a/src/npc/slaveStats.tw
+++ b/src/npc/slaveStats.tw
@@ -71,7 +71,7 @@ Income: <<= num($activeSlave.lifetimeRepIncome)>>
Expenses: <<= num($activeSlave.lastWeeksRepExpenses)>>,
Income: <<= num($activeSlave.lastWeeksRepIncome)>>
-<div class="tabbar">
+<div class="tab-bar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Skills')" id="tab Skills">Skills</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Mental')" id="tab Mental">Mental</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Body')" id="tab Body">Body</button>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index b4a7b215c4d..d7c5f90839f 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -364,7 +364,7 @@
<h2>You are customizing this slave:</h2> <<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
-<div class="tabbar">
+<div class="tab-bar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Overview')" id="tab Overview">Overview</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Physical')" id="tab Physical">Physical</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Mental')" id="tab Mental">Mental</button>
diff --git a/src/personalAssistant/assistantOptions.tw b/src/personalAssistant/assistantOptions.tw
index 23ce35ebf83..05b0cd5c09e 100644
--- a/src/personalAssistant/assistantOptions.tw
+++ b/src/personalAssistant/assistantOptions.tw
@@ -28,7 +28,7 @@ Seated at your desk, you glance at the visual representation of
<br><br>
<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Assistant)>>
-<div class="tabbar">
+<div class="tab-bar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upgrades')" id="tab upgrades">Computer Core Upgrades</button>
<<if $week >= 11>>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'settings')" id="tab settings">Settings</button>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 8d11781d0af..9d537e077b0 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -48,7 +48,7 @@
<<else>>
<body>
-<div class="tabbar">
+<div class="tab-bar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Arcologies')" id="defaultOpen">Arcologies</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Management')">Arcology Management</button>
<<if $FSAnnounced > 0>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 5161d44f52a..e6d576e697b 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -62,7 +62,7 @@
<</if>>
</div>
-<div class="tabbar">
+<div class="tab-bar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'hairFace')" id="tab hairFace">Hair and Face</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upper')" id="tab upper">Upper</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'lower')" id="tab lower">Lower</button>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index e86ebaeee27..cdfc3b42ded 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -80,7 +80,7 @@
<<print App.UI.Hotkeys.hotkeys("nextSlave")>>
</span>
</p>
-<div class="tabbar">
+<div class="tab-bar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Description'), jQuery('#LSD').empty().append(App.Desc.longSlave(getSlave(V.activeSlave.ID)))" id="tab Description">Description</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Modify')" id="tab Modify">Modify</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Work')" id="tab Work">Work</button>
diff --git a/src/uncategorized/underperformingSlaves.tw b/src/uncategorized/underperformingSlaves.tw
index 059bd272be4..eb95a581f25 100644
--- a/src/uncategorized/underperformingSlaves.tw
+++ b/src/uncategorized/underperformingSlaves.tw
@@ -20,7 +20,7 @@
</div>
</p>
<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Options)>>
-<div class="tabbar">
+<div class="tab-bar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'highSale')" id="tab highSale">Worth much but earning little</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'expensive')" id="tab expensive">Costing vs earning</button>
</div>
--
GitLab