From 43f8b90b4febc0f698a149e4360b86479b678c13 Mon Sep 17 00:00:00 2001
From: DCoded <dicoded@email.com>
Date: Sat, 5 Jun 2021 00:16:40 -0400
Subject: [PATCH] Replaced semantic class names with utility class names
---
css/facilities/clinic.css | 11 -----------
css/facilities/facilities.css | 8 ++++++++
css/facilities/farmyard.css | 23 -----------------------
css/facilities/pit.css | 12 ------------
css/facilities/spa.css | 8 --------
src/facilities/clinic/clinic.js | 18 +++++++++---------
src/facilities/farmyard/farmyard.js | 24 ++++++++++++------------
src/facilities/pit/pit.js | 10 +++++-----
src/facilities/spa/spa.js | 12 ++++++------
src/npc/interaction/killSlave.js | 6 +++---
10 files changed, 43 insertions(+), 89 deletions(-)
delete mode 100644 css/facilities/clinic.css
delete mode 100644 css/facilities/pit.css
delete mode 100644 css/facilities/spa.css
diff --git a/css/facilities/clinic.css b/css/facilities/clinic.css
deleted file mode 100644
index eaa8608eb15..00000000000
--- a/css/facilities/clinic.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.clinic-intro,
-.clinic-expand,
-.clinic-upgrades,
-.clinic-rules,
-.clinic-slaves,
-.clinic-rename,
-.clinic-implants,
-.clinic-observation,
-.clinic-gestation {
- margin-bottom: 1em;
-}
diff --git a/css/facilities/facilities.css b/css/facilities/facilities.css
index 0c64d4f6e5e..a875aba9176 100644
--- a/css/facilities/facilities.css
+++ b/css/facilities/facilities.css
@@ -1,3 +1,11 @@
.facility-rename {
margin-top: 1em;
}
+
+.margin-top {
+ margin-top: 1em;
+}
+
+.margin-bottom {
+ margin-bottom: 1em;
+}
diff --git a/css/facilities/farmyard.css b/css/facilities/farmyard.css
index eddd66d9a37..8d0abbe268a 100644
--- a/css/facilities/farmyard.css
+++ b/css/facilities/farmyard.css
@@ -1,26 +1,3 @@
-.farmyard-intro,
-.farmyard-domestic {
- margin-bottom: 1em;
-}
-
-.farmyard-expand,
-.farmyard-menials,
-.farmyard-rules,
-.farmyard-upgrades,
-.farmyard-animals,
-.farmyard-remove,
-.farmyard-slaves,
-.farmyard-heading {
- margin-top: 1em;
- margin-bottom: 1em;
-}
-
-.animal-add,
-.farmyard-rename,
-.farmyard-exotic {
- margin-top: 1em;
-}
-
.farmyard-heading {
text-transform: uppercase;
}
diff --git a/css/facilities/pit.css b/css/facilities/pit.css
deleted file mode 100644
index 9db132aa0d2..00000000000
--- a/css/facilities/pit.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.pit-intro,
-.pit-section {
- margin-bottom: 1em;
-}
-
-.kill-slave-options,
-.kill-slave-relations,
-.kill-slave-cancel,
-.pit-assign,
-.pit-rename {
- margin-top: 1em;
-}
diff --git a/css/facilities/spa.css b/css/facilities/spa.css
deleted file mode 100644
index c336fa2e2b8..00000000000
--- a/css/facilities/spa.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.spa-intro,
-.spa-expand,
-.spa-upgrades,
-.spa-attendant,
-.spa-slaves,
-.spa-rename {
- margin-bottom: 1em;
-}
diff --git a/src/facilities/clinic/clinic.js b/src/facilities/clinic/clinic.js
index 29141f7f12c..df38366efcc 100644
--- a/src/facilities/clinic/clinic.js
+++ b/src/facilities/clinic/clinic.js
@@ -1,12 +1,12 @@
App.Facilities.Clinic.clinic = function() {
const frag = new DocumentFragment();
- const introDiv = App.UI.DOM.makeElement("div", null, ['clinic-intro']);
- const expandDiv = App.UI.DOM.makeElement("div", null, ['clinic-expand']);
- const upgradesDiv = App.UI.DOM.makeElement("div", null, ['clinic-upgrades']);
- const rulesDiv = App.UI.DOM.makeElement("div", null, ['clinic-rules']);
- const slavesDiv = App.UI.DOM.makeElement("div", null, ['clinic-slaves']);
- const renameDiv = App.UI.DOM.makeElement("div", null, ['clinic-rename']);
+ const introDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const expandDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const upgradesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const rulesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const slavesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const renameDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
let clinicNameCaps = capFirstChar(V.clinicName);
@@ -242,9 +242,9 @@ App.Facilities.Clinic.clinic = function() {
}
function rules() {
- const implantsDiv = App.UI.DOM.makeElement("div", null, ['clinic-implants']);
- const observationDiv = App.UI.DOM.makeElement("div", null, ['clinic-observation']);
- const gestationDiv = App.UI.DOM.makeElement("div", null, ['clinic-gestation']);
+ const implantsDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const observationDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const gestationDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
rulesDiv.append(
implants(),
diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js
index 63c2fe6c8ab..c227a89bb2a 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -1,17 +1,17 @@
App.Facilities.Farmyard.farmyard = function() {
const frag = new DocumentFragment();
- const introDiv = App.UI.DOM.makeElement("div", null, ['farmyard-intro']);
- const expandDiv = App.UI.DOM.makeElement("div", null, ['farmyard-expand']);
- const menialsDiv = App.UI.DOM.makeElement("div", null, ['farmyard-menials']);
- const rulesDiv = App.UI.DOM.makeElement("div", null, ['farmyard-rules']);
- const upgradesDiv = App.UI.DOM.makeElement("div", null, ['farmyard-upgrades']);
- const kennelsDiv = App.UI.DOM.makeElement("div", null, ['farmyard-kennels']);
- const stablesDiv = App.UI.DOM.makeElement("div", null, ['farmyard-stables']);
- const cagesDiv = App.UI.DOM.makeElement("div", null, ['farmyard-cages']);
- const removeHousingDiv = App.UI.DOM.makeElement("div", null, ['farmyard-remove']);
- const renameDiv = App.UI.DOM.makeElement("div", null, ['farmyard-rename']);
- const slavesDiv = App.UI.DOM.makeElement("div", null, ['farmyard-slaves']);
+ const introDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const expandDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const menialsDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const rulesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const upgradesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const kennelsDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const stablesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const cagesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const removeHousingDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const renameDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const slavesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
let farmyardNameCaps = capFirstChar(V.farmyardName);
@@ -664,7 +664,7 @@ App.Facilities.Farmyard.farmyard = function() {
}
function slaves() {
- slavesDiv.append(App.UI.DOM.appendNewElement("div", frag, App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.farmyard), 'farmyard-slaves'));
+ slavesDiv.append(App.UI.DOM.appendNewElement("div", frag, App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.farmyard), 'margin-bottom'));
return slavesDiv;
}
diff --git a/src/facilities/pit/pit.js b/src/facilities/pit/pit.js
index 230b2d5d9f0..e238271beea 100644
--- a/src/facilities/pit/pit.js
+++ b/src/facilities/pit/pit.js
@@ -1,11 +1,11 @@
App.Facilities.Pit.pit = function() {
const frag = new DocumentFragment();
- const introDiv = App.UI.DOM.makeElement("div", null, ['pit-intro']);
- const audienceDiv = App.UI.DOM.makeElement("div", null, ['pit-audience']);
- const slavesDiv = App.UI.DOM.makeElement("div", null, ['pit-slaves']);
- const lethalityDiv = App.UI.DOM.makeElement("div", null, ['pit-lethality']);
- const renameDiv = App.UI.DOM.makeElement("div", null, ['pit-rename']);
+ const introDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const audienceDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const slavesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const lethalityDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const renameDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
let pitNameCaps = capFirstChar(V.pit.name);
diff --git a/src/facilities/spa/spa.js b/src/facilities/spa/spa.js
index 5b26c11e11a..c4e42999a0e 100644
--- a/src/facilities/spa/spa.js
+++ b/src/facilities/spa/spa.js
@@ -1,12 +1,12 @@
App.Facilities.Spa.spa = function() {
const frag = new DocumentFragment();
- const introDiv = App.UI.DOM.makeElement("div", null, ['spa-intro']);
- const expandDiv = App.UI.DOM.makeElement("div", null, ['spa-expand']);
- const upgradesDiv = App.UI.DOM.makeElement("div", null, ['spa-upgrades']);
- const attendantDiv = App.UI.DOM.makeElement("div", null, ['spa-attendant']);
- const slavesDiv = App.UI.DOM.makeElement("div", null, ['spa-slaves']);
- const renameDiv = App.UI.DOM.makeElement("div", null, ['spa-rename']);
+ const introDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const expandDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const upgradesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const attendantDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const slavesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
+ const renameDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
let spaNameCaps = capFirstChar(V.spaName);
diff --git a/src/npc/interaction/killSlave.js b/src/npc/interaction/killSlave.js
index 20eff7df1cc..9e76ee20e47 100644
--- a/src/npc/interaction/killSlave.js
+++ b/src/npc/interaction/killSlave.js
@@ -118,7 +118,7 @@ App.UI.SlaveInteract.killSlave = function(slave) {
}
function links() {
- const linksDiv = App.UI.DOM.makeElement("div", '', "kill-slave-options");
+ const linksDiv = App.UI.DOM.makeElement("div", '', 'margin-top');
const links = [];
const disableReasons = [];
@@ -232,7 +232,7 @@ App.UI.SlaveInteract.killSlave = function(slave) {
function relations() {
// TODO: potentially expand to allow for checking for more than one relation (i.e. sister/mother/lover, etc)
- const relationsDiv = App.UI.DOM.makeElement("div", '', "kill-slave-relations");
+ const relationsDiv = App.UI.DOM.makeElement("div", '', 'margin-top');
const halfSisters = [];
const sisters = [];
@@ -511,7 +511,7 @@ App.UI.SlaveInteract.killSlave = function(slave) {
App.UI.DOM.appendNewElement("div", plannedFightsDiv, App.UI.DOM.passageLink(`Cancel the fight`, V.returnTo, () => {
V.pit.slaveFightingBodyguard = null;
- }), ["kill-slave-cancel"]);
+ }), ['margin-top']);
return plannedFightsDiv;
}
--
GitLab