From 63db2b77cd385b06ea12823977fee5cfbc7bf3d4 Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Sat, 15 Aug 2020 14:18:22 -0400 Subject: [PATCH] list item and tweaks --- src/facilities/nursery/nursery.tw | 4 ++-- src/gui/css/mainStyleSheet.css | 12 ++++++------ src/js/rulesAssistantOptions.js | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw index 04ef01841b3..ca6251730ab 100644 --- a/src/facilities/nursery/nursery.tw +++ b/src/facilities/nursery/nursery.tw @@ -107,8 +107,8 @@ <div id="content"> */ <<set _Tmult0 = Math.trunc($nurseryNannies*1000*$upgradeMultiplierArcology)>> - <br>It can support $nurseryNannies nann<<if $nurseryNannies != 1>>ies<<else>>y<</if>>. - There <<if _NL == 1>>is<<else>>are<</if>> _NL nann<<if _NL != 1>>ies<<else>>y<</if>> in $nurseryName. + <br>It can support $nurseryNannies <<if $nurseryNannies != 1>>nannies<<else>>nanny<</if>>. + There <<if _NL == 1>>is<<else>>are<</if>> _NL <<if _NL != 1>>nannies<<else>>nanny<</if>> in $nurseryName. <<if $nurseryChildren > 0 && _NL < 1 && (!_S.Matron)>> <div class="note"> You must have a Matron or at least one nanny to be able to influence the children's upbringing diff --git a/src/gui/css/mainStyleSheet.css b/src/gui/css/mainStyleSheet.css index 5e81eb57fc2..8c5fe85aa2d 100644 --- a/src/gui/css/mainStyleSheet.css +++ b/src/gui/css/mainStyleSheet.css @@ -197,28 +197,28 @@ word-break: break-all; white-space: normal; } /* css rules for rules assistant */ -.rajs-listitem { +.rajs-list-item { display: inline-block; color: var(--link-color); margin-right: 1em; } -.rajs-listitem.selected { +.rajs-list-item.selected { color: gray; text-decoration: none; } -.rajs-listitem:last-of-type { margin-right: 0; } -.rajs-listitem:hover { +.rajs-list-item:last-of-type { margin-right: 0; } +.rajs-list-item:hover { cursor: pointer; text-decoration: underline; } -.rajs-listitem.selected:hover { +.rajs-list-item.selected:hover { cursor: default; text-decoration: none; } .rajs-list strong:first-of-type, .rajs-list input { margin-right: 2em; } -.rajs-listitem input { +.rajs-list-item input { margin: 0.25em; } .rajs-section h1 { diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index e319424bb03..99e1a87ce69 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -412,7 +412,7 @@ globalThis.rulesAssistantOptions = (function() { render(displayvalue) { const elem = document.createElement("span"); - elem.classList.add("rajs-listitem"); + elem.classList.add("rajs-list-item"); elem.innerHTML = displayvalue; elem.onclick = () => { return this.select(); }; return elem; @@ -952,7 +952,7 @@ globalThis.rulesAssistantOptions = (function() { } render(label, onclick) { const elem = document.createElement("span"); - elem.classList.add("rajs-listitem"); + elem.classList.add("rajs-list-item"); elem.innerHTML = label; elem.onclick = () => { return this.onclick(this); }; return elem; @@ -991,7 +991,7 @@ globalThis.rulesAssistantOptions = (function() { render(label, selected) { const container = document.createElement("div"); - container.classList.add("rajs-listitem"); + container.classList.add("rajs-list-item"); const labelel = document.createElement("span"); labelel.innerHTML = label; -- GitLab