Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-21 13:45:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[refactor] Converting all font-size to be based on $defaultFontSize

Browse Source
This commit is contained in:
Steven Evans 2018-07-16 23:59:25 -04:00
parent 2afed92c82
commit 681401b7b0
11 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/bladeburner.scss
View File

@ -1,9 +1,11 @@
@import "theme";
#bladeburner-container p, #bladeburner-container p,
#bladeburner-container pre, #bladeburner-container pre,
#bladeburner-container a, #bladeburner-container a,
#bladeburner-container div, #bladeburner-container div,
#bladeburner-container td { #bladeburner-container td {
font-size: 13px; font-size: $defaultFontSize * 0.8125;
} }
.bladeburner-action { .bladeburner-action {
@ -76,7 +78,7 @@
margin: 0 !important; margin: 0 !important;
border: 0; border: 0;
background-color: var(--my-background-color); background-color: var(--my-background-color);
font-size: 13px; font-size: $defaultFontSize * 0.8125;
outline: none; outline: none;
color: var(--my-font-color); color: var(--my-font-color);
flex: 1 1 auto; flex: 1 1 auto;

9
css/companymanagement.scss
View File

@ -1,9 +1,10 @@
@import "mixins"; @import "mixins";
@import "theme";
#cmpy-mgmt-container p, #cmpy-mgmt-container p,
#cmpy-mgmt-container a, #cmpy-mgmt-container a,
#cmpy-mgmt-container div { #cmpy-mgmt-container div {
font-size: 13px; font-size: $defaultFontSize * 0.8125;
} }
/* Header tabs */ /* Header tabs */
@ -120,10 +121,14 @@
margin: 2px; margin: 2px;
padding: 6px; padding: 6px;
border-radius: 25px; border-radius: 25px;
font-size: "12px"; font-size: $defaultFontSize * 0.75;
color: var(--my-font-color); color: var(--my-font-color);
} }
.cmpy-mgmt-upgrade-div:hover { .cmpy-mgmt-upgrade-div:hover {
background-color: #333; background-color: #333;
} }
.cmpy-mgmt-advertising-info {
font-size: $defaultFontSize * 0.75;
}

3
css/interactivetutorial.scss
View File

@ -1,4 +1,5 @@
@import "mixins"; @import "mixins";
@import "theme";
/* interactivetutorial.css */ /* interactivetutorial.css */
#interactive-tutorial-wrapper { #interactive-tutorial-wrapper {
@ -37,7 +38,7 @@
@include boxShadow(1px 1px 3px #000); @include boxShadow(1px 1px 3px #000);
color: #aaa; color: #aaa;
font-size: 20px; font-size: $defaultFontSize * 1.25;
font-weight: bold; font-weight: bold;
background-color: #000; background-color: #000;
} }

3
css/loader.scss
View File

