From 39d73d6c0dfb5c2f397f3b0b0126a52e6ca91d06 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Tue, 3 Mar 2020 21:12:17 +0100
Subject: [PATCH] add slave summary card style
---
src/003-assets/CSS/slaveList.css | 13 ++++++++-----
src/init/storyInit.tw | 1 +
src/js/slaveListing.js | 7 +++++--
src/uncategorized/BackwardsCompatibility.tw | 4 ++++
src/uncategorized/options.tw | 6 ++++++
src/uncategorized/summaryOptions.tw | 9 +++++----
6 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/003-assets/CSS/slaveList.css b/src/003-assets/CSS/slaveList.css
index c0750f9317c..02752b4df40 100644
--- a/src/003-assets/CSS/slaveList.css
+++ b/src/003-assets/CSS/slaveList.css
@@ -2,6 +2,14 @@ div.slaveSummary {
clear: both;
}
+div.slaveSummary.card {
+ border-radius: 8px;
+ background-color: #1a1a1a;
+ box-shadow: 10px 10px 5px black;
+ padding: 10px;
+ margin-bottom: 15px;
+}
+
/* slave summary paragraph when "see images" is enabled */
p.si {
margin-bottom: 0;
@@ -28,8 +36,3 @@ span.freeAssignment {
.strong {
font-weight: bold;
}
-
-.emphasizedSlave{
- font-weight: bold;
- text-decoration: underline;
-}
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 233a691ce57..ab6346d3e47 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -259,6 +259,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $seeMainFetishes = 0>>
<<set $seeSummaryImages = 1>>
<<set $seeReportImages = 1>>
+ <<set $slavePanelStyle = 1>>
<<set $lineSeparations = 1>>
<<set $showSexualHistory = 1>>
<<set $showBodyMods = 1>>
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 9e67529d96a..ceca76f49e0 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -78,6 +78,9 @@ App.UI.SlaveList.render = function() {
let slaveDiv = document.createElement("div");
slaveDiv.id = `slave-${slaves[_si].ID}`;
slaveDiv.classList.add("slaveSummary");
+ if (V.slavePanelStyle === 2) {
+ slaveDiv.classList.add("card");
+ }
slaveDiv.appendChild(ss);
res.appendChild(slaveDiv);
}
@@ -147,9 +150,9 @@ App.UI.SlaveList.render = function() {
*/
function renderSlave(index, interactionLink, showTransfers, postNote) {
let res = document.createDocumentFragment();
- if (V.lineSeparations === 0) {
+ if (V.slavePanelStyle === 0) {
res.appendChild(document.createElement("br"));
- } else {
+ } else if (V.slavePanelStyle === 1) {
const hr = document.createElement("hr");
hr.style.margin = "0";
res.appendChild(hr);
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index eb0992455e7..5e8cd896355 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3742,6 +3742,10 @@ Done<br>
<</if>>
<</if>>
+<<if ndef $slavePanelStyle>>
+ <<set $slavePanelStyle = $lineSeparations>>
+<</if>>
+
/* leave this at the bottom of BC */
<<if $releaseID < App.Version.release>>
<<set $releaseID = App.Version.release>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index d23f707e2f7..b45be0ef4db 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -240,6 +240,12 @@ This save was created using FC version $ver build $releaseID.
<</options>>
<</if>>
+ <<options $lineSeparations "Summary Options">>
+ Line separations are
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+ <</options>>
+
<div class="subHeading">
''Sidebar''
</div>
diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index 29632ae7eca..cec8d828caf 100644
--- a/src/uncategorized/summaryOptions.tw
+++ b/src/uncategorized/summaryOptions.tw
@@ -63,10 +63,11 @@ Sample summary:
App.UI.SlaveList.SlaveInteract.stdInteract
)>>
-<<options $lineSeparations "Summary Options">>
- Line separations are
- <<option 1 "Shown">>
- <<option 0 "Hidden">>
+<<options $slavePanelStyle "Summary Options">>
+ Panel style is
+ <<option 0 "None">>
+ <<option 1 "Line Seperators">>
+ <<option 2 "Card">>
<</options>>
<<options $abbreviateDevotion "Summary Options">>
--
GitLab