From b2b1724885270c24b7107cc2e9ccbd3559cb0e8a Mon Sep 17 00:00:00 2001 From: Daniel Xie Date: Sun, 21 May 2017 00:39:18 -0500 Subject: [PATCH] Small UI changes --- css/menupages.css | 19 ++++++++++++------- css/styles.css | 2 +- src/Faction.js | 6 ++++-- src/Player.js | 2 +- utils/StringHelperFunctions.js | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/css/menupages.css b/css/menupages.css index 89b375388..73217ba4f 100644 --- a/css/menupages.css +++ b/css/menupages.css @@ -119,7 +119,7 @@ .active-scripts-list > li { margin: 6px; - width: 80%; + width: 70%; } .active-scripts-list>li h2{ @@ -166,7 +166,7 @@ #hacknet-nodes-money-multipliers-div { display: inline-block; - width: 80%; + width: 70%; } #hacknet-nodes-multipliers { @@ -281,7 +281,7 @@ #faction-securitywork-div, #faction-donate-div { overflow: hidden; - width: 80%; + width: 70%; height: 100%; } @@ -320,7 +320,7 @@ div.faction-clear { #faction-container p { padding: 6px; margin: 6px; - width: 80%; + width: 70%; } /* Faction Augmentations */ @@ -342,6 +342,11 @@ div.faction-clear { padding: 4px; } +#faction-augmentations-list > li{ + margin: 4px; + padding: 4px; +} + /* World */ #world-container li { margin: 0 0 15px 0; @@ -361,7 +366,7 @@ div.faction-clear { } #augmentations-list li { - width: 80%; + width: 70%; background-color: #333; } @@ -370,7 +375,7 @@ div.faction-clear { margin: 4px; color: #66ff33; padding: 8px; - width: 80%; + width: 70%; background-color: #333; text-decoration: none; } @@ -407,7 +412,7 @@ div.faction-clear { } #location-slums-description { - width: 80%; + width: 70%; margin: 10px; } diff --git a/css/styles.css b/css/styles.css index f0dedbd09..04001bbcb 100644 --- a/css/styles.css +++ b/css/styles.css @@ -240,7 +240,7 @@ tr:focus { position: absolute; /* Stay in place */ right: 0; top: 0; - height: 250px; /* Full height */ + height: 150px; /* Full height */ /*margin: 50% auto;*/ padding: 5px; border: 2px solid #66ff33; diff --git a/src/Faction.js b/src/Faction.js index fb6107ab2..cafa4a137 100644 --- a/src/Faction.js +++ b/src/Faction.js @@ -607,6 +607,7 @@ displayFactionContent = function(factionName) { faction.playerReputation += repGain; dialogBoxCreate("You just donated $" + formatNumber(numMoneyDonate, 2) + " to " + faction.name + " to gain " + formatNumber(repGain, 3) + " reputation"); + displayFactionContent(factionName); } else { dialogBoxCreate("Invalid amount entered!"); } @@ -822,12 +823,13 @@ displayFactionAugmentations = function(factionName) { pElem.innerHTML = "LOCKED (Requires " + formatNumber(req, 4) + " faction reputation)"; pElem.style.color = "red"; } - aElem.style.display = "inline-block"; - pElem.style.display = "inline-block"; + aElem.style.display = "inline"; + pElem.style.display = "inline"; aElem.innerHTML = aug.name; if (aug.name == AugmentationNames.NeuroFluxGovernor) { aElem.innerHTML += " - Level " + (aug.level + 1); } + span.style.display = "inline-block" aElem.innerHTML += '' + aug.info + " "; diff --git a/src/Player.js b/src/Player.js index f2121f81c..494c0b0b4 100644 --- a/src/Player.js +++ b/src/Player.js @@ -838,7 +838,7 @@ PlayerObject.prototype.startCreateProgramWork = function(programName, time, reqL var timeMultiplier = (CONSTANTS.MaxSkillLevel - (this.hacking_skill - reqLevel)) / CONSTANTS.MaxSkillLevel; if (timeMultiplier > 1) {timeMultiplier = 1;} if (timeMultiplier < 0.01) {timeMultiplier = 0.01;} - this.timeNeededToCompleteWork = timeMultiplier & time; + this.timeNeededToCompleteWork = timeMultiplier * time; this.createProgramName = programName; diff --git a/utils/StringHelperFunctions.js b/utils/StringHelperFunctions.js index 6cb799307..73319a473 100644 --- a/utils/StringHelperFunctions.js +++ b/utils/StringHelperFunctions.js @@ -47,7 +47,7 @@ function convertTimeMsToTimeElapsedString(time) { if (days) {res += days + " days ";} if (hours) {res += hours + " hours ";} if (minutes) {res += minutes + " minutes ";} - if (seconds) {res += seconds + " seconds ";} + res += seconds + " seconds "; return res; }