From cd133767cddc123255655d7e025f65f4e0184bed Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Wed, 4 Mar 2020 12:31:53 +0100
Subject: [PATCH] make no special role selected it's own card
---
src/003-assets/CSS/slaveList.css | 2 +-
src/003-assets/CSS/tabs.css | 2 +-
src/js/slaveListing.js | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/003-assets/CSS/slaveList.css b/src/003-assets/CSS/slaveList.css
index 02752b4df40..27f1b25dc41 100644
--- a/src/003-assets/CSS/slaveList.css
+++ b/src/003-assets/CSS/slaveList.css
@@ -2,7 +2,7 @@ div.slaveSummary {
clear: both;
}
-div.slaveSummary.card {
+.slaveSummary.card {
border-radius: 8px;
background-color: #1a1a1a;
box-shadow: 10px 10px 5px black;
diff --git a/src/003-assets/CSS/tabs.css b/src/003-assets/CSS/tabs.css
index 1cccf03dbc5..1f972210d69 100644
--- a/src/003-assets/CSS/tabs.css
+++ b/src/003-assets/CSS/tabs.css
@@ -54,7 +54,7 @@ div.tabbar a.active {
}
-.tabcontent.card div.slaveSummary.card {
+.tabcontent.card .slaveSummary.card {
background-color: #252525;
}
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 8da0cfa2537..86c88009eea 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -829,6 +829,7 @@ App.UI.SlaveList.penthousePage = function() {
slaveWrapper.append(". ", App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Select One", "HG Select"), "major-link"),
" ", App.UI.DOM.makeElement("span", "[H]", "hotkey"));
slaveWrapper.id = "manageHG";
+ slaveWrapper.classList.add("slaveSummary", "card");
} else {
slaveWrapper.append("You do not have enough slaves to keep a Head Girl");
slaveWrapper.classList.add("note");
@@ -865,6 +866,7 @@ App.UI.SlaveList.penthousePage = function() {
App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Select one", "Recruiter Select"), "major-link"),
" ", App.UI.DOM.makeElement("span", "[U]", "hotkey"));
slaveWrapper.id = "manageRecruiter";
+ slaveWrapper.classList.add("slaveSummary", "card");
}
fragment.append(slaveWrapper);
@@ -880,16 +882,15 @@ App.UI.SlaveList.penthousePage = function() {
slaveWrapper.append(link, " ", App.UI.DOM.makeElement("span", "[B]", "hotkey"));
slaveWrapper.append(App.UI.SlaveList.render.listDOM([App.Utils.slaveIndexForId(BG.ID)], [],
App.UI.SlaveList.SlaveInteract.penthouseInteract));
+ slaveWrapper.append(App.MainView.useGuard());
} else {
slaveWrapper.append("You have ", App.UI.DOM.makeElement("span", "not", "warning"), " selected a Bodyguard. ",
App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Select one", "BG Select"), "major-link"),
" ", App.UI.DOM.makeElement("span", "[B]", "hotkey"));
slaveWrapper.id = "manageBG";
+ slaveWrapper.classList.add("slaveSummary", "card");
}
- if (BG && BG.assignment === "guard you") {
- slaveWrapper.append(App.MainView.useGuard());
- }
fragment.append(slaveWrapper);
}
return fragment;
--
GitLab