From 83aeb50605e914e949a7467e3ac88066704816a9 Mon Sep 17 00:00:00 2001 From: Olivier Gagnon Date: Wed, 13 Jun 2018 16:12:46 -0400 Subject: [PATCH] unify dropdown and text input accross the app --- css/companymanagement.css | 6 ------ css/menupages.css | 12 ------------ css/styles.css | 10 ++++++++++ index.html | 24 ++++++++++++------------ src/CompanyManagement.js | 11 ++++++----- 5 files changed, 28 insertions(+), 35 deletions(-) diff --git a/css/companymanagement.css b/css/companymanagement.css index 2a01fb66c..77d7a5018 100644 --- a/css/companymanagement.css +++ b/css/companymanagement.css @@ -22,12 +22,6 @@ background-color: #777; } -/* Select industry type when creating a new division */ -.cmpy-mgmt-industry-select { - color:white; - background-color:black; -} - /* Switch between Cities */ .cmpy-mgmt-city-tab { display:inline-block; diff --git a/css/menupages.css b/css/menupages.css index d86f2ea46..8a73b0322 100644 --- a/css/menupages.css +++ b/css/menupages.css @@ -501,18 +501,6 @@ width: 50%; } -.dev-text-input { - color: var(--my-font-color); - border: 1px solid white; - background-color:black; -} - -.dev-dropdown-input { - color: var(--my-font-color); - border: 1px solid white; - background-color:black; -} - /* Location */ #location-container { position: fixed; diff --git a/css/styles.css b/css/styles.css index c4aa2c395..211fc85d2 100644 --- a/css/styles.css +++ b/css/styles.css @@ -197,6 +197,16 @@ a:link, a:visited { pointer-events: none; } +.dropdown { + color:white; + background-color:black; +} + +.text-input { + color:white; + background-color:black; +} + /* Notification icon (for create program right now only) */ #create-program-tab { position:relative; diff --git a/index.html b/index.html index c28038799..a9f5ae976 100644 --- a/index.html +++ b/index.html @@ -488,20 +488,20 @@

Augmentation related:

- + Queue AugmentationMay require save + reload - Add/Remove source file If Lvl == 0 the sf will be removed, calling it with another level will replace your current source file. You CAN set a source file higher than it's maximum level. + Add/Remove source file If Lvl == 0 the sf will be removed, calling it with another level will replace your current source file. You CAN set a source file higher than it's maximum level.

Faction related:

- + Receive inviteMay require save + reload

Program related:

- + ConnectConnect to the target server. - + Add ProgramAdd this program to the player home server, won't add the same program twice. Trigger BitFlumeQuick escape to change BN, does not give SFs @@ -512,19 +512,19 @@ maximize all servers moneySet all servers available money to maximum for that server

Exp/stats related:

- + add hacking expAdd that many hacking experience point, use negative numbers to remove, don't worry about going under 0 exp - + add strength expAdd that many strength experience point, use negative numbers to remove, don't worry about going under 0 exp - + add defense expAdd that many defense experience point, use negative numbers to remove, don't worry about going under 0 exp - + add dexterity expAdd that many dexterity experience point, use negative numbers to remove, don't worry about going under 0 exp - + add agility expAdd that many agility experience point, use negative numbers to remove, don't worry about going under 0 exp - + add charisma expAdd that many charisma experience point, use negative numbers to remove, don't worry about going under 0 exp - + add intelligence expAdd that many intelligence experience point, use negative numbers to remove, don't worry about going under 0 exp enable intelligenceEnables the intelligence stat disable intelligenceDisables the intelligence stat diff --git a/src/CompanyManagement.js b/src/CompanyManagement.js index ce3fd1a75..bd7fe423e 100644 --- a/src/CompanyManagement.js +++ b/src/CompanyManagement.js @@ -2431,8 +2431,9 @@ Warehouse.prototype.createMaterialUI = function(mat, matName, parentRefs) { }); //Select industry and city to export to - var citySelector = createElement("select"); + var citySelector = createElement("select", {class: "dropdown"}); var industrySelector = createElement("select", { + class: "dropdown", changeListener:()=>{ var industryName = industrySelector.options[industrySelector.selectedIndex].value; for (var foo = 0; foo < company.divisions.length; ++foo) { @@ -2475,6 +2476,7 @@ Warehouse.prototype.createMaterialUI = function(mat, matName, parentRefs) { //Select amount to export var exportAmount = createElement("input", { + class: "text-input", placeholder:"Export amount / s" }); @@ -3422,15 +3424,14 @@ Corporation.prototype.updateUIHeaderTabs = function() { innerHTML: "Create a new division to expand into a new industry:", }); var selector = createElement("select", { - class:"cmpy-mgmt-industry-select" + class:"dropdown" }); var industryDescription = createElement("p", {}); var yesBtn; var nameInput = createElement("input", { type:"text", id:"cmpy-mgmt-expand-industry-name-input", - color:"white", - backgroundColor:"black", + class: "text-input", display:"block", maxLength: 30, pattern:"[a-zA-Z0-9-_]", @@ -4068,7 +4069,7 @@ Corporation.prototype.displayDivisionContent = function(division, city) { innerText: "Would you like to expand into a new city by opening an office? " + "This would cost " + numeral(OfficeInitialCost).format('$0.000a'), }); - var citySelector = createElement("select", {margin:"5px"}); + var citySelector = createElement("select", {class: "dropdown", margin:"5px"}); for (var cityName in division.offices) { if (division.offices.hasOwnProperty(cityName)) { if (!(division.offices[cityName] instanceof OfficeSpace)) {