diff --git a/devNotes/twine CSS b/devNotes/twine CSS
index 39e646cedfe25ebed9c196a0f0c18c6c75cd2f93..ddf1b25561a2705ef105aa96a5e21e63d645e6e6 100644
--- a/devNotes/twine CSS
+++ b/devNotes/twine CSS
@@ -1,5 +1,3 @@
-/*:: Main stylesheet [stylesheet]*/
-
body {
overflow-x: hidden;
}
@@ -304,7 +302,6 @@ white-space: normal;
}
.rajs-section h1:hover { text-decoration: underline; }
-/*:: accordionStyleSheet [stylesheet]*/
/* Accordion 000-250-006 */
button.accordion {
@@ -389,87 +386,6 @@ div.accordion.active:before {
content: "\2212";
}
-/* begin efmCSS */
-
-#graph .linage {
- fill: none;
- stroke: white;
-}
-#graph .marriage {
- fill: none;
- stroke: white;
-}
-#graph .node {
- background-color: lightblue;
- border-style: solid;
- border-width: 1px;
-}
-#graph .nodeText{
- font: 10px sans-serif;
- margin: 0;
- padding: 0;
- color: black;
-}
-#graph {
- font: 10px sans-serif;
- margin: -20px 0;
- padding: 0;
- color: black;
-}
-
-#graph div {
- border-style: solid;
- border-width: 1px;
-}
-
-#graph .XY {
- background-color: lightblue;
-}
-
-#graph div.XX {
- background-color: pink;
-}
-
-#graph div.unknown {
- background-color: gray;
-}
-
-#graph div.unknownXY {
- background-color: #808080;
-}
-
-#graph div.unknownXX {
- background-color: #808080;
-}
-
-#graph .you {
- background-color: red;
-}
-
-#graph .emphasis {
- font-style: italic;
- font-weight: bold;
- margin: 0;
- background: #ffffff88;
- border: 2px solid Gold;
- white-space: nowrap;
-}
-
-#editFamily {
- display: flex;
- flex-wrap: wrap;
- align-items: center;
-}
-
-#editFamily #familyTable {
-}
-
-/* end extended family css */
-
-config.history.tracking = false;
-
-/*:: Quick List stylesheet [stylesheet]*/
-
.hidden
{
display:none;
@@ -572,60 +488,6 @@ div.quicklist button
white-space: nowrap;
}
-div.tab {
- overflow: hidden;
-}
-
-div.tab button {
- background-color: #252525;
- border: solid 2px #252525;
- color: #68d;
- float: left;
- outline: none;
- cursor: pointer;
- padding: 1ex 1ex;
- transition: 0.3s;
- font-size: large;
-}
-
-div.tab button:hover {
- background-color: #414141;
-}
-
-div.tab button.active {
- background-color: #050505;
- color: #c7cedf;
-}
-
-.tabcontent {
- display: none;
- padding: 6px 12px;
- -webkit-animation: fadeEffect 1s;
- animation: fadeEffect 1s;
-}
-
-@-webkit-keyframes fadeEffect {
- from {
- opacity: 0;
- }
-
- to {
- opacity: 1;
- }
-}
-
-@keyframes fadeEffect {
- from {
- opacity: 0;
- }
-
- to {
- opacity: 1;
- }
-}
-
-/*:: Options Macro [stylesheet]*/
-
.optionMacro {
margin-top: 8px;
display: inline-block;
@@ -691,6 +553,14 @@ div.tab button.active {
background: #2F2F2F;
}
+body.lightTheme .optionMacroOption:hover {
+ background: #DDDDDD;
+}
+
+body.lightTheme .optionMacroSelected {
+ background: #DDDDDD;
+}
+
.optionMacroSelected {
background: #2F2F2F;
padding: 0 10px;
@@ -738,3 +608,102 @@ div.tab button.active {
color: rgb(255,240,240);
background-image: linear-gradient(rgba(255, 100, 0, 0.2), transparent);
}
+
+/* Stylesheet 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: '';
+}
+
+
+#graph .linage {
+ fill: none;
+ stroke: white;
+}
+#graph .marriage {
+ fill: none;
+ stroke: white;
+}
+#graph .node {
+ background-color: lightblue;
+ border-style: solid;
+ border-width: 1px;
+}
+#graph .nodeText{
+ font: 10px sans-serif;
+ margin: 0;
+ padding: 0;
+ color: black;
+}
+#graph {
+ font: 10px sans-serif;
+ margin: -20px 0;
+ padding: 0;
+ color: black;
+}
+
+#graph div {
+ border-style: solid;
+ border-width: 1px;
+}
+
+#graph .XY {
+ background-color: lightblue;
+}
+
+#graph div.XX {
+ background-color: pink;
+}
+
+#graph div.unknown {
+ background-color: gray;
+}
+
+#graph div.unknownXY {
+ background-color: #808080;
+}
+
+#graph div.unknownXX {
+ background-color: #808080;
+}
+
+#graph .you {
+ background-color: red;
+}
+
+#graph .emphasis {
+ font-style: italic;
+ font-weight: bold;
+ margin: 0;
+ background: #ffffff88;
+ border: 2px solid Gold;
+ white-space: nowrap;
+}
+
+#editFamily {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+}
+
+#editFamily #familyTable {
+}
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 66371b1f32683a11d85887c481ecf2f4a25a165a..dd1aa2ded71cb24cb9659037d7a04cf2194e4fab 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2572,7 +2572,7 @@ LORE: INTERVIEWS
<br>''Unknown modder'' who did betterRA mod for old 0.9.5.4 version of original FC.
<br>''brpregmodfan'' for Brazilian start and slave gen.
<br>''fcanon'' for various fixes, massive improvements to the RA and wrangling my inabilty to spll gud.
- <br>''stuffedgameanon'' for fixes, streamlining the starting girls family code, family trees, unbelievable improvements to the games functionality, the sanityChecker, a tag checker and above ALL else; Improving the game's speed by an obscene amount. I swear this guy is a wizard.
+ <br>''stuffedgameanon'' for fixes, streamlining the starting girls family code, family trees, unbelievable improvements to the games functionality, the sanityChecker, a tag checker and above ALL else; Improving the game's speed by an obscene amount. I swear this guy is a wizard. Now overhauling the UI as well.
<br>''anon'' for a prototype foot job scene.
<br>''Preglocke'' for cleaning and expanding the foot job scene and various little content additions and corrections.
<br>''anon'' for writing forced marriages, extra escape outcomes, new recruits and events, a story for FCTV and more player refreshment types.
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 76cfb114020445baff089da27d85db9d5afb55c0..248f709dad03795bf452437f56fd7333ba3b3335 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -420,7 +420,7 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<<set _fathers.push("your own design")>>
<<elseif $slaves[$i].curBabies[_seb].fatherID == -8>>
<<set _fathers.push("one of your animals")>>
- <<elseif $slaves[$i].curBabies[_cb].fatherID == -9>>
+ <<elseif $slaves[$i].curBabies[_seb].fatherID == -9>>
<<set _fathers.push("a Futanari Sister")>>
<<else>>
<<set _babyDaddy = findFather($slaves[$i].curBabies[_seb].fatherID)>>