diff --git a/css/art/art.css b/css/art/art.css index 7aded08375ed079d414c11d5c52c4f454bcb7afd..2d16ae8b0131c95739adf8c2b1dc65ef5b3474f3 100644 --- a/css/art/art.css +++ b/css/art/art.css @@ -24,13 +24,13 @@ img { .tinyImg { border: 1px solid #333333; float: left; - height: 120px; - width: 120px; + height: 8em; + width: 8em; } .smlImg { - height: 150px; - width: 150px; + height: 10em; + width: 10em; float: left; } @@ -39,8 +39,8 @@ img { } .medImg { - height: 300px; - width: 300px; + height: 16em; + width: 16em; float: right; } @@ -49,53 +49,37 @@ img { } .lrgRender { - height: 531px; - width: 506px; - margin-right: -50px; - margin-left: 0px; + border: 2px solid #333333; float: right; + margin-left: 1em; + margin-top: 1em; + width: 33%; } .lrgVector { - height: 600px; - width: 600px; - margin-right: -125px; - margin-left: -125px; + border: 2px solid #333333; float: right; - z-index: -1; -} - -.lrgRender > div.mask { - width: 180px; - height: 100%; - background: linear-gradient(90deg, rgba(17, 17, 17, 1), rgba(17, 17, 17, 0.8) 60%, rgba(17, 17, 17, 0)); - z-index: 1; - /*position: absolute;*/ + height: 40em; + margin-left: 1em; + margin-top: 1em; + width: 33%; } .lrgRender > img, .lrgRender > video { - margin-left: -150px; - height: 531px; + height: 4em; width: auto; } -.lrgVector > div.mask { - width: 150px; - height: 100%; - background: linear-gradient(90deg, rgba(17, 17, 17, 1), rgba(17, 17, 17, 0.8) 60%, rgba(17, 17, 17, 0)); - z-index: 1; +.lrgRender > svg { + height: 40em; + position: relative; } .lrgVector > img, .lrgVector > video { - margin-left: -150px; - height: 600px; + height: 4em; width: auto; } -.lrgVector svg { - width: 336px; -} - object { object-fit: scale-down; position: absolute; diff --git a/src/events/eventUtils.js b/src/events/eventUtils.js index 8ff9b78990595f54d13b91c9af2dd6e42769df21..32f70e094a0391540a8800278193bde4f02fff04 100644 --- a/src/events/eventUtils.js +++ b/src/events/eventUtils.js @@ -63,10 +63,6 @@ App.Events.drawEventArt = (function() { (typeof slave !== "string" && slave.custom.image && slave.custom.image.filename !== "")) { let refDiv = document.createElement("div"); refDiv.classList.add("imageRef", V.imageChoice === 1 ? "lrgVector" : "lrgRender"); - let maskDiv = document.createElement("div"); - maskDiv.classList.add("mask"); - maskDiv.appendChild(document.createTextNode("\u00a0")); - refDiv.appendChild(maskDiv); if (slaves[0] === "assistant") { refDiv.appendChild(App.Art.assistantArt(3)); } else { diff --git a/src/gui/options/options.js b/src/gui/options/options.js index 9de3ecadb1fb061da1ec935a964346814a040965..38f0c8a7d5a50de9e5d74ac9342735b9b0ae3b34 100644 --- a/src/gui/options/options.js +++ b/src/gui/options/options.js @@ -977,7 +977,7 @@ App.Intro.contentAndFlavor = function(isIntro) { options.addOption("Extreme content like amputation is currently", "seeExtreme") .addValue("Enabled", 1).on().addValue("Disabled", 0).off() .addComment("Will not affect extreme surgeries already applied in-game."); - + options.addOption("Permanent stretching of holes is currently", "seeStretching") .addValue("Enabled", 1).on().addValue("Disabled", 0).off() .addComment("Will not affect holes already stretched."); diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index 00579a2be8bc769cb7a79019230f2ea71c7686b9..8d1fd7184d7ce6f089baf01ae02b4fa656d04c91 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -883,14 +883,14 @@ App.UI.SlaveSummary = function() { } } - function settingsChanged(newState) { + function settingsChanged(newState = V) { try { const newStateIsOK = newState && newState.hasOwnProperty("UI") && newState.UI.hasOwnProperty("slaveSummary"); const settingsObj = newStateIsOK ? newState.UI.slaveSummary : V.UI.slaveSummary; initDelegates(settingsObj); - App.UI.SlaveSummaryImpl.helpers.syncFSData(newState ? newState.arcologies[0] : V.arcologies[0]); - App.Art.setDynamicCSS(newState ? newState : V); + App.UI.SlaveSummaryImpl.helpers.syncFSData(newState.arcologies[0]); + App.Art.setDynamicCSS(newState); } catch (ex) { console.log(`Slave summary settings change handler encountered an error: ${ex}`); }