Merge pull request #398 from danielyxie/dev

v0.40.0
danielyxie · Jul 29, 2018 · 1c84a6b · 1c84a6b
2 parents b0aea99 + 7a76603
commit 1c84a6b
Show file tree

Hide file tree

Showing 181 changed files with 7,274 additions and 167,431 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1,4 @@
 node_modules/
+doc/build/
 dist/
 tests/*.bundle.*
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 Changelog.txt
 Netburner.txt
+/doc/build
 /node_modules
 /dist/*.map
 /tests/*.map

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -88,7 +88,8 @@ the following rules:
    the changes to the UI
  - If your changes affect Netscript, provide some 
    scripts that can be used to test the Netscript changes. 
- - Do not check in the bundled engine (dist\engine.bundle.js)
+ - Do not check in any bundled files (`dist\*.bundle.js`). These will be
+   updated as part of official releases.
 
 ## As a Documentor
 To contribute to BitBurner documentation, you will need to have Python

diff --git a/css/bladeburner.css b/css/bladeburner.css
@@ -7,9 +7,9 @@
 }
 
 .bladeburner-action {
-    border:1px solid white;
-    margin:7px;
-    padding:7px;
+    border: 1px solid #fff;
+    margin: 7px;
+    padding: 7px;
     white-space: pre-wrap;
 }
 
@@ -19,25 +19,25 @@
 
 /* Whatever action is currently active */
 .bladeburner-active-action {
-    border:4px solid white;
+    border: 4px solid #fff;
 }
 
 /* Action & Skills panel navigation button */
 .bladeburner-nav-button {
-    border:1px solid white;
-    color:white;
-    padding:2px;
-    margin:2px;
+    border: 1px solid #fff;
+    color: #fff;
+    padding: 2px;
+    margin: 2px;
 }
 
 .bladeburner-nav-button:hover {
-    background-color:#3d4044;
+    background-color: #3d4044;
 }
 
 .bladeburner-nav-button-inactive {
-    border:1px solid white;
-    padding:2px;
-    margin:2px;
+    border: 1px solid #fff;
+    padding: 2px;
+    margin: 2px;
     text-decoration: none;
     background-color: #555;
     cursor: default;
@@ -46,24 +46,24 @@
 
 /* Bladeburner Console */
 .bladeburner-console-div {
-    display:inline-block;
-    width:40%;
-    border:1px solid white;
-    overflow:auto;
-    height:100%;
-    position:absolute;
+    display: inline-block;
+    width: 40%;
+    border: 1px solid #fff;
+    overflow: auto;
+    height: 100%;
+    position: absolute;
 }
 
 .bladeburner-console-table {
-    height:auto;
-    overflow:auto;
-    table-layout:fixed;
-    width:100%;
+    height: auto;
+    overflow: auto;
+    table-layout: fixed;
+    width: 100%;
 }
 
 .bladeburner-console-input-row {
     transition: height 1s;
-    width:100%;
+    width: 100%;
 }
 
 .bladeburner-console-input-cell {
@@ -72,19 +72,19 @@
 
 .bladeburner-console-input {
     display: inline-block;
-	padding: 0px !important;
-	margin: 0px !important;
-	border: 0px;
-	background-color: var(--my-background-color);
-	font-size: 13px;
-	outline: none;
+    padding: 0 !important;
+    margin: 0 !important;
+    border: 0;
+    background-color: var(--my-background-color);
+    font-size: 13px;
+    outline: none;
     color: var(--my-font-color);
     flex: 1 1 auto;
 }
 
 .bladeburner-console-line {
     word-wrap: break-word;
-    hyphens:auto;
+    hyphens: auto;
     -webkit-hyphens: auto;
     -moz-hyphens: auto;
 }
diff --git a/css/companymanagement.css b/css/companymanagement.css
@@ -4,13 +4,12 @@
     font-size: 13px;
 }
 
-
 /* Header tabs */
 .cmpy-mgmt-header-tab {
     display: inline-block;
-    color: white;
-    background-color:#555;
-    border:1px solid white;
+    color: #fff;
+    background-color: #555;
+    border: 1px solid #fff;
     padding: 4px;
 }
 
@@ -24,10 +23,10 @@
 
 /* Switch between Cities */
 .cmpy-mgmt-city-tab {
-    display:inline-block;
-    color: white;
+    display: inline-block;
+    color: #fff;
     background-color: #555;
-    border: 1px solid white;
+    border: 1px solid #fff;
     padding: 4px;
 }
 
@@ -46,7 +45,7 @@
 
 .cmpy-mgmt-industry-left-panel,
 .cmpy-mgmt-industry-right-panel {
-    display:inline-block;
+    display: inline-block;
     width: 45%;
     height: 100%;
     top: 10px;
@@ -55,75 +54,74 @@
 }
 
 .cmpy-mgmt-industry-overview-panel {
-    border: 1px solid white;
+    border: 1px solid #fff;
     color: var(--my-font-color);
-    display:inline-block;
+    display: inline-block;
     width: 100%;
 }
 
 .cmpy-mgmt-employee-panel {
-    border: 1px solid white;
-    display:block;
-    width:100%;
+    border: 1px solid #fff;
+    display: block;
+    width: 100%;
 }
 
 .cmpy-mgmt-warehouse-panel {
-    border: 1px solid white;
-    display:inline-block;
-    width:100%;
+    border: 1px solid #fff;
+    display: inline-block;
+    width: 100%;
 }
 
-/* Hiring new employees*/
+/* Hiring new employees */
 .cmpy-mgmt-find-employee-option {
-    border:1px solid white;
+    border: 1px solid #fff;
     margin: 6px;
 }
 
 .cmpy-mgmt-find-employee-option:hover {
-    background-color:#3d4044;
+    background-color: #3d4044;
 }
 
 /* Warehouse */
 .cmpy-mgmt-warehouse-material-div {
-    padding:2px;
-    border:1px solid white;
+    padding: 2px;
+    border: 1px solid #fff;
 }
 
 .cmpy-mgmt-warehouse-product-div {
-    padding:2px;
-    border:1px solid white;
+    padding: 2px;
+    border: 1px solid #fff;
 }
 
 /* Exporting materials/products */
 .cmpy-mgmt-existing-export {
-    border:1px solid white;
-    border-radius:25px;
-    margin:4px;
-    padding:4px;
+    border: 1px solid #fff;
+    border-radius: 25px;
+    margin: 4px;
+    padding: 4px;
 }
 
 .cmpy-mgmt-existing-export:hover {
-    background-color:#333333;
+    background-color: #333;
 }
 
-
 /* Upgrades */
 .cmpy-mgmt-upgrade-container {
-    border:1px solid white;
+    border: 1px solid #fff;
     width: 60%;
-    margin:4px;
+    margin: 4px;
 }
 
 .cmpy-mgmt-upgrade-div {
-    display:inline-block;
-    border:1px solid white;
-    margin:2px;
-    padding:6px;
-    border-radius:25px;
-    font-size:"12px";
-    color:var(--my-font-color);
+    display: inline-block;
+    border: 1px solid #fff;
+    margin: 2px;
+    padding: 6px;
+    border-radius: 25px;
+    font-size: "12px";
+    color: var(--my-font-color);
 }
 
 .cmpy-mgmt-upgrade-div:hover {
-    background-color:#333333;
+    background-color: #333;
 }
diff --git a/css/interactivetutorial.css b/css/interactivetutorial.css
@@ -1,6 +1,6 @@
 /* interactivetutorial.css */
 #interactive-tutorial-wrapper {
-    position:relative;
+    position: relative;
 }
 
 #interactive-tutorial-container {
@@ -10,11 +10,11 @@
     top: 0;
     height: 400px; /* Full height */
     padding: 10px;
-    border: 5px solid #FFFFFF;
+    border: 5px solid #fff;
     width: 20%;
     overflow: auto; /* Enable scroll if needed */
     background-color: #444; /* Fallback color */
-    color: white;
+    color: #fff;
 }
 
 #interactive-tutorial-container > strong {
@@ -24,7 +24,7 @@
 #interactive-tutorial-text {
     padding: 4px;
     margin: 4px;
-    color: white;
+    color: #fff;
     background-color: #444;
 }
 
@@ -40,7 +40,7 @@
     -moz-box-shadow: 1px 1px 3px #000;
     -webkit-box-shadow: 1px 1px 3px #000;
     box-shadow: 1px 1px 3px #000;
-    background-color:black;
+    background-color: #000;
 }
 
 #interactive-tutorial-exit {
@@ -62,7 +62,7 @@
 #interactive-tutorial-next:focus,
 #interactive-tutorial-back:hover,
 #interactive-tutorial-back:focus {
-    color: white;
+    color: #fff;
     text-decoration: none;
     cursor: pointer;
 }