From 1b3eeb53ac36dffaf0442ffb7a7a0a90cff727c8 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Sun, 27 Dec 2020 20:38:47 +0100
Subject: [PATCH] Move layout from mainStyleSheet.css styles in CSS module
---
css/general/layout.css | 36 +++++++++++++++++++++++++
src/gui/css/mainStyleSheet.css | 41 -----------------------------
src/interaction/prostheticConfig.tw | 2 +-
src/js/main.js | 2 +-
4 files changed, 38 insertions(+), 43 deletions(-)
create mode 100644 css/general/layout.css
diff --git a/css/general/layout.css b/css/general/layout.css
new file mode 100644
index 00000000000..ffadcad8a73
--- /dev/null
+++ b/css/general/layout.css
@@ -0,0 +1,36 @@
+h1, h2, h3 {
+ margin-bottom: 0;
+ margin-top: 0.25em;
+}
+
+h1 + p, h2 + p, h3 + p {
+ margin-top: 0;
+}
+
+div.center, p.center {
+ margin-left: auto;
+ margin-right: auto;
+ text-align: center;
+}
+
+div.flex-container {
+ display: flex;
+}
+
+/* makes the first line indented */
+div.indent, p.indent {
+ text-indent: 2em;
+}
+
+div.double-indent, p.double-indent {
+ text-indent: 4em;
+}
+
+/* makes avery linue indented */
+div.choices, p.choices {
+ margin-left: 2em;
+}
+
+div.double-choices, p.double-choices {
+ margin-left: 4em;
+}
diff --git a/src/gui/css/mainStyleSheet.css b/src/gui/css/mainStyleSheet.css
index 9f87b50bef3..3881f1dedf7 100644
--- a/src/gui/css/mainStyleSheet.css
+++ b/src/gui/css/mainStyleSheet.css
@@ -1,35 +1,14 @@
div.output{
-width: 100%;
width: 100vw;
max-width: 100%;
word-break: break-all;
white-space: normal;
}
-h1, h2, h3 {
- margin-bottom: 0;
- margin-top: 0.25em;
-}
-.tab {
- margin-left: 2em;
-}
div.slave-report {
margin-top: 1em;
margin-bottom: 1em;
}
-div.indent, p.indent {
- text-indent: 2em;
-}
-div.double-indent, p.double-indent {
- text-indent: 4em;
-}
-div.choices, p.choices {
- margin-left: 2em;
-}
-div.double-choices, p.double-choices {
- margin-left: 4em;
-}
-
/* setting at the beginning of a scene / subscene */
.scene-intro {
font-style: italic;
@@ -72,16 +51,6 @@ div.cheat-menu {
right: 50px;
}
-h1 + p {
- margin-top: 0;
-}
-h2 + p {
- margin-top: 0;
-}
-h3 + p {
- margin-top: 0;
-}
-
.main-fcnn {
text-align: center;
margin: 0 auto;
@@ -102,16 +71,6 @@ h3 + p {
color: red;
}
-div.center, p.center {
- margin-left: auto;
- margin-right: auto;
- text-align: center;
-}
-
-div.flex-container {
- display: flex;
-}
-
/* TODO unify tooltip systems */
.hasTooltip {
text-decoration: underline;
diff --git a/src/interaction/prostheticConfig.tw b/src/interaction/prostheticConfig.tw
index 4326995e273..d6dade1c2a8 100644
--- a/src/interaction/prostheticConfig.tw
+++ b/src/interaction/prostheticConfig.tw
@@ -32,7 +32,7 @@ This room is lined with shelves and cabinets; it could be easily mistaken for a
<<if hasAnyCyberneticEyes(getSlave($AS))>>
<h2>Eyes</h2>
- <p class="tab"> /* tab works better with links */
+ <p class="choices"> /* tab works better with links */
$He has <<if hasBothCyberneticEyes(getSlave($AS))>> ocular implants <<else>> an ocular implant <</if>> installed. You can change <<if hasBothCyberneticEyes(getSlave($AS))>>their<<else>>its<</if>> settings:
<div class="eyeContainer">
diff --git a/src/js/main.js b/src/js/main.js
index 750d3268627..30f15ec034f 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -225,7 +225,7 @@ App.MainView.full = function() {
div.append(App.UI.DOM.makeElement("span", "MAIN MENU", "name"));
App.UI.DOM.appendNewElement("span", div, App.UI.DOM.passageLink("Summary Options", "Summary Options"),
- ["tab", "note"]);
+ ["choices", "note"]);
if (V.rulesAssistantMain !== 0) {
div.append(" | ");
--
GitLab