diff --git a/src/003-assets/CSS/tabs.css b/src/003-assets/CSS/tabs.css index a5e31ab91e13f282be2094ebb51d8f451bd5a5ee..2e52d21325ebb9c4ad8fd49562e1e56c010b9986 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 7663aa95c1909fd5fd87b0ce7b5cd7698a6d26ba..637c1334d6edd0775ead534dad591e82cd2fecdc 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 18e3e4694f0d3859f9f026983b73daebd41b4ee4..0ac357d8f6ee7e9c13d9ce2fa28ad1d42b898bd2 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 f0a64a14c38bfc6ba0b1a9e2f3d76497c2fb01b1..108a10c3041b6e25542913d579fb4132c51e978c 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 865b94b3d5dadfebf129fe24dd583aed1ab4bb38..ab79855ef375da2aa2572b1c53edeafa99c322bc 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 552529e88e700ecfe04cc01a062a472b9d909e09..f4c106b7f586fdf757cef357ae24e79c504de2d7 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 47d65b942ae85dee5df1a25f90afeb2e3f2a07bd..ee3820525a8e7ae350504cba4a0f112b0915117b 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 24176214ba7c8756d426226a9c50d7f6f72eccd1..8a0c8d809523923719a09b2df29fd2ffd5db0d14 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 1bfef6859f473f21a7de4d231a9cc21bb08673ca..1f6a99430c7f790a4808abd2c9c5ddd0233cb927 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 8052c5bd80847693811a8fe70788bb23d958ffcb..f6df4dfb166f5ffe87977ed713ccad2ecb4067c4 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 0b0818891790a69762f0effc1adfa991bd17b595..6efbb5c0b471d40997e7a0a7ab9d02b163673fb1 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 b4a7b215c4d598fddc4406664125516f52fc441d..d7c5f90839f74dac485519d017230af02ce870de 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 23ce35ebf838c16bd353e11113a1022ef47c0011..05b0cd5c09e2ce1efaae50ddefc401f63e4b202d 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 8d11781d0af8b7a463d708ee5c29c28a380b262f..9d537e077b095056117e37bf5a2cb0fb16acf5aa 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 5161d44f52afcf9a2b67729a199c66499e9568b4..e6d576e697b7a1d7d7f13fc0016dfcd5dab86ea0 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 e86ebaeee27df6a6ffb5e3649b93b448deb2afd6..cdfc3b42deda9affe4ff043d3b621d6ce79ed60f 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 059bd272be4f4f74ed50565f33a14ddc7c1532fe..eb95a581f252b090c195a09558a4f9b46c819beb 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>