From 36f3a44827417343e001913fdb364bfb5895c770 Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Thu, 13 Aug 2020 20:39:38 -0400 Subject: [PATCH] more kabob --- src/Mods/Reminder/reminder.js | 4 ++-- src/js/salon.js | 6 +++--- src/npc/startingGirls/startingGirls.js | 2 +- src/npc/startingGirls/startingGirls.tw | 2 +- src/pregmod/FCTV/FCTV.css | 6 +++--- src/pregmod/FCTV/FCTV.js | 14 +++++++------- src/pregmod/FCTV/seFCTVwatch.tw | 2 +- src/uncategorized/salon.tw | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Mods/Reminder/reminder.js b/src/Mods/Reminder/reminder.js index 91888300fc0..7062c27cc2d 100644 --- a/src/Mods/Reminder/reminder.js +++ b/src/Mods/Reminder/reminder.js @@ -36,7 +36,7 @@ App.Reminders.list = function list({maxFuture = Number.POSITIVE_INFINITY, catego */ const includedCategory = category === "all" ? () => true : c => c === category; - const replace = () => App.UI.DOM.replace("#reminderList", list({ + const replace = () => App.UI.DOM.replace("#reminder-list", list({ maxFuture: maxFuture, category: category, link: link @@ -62,7 +62,7 @@ App.Reminders.list = function list({maxFuture = Number.POSITIVE_INFINITY, catego } let outerSpan = document.createElement("span"); - outerSpan.id = "reminderList"; + outerSpan.id = "reminder-list"; let overdue = 0, any = false; diff --git a/src/js/salon.js b/src/js/salon.js index f470eb32957..e78caf44303 100644 --- a/src/js/salon.js +++ b/src/js/salon.js @@ -287,7 +287,7 @@ App.Medicine.Salon.ears = function(slave, {primaryEarColor = 0, secondaryEarColo frag.append(p); } } - return jQuery("#salonEars").empty().append(frag); + return jQuery("#salon-ears").empty().append(frag); function createList(array, method) { const links = []; @@ -343,7 +343,7 @@ App.Medicine.Salon.hair = function(slave, {primaryHairColor = 0, secondaryHairCo frag.append(wigStyle()); frag.append(wigLength()); } - return jQuery("#salonHair").empty().append(frag); + return jQuery("#salon-hair").empty().append(frag); function hairDye() { const frag = new DocumentFragment(); @@ -704,7 +704,7 @@ App.Medicine.Salon.tail = function(slave, {primaryTailColor = 0, secondaryTailCo frag.append(tailDye()); } - return jQuery("#salonTail").empty().append(frag); + return jQuery("#salon-tail").empty().append(frag); function tailDye() { const frag = new DocumentFragment(); diff --git a/src/npc/startingGirls/startingGirls.js b/src/npc/startingGirls/startingGirls.js index fa81259cd06..4b2fc1661db 100644 --- a/src/npc/startingGirls/startingGirls.js +++ b/src/npc/startingGirls/startingGirls.js @@ -264,7 +264,7 @@ App.StartingGirls.career = function(slave) { } select.onchange = () => { slave.career = select.options[select.selectedIndex].value; - jQuery("#careerTextbox").empty().append( + jQuery("#career-textbox").empty().append( App.UI.DOM.makeTextBox( slave.career, v => { diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index 38fac03a614..766d6a7c7af 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -1060,7 +1060,7 @@ | ''Slave name:'' <<textbox "$activeSlave.slaveName" $activeSlave.slaveName "Starting Girls">> <br>''Birth surname:'' <<textbox "$activeSlave.birthSurname" $activeSlave.birthSurname "Starting Girls">> | ''Slave surname:'' <<textbox "$activeSlave.slaveSurname" $activeSlave.slaveSurname "Starting Girls">> - <br>''Career:'' <span id="careerTextbox"><<textbox "$activeSlave.career" $activeSlave.career "Starting Girls">></span> + <br>''Career:'' <span id="career-textbox"><<textbox "$activeSlave.career" $activeSlave.career "Starting Girls">></span> <span id="careers"></span> <script>jQuery('#careers').empty().append(App.StartingGirls.career(V.activeSlave));</script> <br>''Hair color:'' <<textbox "$activeSlave.origHColor" $activeSlave.origHColor "Starting Girls">> //This will also set eyebrow, pubic, and underarm hair color.// diff --git a/src/pregmod/FCTV/FCTV.css b/src/pregmod/FCTV/FCTV.css index b3fe90b9bd4..246efe55940 100644 --- a/src/pregmod/FCTV/FCTV.css +++ b/src/pregmod/FCTV/FCTV.css @@ -2,7 +2,7 @@ display: float; } -.FctvRemote { +.fctv-remote { text-align: center; justify-items: center; display: grid; @@ -10,12 +10,12 @@ width:min-content; padding-right:20px; } -.FctvRemote-numbers { +.fctv-remote-numbers { display: grid; grid-gap: 3px; grid-template-columns: repeat(3, min-content); justify-items:center; } -.FctvRemote-button { +.fctv-remote-button { margin-top: 10px; } \ No newline at end of file diff --git a/src/pregmod/FCTV/FCTV.js b/src/pregmod/FCTV/FCTV.js index 2469b35872f..adae035f6bb 100644 --- a/src/pregmod/FCTV/FCTV.js +++ b/src/pregmod/FCTV/FCTV.js @@ -100,14 +100,14 @@ globalThis.FctvDisplay = function({usedRemote = 0, seeAll = 0, selectedChannel = if (V.cheatMode > 0 || V.debugMode > 0 || V.FCTV.remote) { // Create "Use remote" link. Hide once clicked. span = document.createElement("span"); - span.id = "useRemote"; + span.id = "use-remote"; span.append( App.UI.DOM.link( "Use your remote", () => { usedRemote = 1; jQuery("#remote").empty().append(createRemote()); - jQuery("#useRemote").empty(); + jQuery("#use-remote").empty(); } ) ); @@ -155,14 +155,14 @@ globalThis.FctvDisplay = function({usedRemote = 0, seeAll = 0, selectedChannel = } p.append(displayShow()); frag.append(p); - return jQuery("#FctvWatch").empty().append(frag); + return jQuery("#fctv-watch").empty().append(frag); /** Creates a remote control for FCTV * @returns {HTMLParagraphElement} */ function createRemote() { const p = document.createElement("p"); - p.classList.add("FctvRemote"); + p.classList.add("fctv-remote"); let div; let span; const buttons = []; @@ -205,7 +205,7 @@ globalThis.FctvDisplay = function({usedRemote = 0, seeAll = 0, selectedChannel = buttons.splice(4, 0, App.UI.DOM.makeElement("span", "4")); // 4 is no longer a real channel, so put in a dummy button. 404, channel not found. div = document.createElement("div"); - div.classList.add("FctvRemote-numbers", /* "FctvRemote-button" */); + div.classList.add("fctv-remote-numbers", /* "fctv-remote-button" */); for (const button of buttons) { div.append(button); } @@ -219,7 +219,7 @@ globalThis.FctvDisplay = function({usedRemote = 0, seeAll = 0, selectedChannel = watch({usedRemote: 0, seeAll: seeAll, selectedChannel: selectedChannel}); } ), - ["FctvRemote-button"] + ["fctv-remote-button"] ); if (V.cheatMode > 0 || V.debugMode > 0) { App.UI.DOM.appendNewElement( @@ -236,7 +236,7 @@ globalThis.FctvDisplay = function({usedRemote = 0, seeAll = 0, selectedChannel = watch({usedRemote: usedRemote, seeAll: seeAll, selectedChannel: selectedChannel}); } ), - ["FctvRemote-button"] + ["fctv-remote-button"] ); } return p; diff --git a/src/pregmod/FCTV/seFCTVwatch.tw b/src/pregmod/FCTV/seFCTVwatch.tw index 8523162a859..22270f78742 100644 --- a/src/pregmod/FCTV/seFCTVwatch.tw +++ b/src/pregmod/FCTV/seFCTVwatch.tw @@ -2,7 +2,7 @@ <<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $encyclopedia = "FCTV">> -<p id="FctvWatch"></p> +<p id="fctv-watch"></p> <script> FctvDisplay(); </script> diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw index 2d0ef9efd71..a440fa74025 100644 --- a/src/uncategorized/salon.tw +++ b/src/uncategorized/salon.tw @@ -73,7 +73,7 @@ /* EARS */ <h3>Ears</h3> -<p id="salonEars"></p> +<p id="salon-ears"></p> <script> App.Medicine.Salon.ears(getSlave(V.AS)); </script> @@ -156,7 +156,7 @@ /* HAIR */ <h3>Hair</h3> -<p id="salonHair"></p> +<p id="salon-hair"></p> <script> App.Medicine.Salon.hair(getSlave(V.AS)); </script> @@ -286,7 +286,7 @@ | [[Tiger Stripes|Salon][getSlave($AS).skin = "tiger striped",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]] </div> -<p id="salonTail"></p> +<p id="salon-tail"></p> <script> App.Medicine.Salon.tail(getSlave(V.AS)); </script> -- GitLab