From 37a3eed602fd58b416a113039c03ab29287592f0 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Mon, 11 Mar 2019 00:00:04 -0400
Subject: [PATCH] CSS image display column fixes
---
devNotes/twine CSS | 9 ++++++++
src/gui/css/mainStyleSheet.tw | 9 ++++++++
src/uncategorized/RESS.tw | 34 ++++++++++++++++------------
src/uncategorized/seWeddingTriple.tw | 18 ++++++++-------
4 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/devNotes/twine CSS b/devNotes/twine CSS
index 2e3bf033493..4a03614a078 100644
--- a/devNotes/twine CSS
+++ b/devNotes/twine CSS
@@ -31,6 +31,15 @@ img {
text-indent: -10000px;
}
+.imageColumn {
+ display: flex;
+ flex-direction: column;
+ flex-wrap: wrap;
+ align-items: flex-start;
+ position: relative;
+ float: right;
+}
+
.imageRef {
display: flex;
flex-direction: column;
diff --git a/src/gui/css/mainStyleSheet.tw b/src/gui/css/mainStyleSheet.tw
index ada4f930d6a..e948682e8db 100644
--- a/src/gui/css/mainStyleSheet.tw
+++ b/src/gui/css/mainStyleSheet.tw
@@ -31,6 +31,15 @@ img {
text-indent: -10000px;
}
+.imageColumn {
+ display: flex;
+ flex-direction: column;
+ flex-wrap: wrap;
+ align-items: flex-start;
+ position: relative;
+ float: right;
+}
+
.imageRef {
display: flex;
flex-direction: column;
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index df4aea1cd07..40c313b7269 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -105,18 +105,20 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
+ <div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _newSlaves[2] 2 0>>
+ <<SlaveArt $activeSlave 2 0>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _newSlaves[1] 2 0>>
+ <<SlaveArt _newSlaves[0] 2 0>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _newSlaves[0] 2 0>>
+ <<SlaveArt _newSlaves[1] 2 0>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<SlaveArt _newSlaves[2] 2 0>>
</div>
+ </div>
<</if>>
/* 000-250-006 */
</span>
@@ -17398,17 +17400,19 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt _newSlaves[2] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt _newSlaves[1] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt _newSlaves[0] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _newSlaves[0] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _newSlaves[1] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _newSlaves[2] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/seWeddingTriple.tw b/src/uncategorized/seWeddingTriple.tw
index 67474090048..f82e55b3b6f 100644
--- a/src/uncategorized/seWeddingTriple.tw
+++ b/src/uncategorized/seWeddingTriple.tw
@@ -14,14 +14,16 @@
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt _slave3 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt _slave2 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt _slave1 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt _slave1 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _slave2 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _slave3 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
--
GitLab