@ -1,5 +1,6 @@
@import "mixins"; @import "mixins";
@import "reset"; @import "reset";
@import "theme";
@include keyframes(LOADERSPINNER) { @include keyframes(LOADERSPINNER) {
0% { 0% {
@ -86,7 +87,7 @@
text-transform: uppercase; text-transform: uppercase;
font-family: sans-serif; font-family: sans-serif;
font-size: 22px; font-size: $defaultFontSize * 1.375;
font-weight: 700; font-weight: 700;
letter-spacing: 2px; letter-spacing: 2px;
position: absolute; position: absolute;

18
css/menupages.scss
View File

@ -46,7 +46,7 @@
} }
.ace_text-input { .ace_text-input {
font-size: 16px; font-size: $defaultFontSize;
background-color: transparent; background-color: transparent;
} }
@ -129,7 +129,7 @@
margin-top: 8px; margin-top: 8px;
margin-bottom: 8px; margin-bottom: 8px;
padding: 2px; padding: 2px;
font-size: 12px; font-size: $defaultFontSize * 0.75;
} }
/* Active scripts */ /* Active scripts */
@ -151,7 +151,7 @@
.active-scripts-server-header { .active-scripts-server-header {
background-color: #444; background-color: #444;
font-size: 20px; font-size: $defaultFontSize * 1.25;
color: #fff; color: #fff;
margin: 6px 6px 0 6px; margin: 6px 6px 0 6px;
padding: 6px; padding: 6px;
@ -173,7 +173,7 @@
.active-scripts-server-header:after { .active-scripts-server-header:after {
content: '\02795'; /* "plus" sign (+) */ content: '\02795'; /* "plus" sign (+) */
font-size: 13px; font-size: $defaultFontSize * 0.8125;
color: #fff; color: #fff;
float: right; float: right;
margin-left: 5px; margin-left: 5px;
@ -181,7 +181,7 @@
.active-scripts-server-header.active:after { .active-scripts-server-header.active:after {
content: "\2796"; /* "minus" sign (-) */ content: "\2796"; /* "minus" sign (-) */
font-size: 13px; font-size: $defaultFontSize * 0.8125;
color: #fff; color: #fff;
float: right; float: right;
margin-left: 5px; margin-left: 5px;
@ -224,7 +224,7 @@
.active-scripts-script-header:after { .active-scripts-script-header:after {
content: '\02795'; /* "plus" sign (+) */ content: '\02795'; /* "plus" sign (+) */
font-size: 13px; font-size: $defaultFontSize * 0.8125;
color: var(--my-font-color); color: var(--my-font-color);
float: right; float: right;
margin-left: 5px; margin-left: 5px;
@ -232,7 +232,7 @@
.active-scripts-script-header.active:after { .active-scripts-script-header.active:after {
content: "\2796"; /* "minus" sign (-) */ content: "\2796"; /* "minus" sign (-) */
font-size: 13px; font-size: $defaultFontSize * 0.8125;
color: var(--my-font-color); color: var(--my-font-color);
float: right; float: right;
margin-left: 5px; margin-left: 5px;
@ -261,7 +261,7 @@
@include boxShadow(1px 1px 3px #000); @include boxShadow(1px 1px 3px #000);
color: #aaa; color: #aaa;
font-size: 16px; font-size: $defaultFontSize;
font-weight: bold; font-weight: bold;
margin: 4px; margin: 4px;
padding: 4px; padding: 4px;
@ -343,7 +343,7 @@
display: inline-block; display: inline-block;
margin: 0 4px; /* Don't want the vertical margin/padding, just left & right */ margin: 0 4px; /* Don't want the vertical margin/padding, just left & right */
padding: 0 4px; padding: 0 4px;
width: 48px; /* Four times font-size */ width: $defaultFontSize * 4;
} }
.menu-page-text { .menu-page-text {

8
css/missions.scss
View File

@ -1,4 +1,6 @@
@import "mixins"; @import "mixins";
@import "theme";
/* css for Missions */ /* css for Missions */
/* Hacking missions */ /* Hacking missions */
@ -33,7 +35,7 @@
.hack-mission-node p { .hack-mission-node p {
margin-top: 8px; margin-top: 8px;
color: #fff; color: #fff;
font-size: 12px; font-size: $defaultFontSize * 0.75;
text-align: center; text-align: center;
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
@ -80,7 +82,7 @@
-moz-transform: skew(-20deg); -moz-transform: skew(-20deg);
-o-transform: skew(-20deg); -o-transform: skew(-20deg);
color: #fff; color: #fff;
font-size: 12px; font-size: $defaultFontSize * 0.75;
margin-top: 8px; margin-top: 8px;
text-align: center; text-align: center;
-webkit-user-select: none; -webkit-user-select: none;
@ -102,7 +104,7 @@
-moz-transform: skew(20deg); -moz-transform: skew(20deg);
-o-transform: skew(20deg); -o-transform: skew(20deg);
color: #fff; color: #fff;
font-size: 12px; font-size: $defaultFontSize * 0.75;
margin-top: 8px; margin-top: 8px;
text-align: center; text-align: center;
-webkit-user-select: none; -webkit-user-select: none;

8
css/popupboxes.scss
View File

@ -1,4 +1,6 @@
@import "mixins"; @import "mixins";
@import "theme";
/* Pop-up boxes */ /* Pop-up boxes */
.popup-box-container { .popup-box-container {
display: none; /* Hidden by default */ display: none; /* Hidden by default */
@ -25,7 +27,7 @@
.popup-box-button-inactive { .popup-box-button-inactive {
color: #aaa; color: #aaa;
float: right; float: right;
font-size: 16px; font-size: $defaultFontSize;
font-weight: bold; font-weight: bold;
padding: 2px; padding: 2px;
margin: 6px; margin: 6px;
@ -80,7 +82,7 @@
float: right; float: right;
color: #aaa; color: #aaa;
font-size: 20px; font-size: $defaultFontSize * 1.25;
font-weight: bold; font-weight: bold;
} }
@ -160,7 +162,7 @@
float: right; float: right;
margin: 4px; margin: 4px;
padding: 4px; padding: 4px;
font-size: 20px; font-size: $defaultFontSize * 1.25;
font-weight: bold; font-weight: bold;
} }

14
css/styles.scss
View File

@ -108,7 +108,7 @@ tr:focus {
/* Plus and minus signs */ /* Plus and minus signs */
.mainmenu-accordion-header:after { .mainmenu-accordion-header:after {
content: '\02795'; content: '\02795';
font-size: 13px; font-size: $defaultFontSize * 0.8125;
color: #fff; color: #fff;
float: right; float: right;
margin-left: 5px; margin-left: 5px;
@ -219,7 +219,7 @@ a:visited {
position: relative; position: relative;
} }
#create-program-notification { #create-program-notification {
font-size: 10px; font-size: $defaultFontSize * 0.625;
position: absolute; /* Position the badge within the relatively positioned button */ position: absolute; /* Position the badge within the relatively positioned button */
top: 0; top: 0;
@ -413,7 +413,7 @@ a:visited {
} }
#status-text { #status-text {
font-size: 20px; font-size: $defaultFontSize * 1.25;
color: #fff; color: #fff;
right: 0; right: 0;
bottom: 0; bottom: 0;
@ -455,7 +455,7 @@ a:visited {
@include boxShadow(1px 1px 3px #000); @include boxShadow(1px 1px 3px #000);
color: #aaa; color: #aaa;
font-size: 14px; font-size: $defaultFontSize * 0.875;
font-weight: bold; font-weight: bold;
height: 22px; height: 22px;
background-color: #000; background-color: #000;
@ -487,7 +487,7 @@ a:visited {
/* Accordion menus (Header with collapsible panel) */ /* Accordion menus (Header with collapsible panel) */
.accordion-header { .accordion-header {
background-color: #444; background-color: #444;
font-size: 20px; font-size: $defaultFontSize * 1.25;
color: #fff; color: #fff;
margin: 6px 6px 0 6px; margin: 6px 6px 0 6px;
padding: 6px; padding: 6px;
@ -509,7 +509,7 @@ a:visited {
.accordion-header:after { .accordion-header:after {
content: '\02795'; /* "plus" sign (+) */ content: '\02795'; /* "plus" sign (+) */
font-size: 13px; font-size: $defaultFontSize * 0.8125;
color: #fff; color: #fff;
float: right; float: right;
margin-left: 5px; margin-left: 5px;
@ -517,7 +517,7 @@ a:visited {
.accordion-header.active:after { .accordion-header.active:after {
content: "\2796"; /* "minus" sign (-) */ content: "\2796"; /* "minus" sign (-) */
font-size: 13px; font-size: $defaultFontSize * 0.8125;
color: #fff; color: #fff;
float: right; float: right;
margin-left: 5px; margin-left: 5px;

6
css/terminal.scss
View File

@ -1,3 +1,5 @@
@import "theme";
#terminal-container { #terminal-container {
position: fixed; position: fixed;
margin-left: 10%; margin-left: 10%;
@ -12,7 +14,7 @@
padding-left: 10px; padding-left: 10px;
height: auto; height: auto;
width: 70%; width: 70%;
font-size: 16px; font-size: $defaultFontSize;
overflow: auto; overflow: auto;
overflow-y: scroll; overflow-y: scroll;
background-color: var(--my-background-color); background-color: var(--my-background-color);
@ -31,7 +33,7 @@
margin: 0 !important; margin: 0 !important;
border: 0; border: 0;
background-color: var(--my-background-color); background-color: var(--my-background-color);
font-size: 16px; font-size: $defaultFontSize;
outline: none; outline: none;
color: var(--my-font-color); color: var(--my-font-color);
} }

4
css/workinprogress.scss
View File

@ -1,4 +1,6 @@
@import "mixins"; @import "mixins";
@import "theme";
/* Both Work in progress and BitNode stuff */ /* Both Work in progress and BitNode stuff */
.generic-fullscreen-container { .generic-fullscreen-container {
color: var(--my-font-color); color: var(--my-font-color);
@ -22,7 +24,7 @@
color: #aaa; color: #aaa;
float: left; float: left;
font-size: 20px; font-size: $defaultFontSize * 1.25;
font-weight: bold; font-weight: bold;
margin: 10px; margin: 10px;
padding: 5px; padding: 5px;

2
src/CompanyManagement.js
View File

@ -4736,7 +4736,7 @@ Corporation.prototype.updateDivisionContent = function(division) {
var totalAdvertisingFac = advertisingFactors[0]; var totalAdvertisingFac = advertisingFactors[0];
advertisingInfo = advertisingInfo =
"<p class='tooltip'>Advertising Multiplier: x" + formatNumber(totalAdvertisingFac, 3) + "<p class='tooltip'>Advertising Multiplier: x" + formatNumber(totalAdvertisingFac, 3) +
"<span class='tooltiptext' style='font-size:12px'>Total multiplier for this industry's sales due to its awareness and popularity<br>" + "<span class='tooltiptext cmpy-mgmt-advertising-info'>Total multiplier for this industry's sales due to its awareness and popularity<br>" +
"Awareness Bonus: x" + formatNumber(Math.pow(awarenessFac, 0.85), 3) + "<br>" + "Awareness Bonus: x" + formatNumber(Math.pow(awarenessFac, 0.85), 3) + "<br>" +
"Popularity Bonus: x" + formatNumber(Math.pow(popularityFac, 0.85), 3) + "<br>" + "Popularity Bonus: x" + formatNumber(Math.pow(popularityFac, 0.85), 3) + "<br>" +
"Ratio Multiplier: x" + formatNumber(Math.pow(ratioFac, 0.85), 3) + "</span></p><br>" "Ratio Multiplier: x" + formatNumber(Math.pow(ratioFac, 0.85), 3) + "</span></p><br>"