diff --git a/css/bladeburner.scss b/css/bladeburner.scss index 149a5d0cf..0f25aa194 100644 --- a/css/bladeburner.scss +++ b/css/bladeburner.scss @@ -1,9 +1,11 @@ +@import "theme"; + #bladeburner-container p, #bladeburner-container pre, #bladeburner-container a, #bladeburner-container div, #bladeburner-container td { - font-size: 13px; + font-size: $defaultFontSize * 0.8125; } .bladeburner-action { @@ -76,7 +78,7 @@ margin: 0 !important; border: 0; background-color: var(--my-background-color); - font-size: 13px; + font-size: $defaultFontSize * 0.8125; outline: none; color: var(--my-font-color); flex: 1 1 auto; diff --git a/css/companymanagement.scss b/css/companymanagement.scss index 11f9584cd..8bb991d8a 100644 --- a/css/companymanagement.scss +++ b/css/companymanagement.scss @@ -1,9 +1,10 @@ @import "mixins"; +@import "theme"; #cmpy-mgmt-container p, #cmpy-mgmt-container a, #cmpy-mgmt-container div { - font-size: 13px; + font-size: $defaultFontSize * 0.8125; } /* Header tabs */ @@ -120,10 +121,14 @@ margin: 2px; padding: 6px; border-radius: 25px; - font-size: "12px"; + font-size: $defaultFontSize * 0.75; color: var(--my-font-color); } .cmpy-mgmt-upgrade-div:hover { background-color: #333; } + +.cmpy-mgmt-advertising-info { + font-size: $defaultFontSize * 0.75; +} diff --git a/css/interactivetutorial.scss b/css/interactivetutorial.scss index 5bf8fc363..698d5e7c8 100644 --- a/css/interactivetutorial.scss +++ b/css/interactivetutorial.scss @@ -1,4 +1,5 @@ @import "mixins"; +@import "theme"; /* interactivetutorial.css */ #interactive-tutorial-wrapper { @@ -37,7 +38,7 @@ @include boxShadow(1px 1px 3px #000); color: #aaa; - font-size: 20px; + font-size: $defaultFontSize * 1.25; font-weight: bold; background-color: #000; } diff --git a/css/loader.scss b/css/loader.scss index 6e4cb12b1..08a28be91 100644 --- a/css/loader.scss +++ b/css/loader.scss @@ -1,5 +1,6 @@ @import "mixins"; @import "reset"; +@import "theme"; @include keyframes(LOADERSPINNER) { 0% { @@ -86,7 +87,7 @@ text-transform: uppercase; font-family: sans-serif; - font-size: 22px; + font-size: $defaultFontSize * 1.375; font-weight: 700; letter-spacing: 2px; position: absolute; diff --git a/css/menupages.scss b/css/menupages.scss index 05cf3d6e4..46319be74 100644 --- a/css/menupages.scss +++ b/css/menupages.scss @@ -46,7 +46,7 @@ } .ace_text-input { - font-size: 16px; + font-size: $defaultFontSize; background-color: transparent; } @@ -129,7 +129,7 @@ margin-top: 8px; margin-bottom: 8px; padding: 2px; - font-size: 12px; + font-size: $defaultFontSize * 0.75; } /* Active scripts */ @@ -151,7 +151,7 @@ .active-scripts-server-header { background-color: #444; - font-size: 20px; + font-size: $defaultFontSize * 1.25; color: #fff; margin: 6px 6px 0 6px; padding: 6px; @@ -173,7 +173,7 @@ .active-scripts-server-header:after { content: '\02795'; /* "plus" sign (+) */ - font-size: 13px; + font-size: $defaultFontSize * 0.8125; color: #fff; float: right; margin-left: 5px; @@ -181,7 +181,7 @@ .active-scripts-server-header.active:after { content: "\2796"; /* "minus" sign (-) */ - font-size: 13px; + font-size: $defaultFontSize * 0.8125; color: #fff; float: right; margin-left: 5px; @@ -224,7 +224,7 @@ .active-scripts-script-header:after { content: '\02795'; /* "plus" sign (+) */ - font-size: 13px; + font-size: $defaultFontSize * 0.8125; color: var(--my-font-color); float: right; margin-left: 5px; @@ -232,7 +232,7 @@ .active-scripts-script-header.active:after { content: "\2796"; /* "minus" sign (-) */ - font-size: 13px; + font-size: $defaultFontSize * 0.8125; color: var(--my-font-color); float: right; margin-left: 5px; @@ -261,7 +261,7 @@ @include boxShadow(1px 1px 3px #000); color: #aaa; - font-size: 16px; + font-size: $defaultFontSize; font-weight: bold; margin: 4px; padding: 4px; @@ -343,7 +343,7 @@ display: inline-block; margin: 0 4px; /* Don't want the vertical margin/padding, just left & right */ padding: 0 4px; - width: 48px; /* Four times font-size */ + width: $defaultFontSize * 4; } .menu-page-text { diff --git a/css/missions.scss b/css/missions.scss index 33cb170d3..52ffc47c9 100644 --- a/css/missions.scss +++ b/css/missions.scss @@ -1,4 +1,6 @@ @import "mixins"; +@import "theme"; + /* css for Missions */ /* Hacking missions */ @@ -33,7 +35,7 @@ .hack-mission-node p { margin-top: 8px; color: #fff; - font-size: 12px; + font-size: $defaultFontSize * 0.75; text-align: center; -webkit-user-select: none; -moz-user-select: none; @@ -80,7 +82,7 @@ -moz-transform: skew(-20deg); -o-transform: skew(-20deg); color: #fff; - font-size: 12px; + font-size: $defaultFontSize * 0.75; margin-top: 8px; text-align: center; -webkit-user-select: none; @@ -102,7 +104,7 @@ -moz-transform: skew(20deg); -o-transform: skew(20deg); color: #fff; - font-size: 12px; + font-size: $defaultFontSize * 0.75; margin-top: 8px; text-align: center; -webkit-user-select: none; diff --git a/css/popupboxes.scss b/css/popupboxes.scss index 1ce9acf69..31ea500b6 100644 --- a/css/popupboxes.scss +++ b/css/popupboxes.scss @@ -1,4 +1,6 @@ @import "mixins"; +@import "theme"; + /* Pop-up boxes */ .popup-box-container { display: none; /* Hidden by default */ @@ -25,7 +27,7 @@ .popup-box-button-inactive { color: #aaa; float: right; - font-size: 16px; + font-size: $defaultFontSize; font-weight: bold; padding: 2px; margin: 6px; @@ -80,7 +82,7 @@ float: right; color: #aaa; - font-size: 20px; + font-size: $defaultFontSize * 1.25; font-weight: bold; } @@ -160,7 +162,7 @@ float: right; margin: 4px; padding: 4px; - font-size: 20px; + font-size: $defaultFontSize * 1.25; font-weight: bold; } diff --git a/css/styles.scss b/css/styles.scss index 801b2d58c..75b051143 100644 --- a/css/styles.scss +++ b/css/styles.scss @@ -108,7 +108,7 @@ tr:focus { /* Plus and minus signs */ .mainmenu-accordion-header:after { content: '\02795'; - font-size: 13px; + font-size: $defaultFontSize * 0.8125; color: #fff; float: right; margin-left: 5px; @@ -219,7 +219,7 @@ a:visited { position: relative; } #create-program-notification { - font-size: 10px; + font-size: $defaultFontSize * 0.625; position: absolute; /* Position the badge within the relatively positioned button */ top: 0; @@ -413,7 +413,7 @@ a:visited { } #status-text { - font-size: 20px; + font-size: $defaultFontSize * 1.25; color: #fff; right: 0; bottom: 0; @@ -455,7 +455,7 @@ a:visited { @include boxShadow(1px 1px 3px #000); color: #aaa; - font-size: 14px; + font-size: $defaultFontSize * 0.875; font-weight: bold; height: 22px; background-color: #000; @@ -487,7 +487,7 @@ a:visited { /* Accordion menus (Header with collapsible panel) */ .accordion-header { background-color: #444; - font-size: 20px; + font-size: $defaultFontSize * 1.25; color: #fff; margin: 6px 6px 0 6px; padding: 6px; @@ -509,7 +509,7 @@ a:visited { .accordion-header:after { content: '\02795'; /* "plus" sign (+) */ - font-size: 13px; + font-size: $defaultFontSize * 0.8125; color: #fff; float: right; margin-left: 5px; @@ -517,7 +517,7 @@ a:visited { .accordion-header.active:after { content: "\2796"; /* "minus" sign (-) */ - font-size: 13px; + font-size: $defaultFontSize * 0.8125; color: #fff; float: right; margin-left: 5px; diff --git a/css/terminal.scss b/css/terminal.scss index 54da4e75e..ac26b9b3d 100644 --- a/css/terminal.scss +++ b/css/terminal.scss @@ -1,3 +1,5 @@ +@import "theme"; + #terminal-container { position: fixed; margin-left: 10%; @@ -12,7 +14,7 @@ padding-left: 10px; height: auto; width: 70%; - font-size: 16px; + font-size: $defaultFontSize; overflow: auto; overflow-y: scroll; background-color: var(--my-background-color); @@ -31,7 +33,7 @@ margin: 0 !important; border: 0; background-color: var(--my-background-color); - font-size: 16px; + font-size: $defaultFontSize; outline: none; color: var(--my-font-color); } diff --git a/css/workinprogress.scss b/css/workinprogress.scss index 2ba988ad4..c48fd7541 100644 --- a/css/workinprogress.scss +++ b/css/workinprogress.scss @@ -1,4 +1,6 @@ @import "mixins"; +@import "theme"; + /* Both Work in progress and BitNode stuff */ .generic-fullscreen-container { color: var(--my-font-color); @@ -22,7 +24,7 @@ color: #aaa; float: left; - font-size: 20px; + font-size: $defaultFontSize * 1.25; font-weight: bold; margin: 10px; padding: 5px; diff --git a/src/CompanyManagement.js b/src/CompanyManagement.js index 18eaf4beb..0941be05c 100644 --- a/src/CompanyManagement.js +++ b/src/CompanyManagement.js @@ -4736,7 +4736,7 @@ Corporation.prototype.updateDivisionContent = function(division) { var totalAdvertisingFac = advertisingFactors[0]; advertisingInfo = "
Advertising Multiplier: x" + formatNumber(totalAdvertisingFac, 3) +
- "Total multiplier for this industry's sales due to its awareness and popularity
" +
+ "Total multiplier for this industry's sales due to its awareness and popularity
" +
"Awareness Bonus: x" + formatNumber(Math.pow(awarenessFac, 0.85), 3) + "
" +
"Popularity Bonus: x" + formatNumber(Math.pow(popularityFac, 0.85), 3) + "
" +
"Ratio Multiplier: x" + formatNumber(Math.pow(ratioFac, 0.85), 3) + "