From 7953d02e895fa98da18675a2e2bbfd005290b02e Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Sun, 27 Dec 2020 23:48:15 +0100
Subject: [PATCH] Move facility CSS to css module
---
{src => css}/facilities/facilities.css | 0
.../farmyard => css/facilities}/farmyard.css | 0
.../facilities}/incubator.css | 0
.../nursery => css/facilities}/nursery.css | 2 --
.../facilities/pit => css/facilities}/pit.css | 0
{src => css}/facilities/statistics.css | 20 ++++++++--------
.../facilities/wardrobe.css | 0
src/facilities/statistics.js | 4 ++--
src/gui/css/wardrobeUse.css | 24 -------------------
9 files changed, 12 insertions(+), 38 deletions(-)
rename {src => css}/facilities/facilities.css (100%)
rename {src/facilities/farmyard => css/facilities}/farmyard.css (100%)
rename {src/facilities/incubator => css/facilities}/incubator.css (100%)
rename {src/facilities/nursery => css/facilities}/nursery.css (69%)
rename {src/facilities/pit => css/facilities}/pit.css (100%)
rename {src => css}/facilities/statistics.css (61%)
rename src/facilities/wardrobe/wardrobeShopping.css => css/facilities/wardrobe.css (100%)
delete mode 100644 src/gui/css/wardrobeUse.css
diff --git a/src/facilities/facilities.css b/css/facilities/facilities.css
similarity index 100%
rename from src/facilities/facilities.css
rename to css/facilities/facilities.css
diff --git a/src/facilities/farmyard/farmyard.css b/css/facilities/farmyard.css
similarity index 100%
rename from src/facilities/farmyard/farmyard.css
rename to css/facilities/farmyard.css
diff --git a/src/facilities/incubator/incubator.css b/css/facilities/incubator.css
similarity index 100%
rename from src/facilities/incubator/incubator.css
rename to css/facilities/incubator.css
diff --git a/src/facilities/nursery/nursery.css b/css/facilities/nursery.css
similarity index 69%
rename from src/facilities/nursery/nursery.css
rename to css/facilities/nursery.css
index f2276b59eea..b9de00814e2 100644
--- a/src/facilities/nursery/nursery.css
+++ b/css/facilities/nursery.css
@@ -1,5 +1,3 @@
-/* FEEL FREE TO MOVE */
-
.child-section {
margin-top: 1em;
margin-bottom: 1em;
diff --git a/src/facilities/pit/pit.css b/css/facilities/pit.css
similarity index 100%
rename from src/facilities/pit/pit.css
rename to css/facilities/pit.css
diff --git a/src/facilities/statistics.css b/css/facilities/statistics.css
similarity index 61%
rename from src/facilities/statistics.css
rename to css/facilities/statistics.css
index 91320c60544..092409605f4 100644
--- a/src/facilities/statistics.css
+++ b/css/facilities/statistics.css
@@ -1,46 +1,46 @@
-table.stats {
+table.facility-stats {
width: 100%;
padding-left: 20px;
padding-right: 20px;
}
-table.stats > tr.header {
+table.facility-stats > tr.header {
border-bottom: 2px solid white;
}
-table.stats > tr.total {
+table.facility-stats > tr.total {
border-top: 1px solid white;
}
-table.stats > tr > th.narrow {
+table.facility-stats > tr > th.narrow {
width: 10em;
text-align: right;
}
-table.stats > tr > th.wide {
+table.facility-stats > tr > th.wide {
width: 20em;
text-align: right;
}
-table.stats-slave {
+table.facility-stats-slave {
width: 100%;
font-size: 90%;
line-height: 110%;
}
-table.stats-slave > tr {
+table.facility-stats-slave > tr {
border-bottom: 1px solid #aaa;
border-left: none;
border-right: none;
border-top: none
}
-table.stats-slave > tr > th.narrow {
+table.facility-stats-slave > tr > th.narrow {
width: 11em;
text-align: right;
}
-table.stats-slave > tr > th.wide {
+table.facility-stats-slave > tr > th.wide {
width: 22em;
text-align: right;
}
@@ -52,4 +52,4 @@ td.value {
.decimalZero {
opacity: 0.3;
-}
\ No newline at end of file
+}
diff --git a/src/facilities/wardrobe/wardrobeShopping.css b/css/facilities/wardrobe.css
similarity index 100%
rename from src/facilities/wardrobe/wardrobeShopping.css
rename to css/facilities/wardrobe.css
diff --git a/src/facilities/statistics.js b/src/facilities/statistics.js
index 380e5499cf6..4d0af165db0 100644
--- a/src/facilities/statistics.js
+++ b/src/facilities/statistics.js
@@ -6,7 +6,7 @@ App.Facilities.StatsHelper = class {
makeStatsTable(columns) {
const table = document.createElement("table");
table.border = "1";
- table.className = "stats";
+ table.className = "facility-stats";
const header = App.UI.DOM.appendNewElement("tr", table, "", "header");
App.UI.DOM.appendNewElement("th", header, "Items"); // first column, flexible width
App.UI.DOM.appendNewElement("th", header, columns[0], "wide"); // "revenue" column, wider
@@ -155,7 +155,7 @@ App.Facilities.StatsHelper = class {
row.appendChild(bigCell);
const table = document.createElement("table");
- table.className = "stats-slave";
+ table.className = "facility-stats-slave";
const header = App.UI.DOM.appendNewElement("tr", table, "", "header");
App.UI.DOM.appendNewElement("th", header, columns[0]); // first column, flexible width
App.UI.DOM.appendNewElement("th", header, columns[1], "narrow"); // facility-specific output details
diff --git a/src/gui/css/wardrobeUse.css b/src/gui/css/wardrobeUse.css
deleted file mode 100644
index 94a110b434c..00000000000
--- a/src/gui/css/wardrobeUse.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Style sheet for WardrobeUse.tw */
-
-#passage-wardrobe-use .optionMacro {
- display: inline;
-}
-
-#passage-wardrobe-use .optionDescription {
- width: unset;
- text-align: left;
-}
-
-#passage-wardrobe-use .optionValue {
- display: flex;
-}
-
-#passage-wardrobe-use .optionMacroOption {
- flex-grow: 1;
-}
-
-/* Last line shouldn't grow */
-#passage-wardrobe-use .optionValue::after {
- flex-grow: 1000000000;
- content: '';
-}
--
GitLab