From 9f3459a46f2d97db2354b77e62f428d800a408cf Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 16:00:51 -0400 Subject: [PATCH 01/14] [refactor] Enabled Stylelint rule "color-named" Going with no named colors for consistency. --- css/bladeburner.css | 12 +++++------ css/companymanagement.css | 26 ++++++++++++------------ css/interactivetutorial.css | 8 ++++---- css/menupages.css | 36 ++++++++++++++++----------------- css/missions.css | 20 +++++++++---------- css/popupboxes.css | 18 ++++++++--------- css/styles.css | 40 ++++++++++++++++++------------------- css/workinprogress.css | 10 +++++----- stylelint.config.js | 2 +- 9 files changed, 86 insertions(+), 86 deletions(-) diff --git a/css/bladeburner.css b/css/bladeburner.css index 2abbb9a99..86e4a86fd 100644 --- a/css/bladeburner.css +++ b/css/bladeburner.css @@ -7,7 +7,7 @@ } .bladeburner-action { - border:1px solid white; + border:1px solid #ffffff; margin:7px; padding:7px; white-space: pre-wrap; @@ -19,13 +19,13 @@ /* Whatever action is currently active */ .bladeburner-active-action { - border:4px solid white; + border:4px solid #ffffff; } /* Action & Skills panel navigation button */ .bladeburner-nav-button { - border:1px solid white; - color:white; + border:1px solid #ffffff; + color:#ffffff; padding:2px; margin:2px; } @@ -35,7 +35,7 @@ } .bladeburner-nav-button-inactive { - border:1px solid white; + border:1px solid #ffffff; padding:2px; margin:2px; text-decoration: none; @@ -48,7 +48,7 @@ .bladeburner-console-div { display:inline-block; width:40%; - border:1px solid white; + border:1px solid #ffffff; overflow:auto; height:100%; position:absolute; diff --git a/css/companymanagement.css b/css/companymanagement.css index 77d7a5018..1a1cb56b3 100644 --- a/css/companymanagement.css +++ b/css/companymanagement.css @@ -8,9 +8,9 @@ /* Header tabs */ .cmpy-mgmt-header-tab { display: inline-block; - color: white; + color: #ffffff; background-color:#555; - border:1px solid white; + border:1px solid #ffffff; padding: 4px; } @@ -25,9 +25,9 @@ /* Switch between Cities */ .cmpy-mgmt-city-tab { display:inline-block; - color: white; + color: #ffffff; background-color: #555; - border: 1px solid white; + border: 1px solid #ffffff; padding: 4px; } @@ -55,27 +55,27 @@ } .cmpy-mgmt-industry-overview-panel { - border: 1px solid white; + border: 1px solid #ffffff; color: var(--my-font-color); display:inline-block; width: 100%; } .cmpy-mgmt-employee-panel { - border: 1px solid white; + border: 1px solid #ffffff; display:block; width:100%; } .cmpy-mgmt-warehouse-panel { - border: 1px solid white; + border: 1px solid #ffffff; display:inline-block; width:100%; } /* Hiring new employees*/ .cmpy-mgmt-find-employee-option { - border:1px solid white; + border:1px solid #ffffff; margin: 6px; } @@ -86,17 +86,17 @@ /* Warehouse */ .cmpy-mgmt-warehouse-material-div { padding:2px; - border:1px solid white; + border:1px solid #ffffff; } .cmpy-mgmt-warehouse-product-div { padding:2px; - border:1px solid white; + border:1px solid #ffffff; } /* Exporting materials/products */ .cmpy-mgmt-existing-export { - border:1px solid white; + border:1px solid #ffffff; border-radius:25px; margin:4px; padding:4px; @@ -109,14 +109,14 @@ /* Upgrades */ .cmpy-mgmt-upgrade-container { - border:1px solid white; + border:1px solid #ffffff; width: 60%; margin:4px; } .cmpy-mgmt-upgrade-div { display:inline-block; - border:1px solid white; + border:1px solid #ffffff; margin:2px; padding:6px; border-radius:25px; diff --git a/css/interactivetutorial.css b/css/interactivetutorial.css index 95e51b380..6fe222a73 100644 --- a/css/interactivetutorial.css +++ b/css/interactivetutorial.css @@ -14,7 +14,7 @@ width: 20%; overflow: auto; /* Enable scroll if needed */ background-color: #444; /* Fallback color */ - color: white; + color: #ffffff; } #interactive-tutorial-container > strong { @@ -24,7 +24,7 @@ #interactive-tutorial-text { padding: 4px; margin: 4px; - color: white; + color: #ffffff; 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: #ffffff; text-decoration: none; cursor: pointer; } diff --git a/css/menupages.css b/css/menupages.css index 8a73b0322..2e1264f4f 100644 --- a/css/menupages.css +++ b/css/menupages.css @@ -85,7 +85,7 @@ padding-bottom: 0px; float:center; background-color: #555; - color: white; + color: #ffffff; } #script-editor-filename { @@ -93,7 +93,7 @@ display: inline-block; float: center; resize: none; - color: white; + color: #ffffff; margin: 4px; padding: 2px; @@ -119,13 +119,13 @@ position:absolute; right: 9%; bottom:15%; - border:2px solid white; + border:2px solid #ffffff; width:19%; background-color:#444; padding:2px; overflow:auto; z-index: 1; - color: white; + color: #ffffff; } #script-editor-options-panel fieldset { @@ -155,7 +155,7 @@ .active-scripts-server-header { background-color: #444; font-size: 20px; - color: white; + color: #ffffff; margin: 6px 6px 0px 6px; padding: 6px; cursor: pointer; @@ -177,7 +177,7 @@ .active-scripts-server-header:after { content: '\02795'; /* "plus" sign (+) */ font-size: 13px; - color: white; + color: #ffffff; float: right; margin-left: 5px; } @@ -185,7 +185,7 @@ .active-scripts-server-header.active:after { content: "\2796"; /* "minus" sign (-) */ font-size: 13px; - color: white; + color: #ffffff; float: right; margin-left: 5px; } @@ -255,7 +255,7 @@ .active-scripts-script-panel li { background-color: #555; width: auto; - color: white; + color: #ffffff; margin-left: 5%; } @@ -271,12 +271,12 @@ box-shadow: 1px 1px 3px #000; margin: 4px; padding: 4px; - background-color:black; + background-color:#000; } .active-scripts-button:hover, .active-scripts-button:focus { - color: white; + color: #ffffff; text-decoration: none; cursor: pointer; } @@ -416,7 +416,7 @@ margin: 6px; display: inline-block; color: var(--my-font-color); - background-color:black; + background-color:#000; } #faction-donate-amount-txt { @@ -539,7 +539,7 @@ #infiltration-left-panel, #infiltration-right-panel { display:inline-block; - border: 1px solid white; + border: 1px solid #ffffff; width: 35%; height: 75%; top: 10px; @@ -548,7 +548,7 @@ } #infiltration-faction-select { - color:white; + color:#ffffff; } #infiltration-left-panel p, @@ -581,13 +581,13 @@ display: inline-block; padding: 4px; margin: 2px; - background-color: black; - border: 1px solid white; + background-color: #000; + border: 1px solid #ffffff; color: var(--my-font-color); } .stock-market-position-text { - color:white; + color:#ffffff; display:inline-block; } @@ -597,8 +597,8 @@ } .stock-market-order-cancel-btn { - background-color: black; - border: 1px solid white; + background-color: #000; + border: 1px solid #ffffff; color: var(--my-font-color); margin: 2px; padding: 0px; diff --git a/css/missions.css b/css/missions.css index ee1a22e17..4f93b0ec2 100644 --- a/css/missions.css +++ b/css/missions.css @@ -25,7 +25,7 @@ .hack-mission-node { z-index:5; - background-color:gray; + background-color:#808080; align-self: center; justify-self: center; display:inline-block; @@ -33,7 +33,7 @@ .hack-mission-node p { margin-top:8px; - color:white; + color:#ffffff; font-size:12px; text-align:center; -webkit-user-select: none; @@ -43,18 +43,18 @@ } .hack-mission-player-node { - color:white; - background-color:blue; + color:#ffffff; + background-color:#00f; } .hack-mission-player-node-active { - border: 2px solid white; + border: 2px solid #ffffff; background-color: #6666ff; } .hack-mission-enemy-node { - color:white; - background-color:red; + color:#ffffff; + background-color:#f00; } .hack-mission-cpu-node { @@ -82,7 +82,7 @@ -webkit-transform: skew(-20deg); -moz-transform: skew(-20deg); -o-transform: skew(-20deg); - color:white; + color:#ffffff; font-size:12px; margin-top: 8px; text-align:center; @@ -104,7 +104,7 @@ -webkit-transform: skew(20deg); -moz-transform: skew(20deg); -o-transform: skew(20deg); - color:white; + color:#ffffff; font-size:12px; margin-top: 8px; text-align:center; @@ -128,5 +128,5 @@ } .hack-mission-action-buttons-container { - border: 2px solid white; + border: 2px solid #ffffff; } diff --git a/css/popupboxes.css b/css/popupboxes.css index 38bc7f503..74faeeacc 100644 --- a/css/popupboxes.css +++ b/css/popupboxes.css @@ -28,8 +28,8 @@ font-weight: bold; padding: 2px; margin: 6px; - border: 1px solid white; - background-color:black; + border: 1px solid #ffffff; + background-color:#000; } .popup-box-button:hover, @@ -46,8 +46,8 @@ #yes-no-text-input-box-input { color: var(--my-font-color); - border: 1px solid white; - background-color:black; + border: 1px solid #ffffff; + background-color:#000; } .dialog-box-container, @@ -103,7 +103,7 @@ .dialog-box-close-button:hover, .dialog-box-close-button:focus,{ - color: white; + color: #ffffff; text-decoration: none; cursor: pointer; } @@ -126,12 +126,12 @@ } #infiltration-faction-select { - background-color:black; + background-color:#000; } /* Generic Yes No Box */ #yes-no-text-input-box-input { - color: white; + color: #ffffff; } /* Game Options */ @@ -163,7 +163,7 @@ font-weight: bold; -webkit-border-radius: 12px; -moz-border-radius: 12px; - border-radius: 12px white; + border-radius: 12px #ffffff; -moz-box-shadow: 1px 1px 3px #000; -webkit-box-shadow: 1px 1px 3px #000; box-shadow: 1px 1px 3px #000; @@ -171,7 +171,7 @@ #game-options-close-button:hover, #game-options-close-button:focus { - color: white; + color: #ffffff; text-decoration: none; cursor: pointer; } diff --git a/css/styles.css b/css/styles.css index 211fc85d2..e3c3d900c 100644 --- a/css/styles.css +++ b/css/styles.css @@ -84,13 +84,13 @@ tr:focus { .mainmenu>li a:hover:not(.active), .mainmenu>li a:focus { background-color: #777; - color: white; + color: #ffffff; } /* Panel headers can become active, and they are "lighter" than the rest */ .mainmenu>li a.active { background-color: #777; - color: white; + color: #ffffff; } .mainmenu>li a.active:hover { @@ -101,7 +101,7 @@ tr:focus { .mainmenu-accordion-header:after { content: '\02795'; font-size: 13px; - color: white; + color: #ffffff; float: right; margin-left: 5px; } @@ -123,12 +123,12 @@ tr:focus { /* Borders */ .mainmenu-accordion-header { - border:2px solid white; + border:2px solid #ffffff; } /* Make html links ("a" elements) nice looking buttons with this class */ a:link, a:visited { - color:white; + color:#ffffff; } .a-link-button { @@ -198,13 +198,13 @@ a:link, a:visited { } .dropdown { - color:white; - background-color:black; + color:#ffffff; + background-color:#000; } .text-input { - color:white; - background-color:black; + color:#ffffff; + background-color:#000; } /* Notification icon (for create program right now only) */ @@ -221,7 +221,7 @@ a:link, a:visited { .notification-on { background-color: #fa3e3e; - color: white; + color: #ffffff; border-radius: 2px; padding: 1px 3px; } @@ -244,7 +244,7 @@ a:link, a:visited { width: 300px; background-color: var(--my-background-color); border: 2px solid var(--my-highlight-color);; - color: white; + color: #ffffff; text-align: center; padding: 4px; left: 101%; @@ -259,7 +259,7 @@ a:link, a:visited { width: 300px; background-color: var(--my-background-color); border: 2px solid var(--my-highlight-color);; - color: white; + color: #ffffff; text-align: center; padding: 4px; left: 101%; @@ -276,7 +276,7 @@ a:link, a:visited { width: 300px; background-color: var(--my-background-color); border: 2px solid var(--my-highlight-color);; - color: white; + color: #ffffff; text-align: center; padding: 4px; left: 40%; @@ -298,7 +298,7 @@ a:link, a:visited { padding:1px; margin-left:3px; color:#fff; - border:1px solid white; + border:1px solid #ffffff; border-radius:5px; display:inline-block; } @@ -441,7 +441,7 @@ a:link, a:visited { #character-overview-text { padding: 4px; margin: 8px; - color: white; + color: #ffffff; background-color: #444; } @@ -457,14 +457,14 @@ a:link, a:visited { -webkit-box-shadow: 1px 1px 3px #000; box-shadow: 1px 1px 3px #000; height: 22px; - background-color:black; + background-color:#000; } #character-overview-save-button:hover, #character-overview-save-button:focus, #character-overview-options-button:hover, #character-overview-options-button:focus { - color: white; + color: #ffffff; text-decoration: none; cursor: pointer; } @@ -487,7 +487,7 @@ a:link, a:visited { .accordion-header { background-color: #444; font-size: 20px; - color: white; + color: #ffffff; margin: 6px 6px 0px 6px; padding: 6px; cursor: pointer; @@ -509,7 +509,7 @@ a:link, a:visited { .accordion-header:after { content: '\02795'; /* "plus" sign (+) */ font-size: 13px; - color: white; + color: #ffffff; float: right; margin-left: 5px; } @@ -517,7 +517,7 @@ a:link, a:visited { .accordion-header.active:after { content: "\2796"; /* "minus" sign (-) */ font-size: 13px; - color: white; + color: #ffffff; float: right; margin-left: 5px; } diff --git a/css/workinprogress.css b/css/workinprogress.css index 80717fa3d..ca3bb9b5a 100644 --- a/css/workinprogress.css +++ b/css/workinprogress.css @@ -25,7 +25,7 @@ margin: 10px; padding: 5px; border-radius: 12px; - border: 3px solid white; + border: 3px solid #ffffff; -moz-box-shadow: 1px 1px 3px #000; -webkit-box-shadow: 1px 1px 3px #000; box-shadow: 1px 1px 3px #000; @@ -33,7 +33,7 @@ #work-in-progress-cancel-button:hover, #work-in-progress-cancel-button:focus { - color: white; + color: #ffffff; text-decoration: none; cursor: pointer; } @@ -44,12 +44,12 @@ } .bitnode { - color:blue; + color:#00f; } .bitnode-destroyed { - color:red; + color:#f00; } .bitnode:hover, .bitnode-destroyed:hover { - color:white; + color:#ffffff; } diff --git a/stylelint.config.js b/stylelint.config.js index 6ddea46aa..83e05b8b2 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -44,7 +44,7 @@ module.exports = { // "block-opening-brace-space-before": "always", // "color-hex-case": "lower", // "color-hex-length": "short", -// "color-named": "never", + "color-named": "never", //"color-no-hex": true, "color-no-invalid-hex": true, // "comment-empty-line-before": "always", From 1eee47dd3ef9e1944eac3710071a5af9939eeebb Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 16:05:12 -0400 Subject: [PATCH 02/14] [refactor] Enabled Stylelint "color-hex-case" rule --- css/interactivetutorial.css | 2 +- css/styles.css | 38 ++++++++++++++++++------------------- stylelint.config.js | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/css/interactivetutorial.css b/css/interactivetutorial.css index 6fe222a73..b79de7c34 100644 --- a/css/interactivetutorial.css +++ b/css/interactivetutorial.css @@ -10,7 +10,7 @@ top: 0; height: 400px; /* Full height */ padding: 10px; - border: 5px solid #FFFFFF; + border: 5px solid #ffffff; width: 20%; overflow: auto; /* Enable scroll if needed */ background-color: #444; /* Fallback color */ diff --git a/css/styles.css b/css/styles.css index e3c3d900c..695745aec 100644 --- a/css/styles.css +++ b/css/styles.css @@ -134,7 +134,7 @@ a:link, a:visited { .a-link-button { text-decoration: none; background-color: #555; - color: #FFFFFF; + color: #ffffff; padding: 5px; margin: 5px; border: 1px solid #333333; @@ -159,7 +159,7 @@ a:link, a:visited { .a-link-button-inactive { text-decoration: none; background-color: #333; - color: #FFFFFF; + color: #ffffff; padding: 5px; margin: 5px; border: 1px solid #333333; @@ -179,11 +179,11 @@ a:link, a:visited { /* Make anchor tags ("a" elements) for activated actions */ .a-link-button-bought { text-decoration: none; - background-color: #00AA00; - color: #FFFFFF; + background-color: #00aa00; + color: #ffffff; padding: 5px; margin: 5px; - border: 1px solid #00AA00; + border: 1px solid #00aa00; cursor: default; } @@ -315,27 +315,27 @@ a:link, a:visited { /* Flashing button (Red) */ @-webkit-keyframes glowing { - 0% { background-color: #B20000; -webkit-box-shadow: 0 0 3px #B20000; } - 50% { background-color: #FF0000; -webkit-box-shadow: 0 0 40px #FF0000; } - 100% { background-color: #B20000; -webkit-box-shadow: 0 0 3px #B20000; } + 0% { background-color: #b20000; -webkit-box-shadow: 0 0 3px #b20000; } + 50% { background-color: #ff0000; -webkit-box-shadow: 0 0 40px #ff0000; } + 100% { background-color: #b20000; -webkit-box-shadow: 0 0 3px #b20000; } } @-moz-keyframes glowing { - 0% { background-color: #B20000; -moz-box-shadow: 0 0 3px #B20000; } - 50% { background-color: #FF0000; -moz-box-shadow: 0 0 40px #FF0000; } - 100% { background-color: #B20000; -moz-box-shadow: 0 0 3px #B20000; } + 0% { background-color: #b20000; -moz-box-shadow: 0 0 3px #b20000; } + 50% { background-color: #ff0000; -moz-box-shadow: 0 0 40px #ff0000; } + 100% { background-color: #b20000; -moz-box-shadow: 0 0 3px #b20000; } } @-o-keyframes glowing { - 0% { background-color: #B20000; box-shadow: 0 0 3px #B20000; } - 50% { background-color: #FF0000; box-shadow: 0 0 40px #FF0000; } - 100% { background-color: #B20000; box-shadow: 0 0 3px #B20000; } + 0% { background-color: #b20000; box-shadow: 0 0 3px #b20000; } + 50% { background-color: #ff0000; box-shadow: 0 0 40px #ff0000; } + 100% { background-color: #b20000; box-shadow: 0 0 3px #b20000; } } @keyframes glowing { - 0% { background-color: #B20000; box-shadow: 0 0 3px #B20000; } - 50% { background-color: #FF0000; box-shadow: 0 0 40px #FF0000; } - 100% { background-color: #B20000; box-shadow: 0 0 3px #B20000; } + 0% { background-color: #b20000; box-shadow: 0 0 3px #b20000; } + 50% { background-color: #ff0000; box-shadow: 0 0 40px #ff0000; } + 100% { background-color: #b20000; box-shadow: 0 0 3px #b20000; } } .flashing-button { @@ -409,7 +409,7 @@ a:link, a:visited { #status-text { font-size: 20px; - color: #FFFFFF; + color: #ffffff; right: 0; bottom: 0; padding: 4px; @@ -476,7 +476,7 @@ a:link, a:visited { /* Scan analyze links from AutoLink */ .scan-analyze-link { cursor:pointer; - color:#FFFFFF; + color:#ffffff; text-decoration:underline; } .scan-analyze-link:hover { diff --git a/stylelint.config.js b/stylelint.config.js index 83e05b8b2..4c6a5b8a2 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -42,7 +42,7 @@ module.exports = { // "block-opening-brace-newline-after": "always", // "block-opening-brace-newline-before": "never-single-line", // "block-opening-brace-space-before": "always", -// "color-hex-case": "lower", + "color-hex-case": "lower", // "color-hex-length": "short", "color-named": "never", //"color-no-hex": true, From 71d80ae5a4675d06fa686e94ca5a11da7c6d468c Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 16:11:18 -0400 Subject: [PATCH 03/14] [refactor] Enabled Stylelint 'color-hex-length' --- css/bladeburner.css | 12 +++---- css/companymanagement.css | 30 ++++++++-------- css/interactivetutorial.css | 8 ++--- css/loader.css | 8 ++--- css/menupages.css | 30 ++++++++-------- css/missions.css | 16 ++++----- css/popupboxes.css | 12 +++---- css/styles.css | 68 ++++++++++++++++++------------------- css/workinprogress.css | 6 ++-- stylelint.config.js | 2 +- 10 files changed, 96 insertions(+), 96 deletions(-) diff --git a/css/bladeburner.css b/css/bladeburner.css index 86e4a86fd..00e30c402 100644 --- a/css/bladeburner.css +++ b/css/bladeburner.css @@ -7,7 +7,7 @@ } .bladeburner-action { - border:1px solid #ffffff; + border:1px solid #fff; margin:7px; padding:7px; white-space: pre-wrap; @@ -19,13 +19,13 @@ /* Whatever action is currently active */ .bladeburner-active-action { - border:4px solid #ffffff; + border:4px solid #fff; } /* Action & Skills panel navigation button */ .bladeburner-nav-button { - border:1px solid #ffffff; - color:#ffffff; + border:1px solid #fff; + color:#fff; padding:2px; margin:2px; } @@ -35,7 +35,7 @@ } .bladeburner-nav-button-inactive { - border:1px solid #ffffff; + border:1px solid #fff; padding:2px; margin:2px; text-decoration: none; @@ -48,7 +48,7 @@ .bladeburner-console-div { display:inline-block; width:40%; - border:1px solid #ffffff; + border:1px solid #fff; overflow:auto; height:100%; position:absolute; diff --git a/css/companymanagement.css b/css/companymanagement.css index 1a1cb56b3..7a399798f 100644 --- a/css/companymanagement.css +++ b/css/companymanagement.css @@ -8,9 +8,9 @@ /* Header tabs */ .cmpy-mgmt-header-tab { display: inline-block; - color: #ffffff; + color: #fff; background-color:#555; - border:1px solid #ffffff; + border:1px solid #fff; padding: 4px; } @@ -25,9 +25,9 @@ /* Switch between Cities */ .cmpy-mgmt-city-tab { display:inline-block; - color: #ffffff; + color: #fff; background-color: #555; - border: 1px solid #ffffff; + border: 1px solid #fff; padding: 4px; } @@ -55,27 +55,27 @@ } .cmpy-mgmt-industry-overview-panel { - border: 1px solid #ffffff; + border: 1px solid #fff; color: var(--my-font-color); display:inline-block; width: 100%; } .cmpy-mgmt-employee-panel { - border: 1px solid #ffffff; + border: 1px solid #fff; display:block; width:100%; } .cmpy-mgmt-warehouse-panel { - border: 1px solid #ffffff; + border: 1px solid #fff; display:inline-block; width:100%; } /* Hiring new employees*/ .cmpy-mgmt-find-employee-option { - border:1px solid #ffffff; + border:1px solid #fff; margin: 6px; } @@ -86,37 +86,37 @@ /* Warehouse */ .cmpy-mgmt-warehouse-material-div { padding:2px; - border:1px solid #ffffff; + border:1px solid #fff; } .cmpy-mgmt-warehouse-product-div { padding:2px; - border:1px solid #ffffff; + border:1px solid #fff; } /* Exporting materials/products */ .cmpy-mgmt-existing-export { - border:1px solid #ffffff; + 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 #ffffff; + border:1px solid #fff; width: 60%; margin:4px; } .cmpy-mgmt-upgrade-div { display:inline-block; - border:1px solid #ffffff; + border:1px solid #fff; margin:2px; padding:6px; border-radius:25px; @@ -125,5 +125,5 @@ } .cmpy-mgmt-upgrade-div:hover { - background-color:#333333; + background-color:#333; } diff --git a/css/interactivetutorial.css b/css/interactivetutorial.css index b79de7c34..b861af790 100644 --- a/css/interactivetutorial.css +++ b/css/interactivetutorial.css @@ -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: #ffffff; + color: #fff; } #interactive-tutorial-container > strong { @@ -24,7 +24,7 @@ #interactive-tutorial-text { padding: 4px; margin: 4px; - color: #ffffff; + color: #fff; background-color: #444; } @@ -62,7 +62,7 @@ #interactive-tutorial-next:focus, #interactive-tutorial-back:hover, #interactive-tutorial-back:focus { - color: #ffffff; + color: #fff; text-decoration: none; cursor: pointer; } diff --git a/css/loader.css b/css/loader.css index 7b921d313..c23dfb52f 100644 --- a/css/loader.css +++ b/css/loader.css @@ -105,7 +105,7 @@ animation: LOADERSPINNER 5s linear infinite; } .loaderoverlay .loaderlabel { - color: #66ff33; + color: #6f3; text-transform: uppercase; font-family: sans-serif; font-size: 22px; @@ -140,9 +140,9 @@ button[type="button"] { .loaderoverlay .loaderspinner, .loaderoverlay .loaderspinner:before, .loaderoverlay .loaderspinner:after { - border-top-color: #66ff33!important; - border-bottom-color:#66ff33 !important; + border-top-color: #6f3!important; + border-bottom-color:#6f3 !important; } .loaderoverlay .loaderlabel { - color: #66ff33; + color: #6f3; } \ No newline at end of file diff --git a/css/menupages.css b/css/menupages.css index 2e1264f4f..a73822fa2 100644 --- a/css/menupages.css +++ b/css/menupages.css @@ -85,7 +85,7 @@ padding-bottom: 0px; float:center; background-color: #555; - color: #ffffff; + color: #fff; } #script-editor-filename { @@ -93,7 +93,7 @@ display: inline-block; float: center; resize: none; - color: #ffffff; + color: #fff; margin: 4px; padding: 2px; @@ -112,20 +112,20 @@ #script-editor-status { float: left; - color: #ffffff; + color: #fff; } #script-editor-options-panel { position:absolute; right: 9%; bottom:15%; - border:2px solid #ffffff; + border:2px solid #fff; width:19%; background-color:#444; padding:2px; overflow:auto; z-index: 1; - color: #ffffff; + color: #fff; } #script-editor-options-panel fieldset { @@ -155,7 +155,7 @@ .active-scripts-server-header { background-color: #444; font-size: 20px; - color: #ffffff; + color: #fff; margin: 6px 6px 0px 6px; padding: 6px; cursor: pointer; @@ -177,7 +177,7 @@ .active-scripts-server-header:after { content: '\02795'; /* "plus" sign (+) */ font-size: 13px; - color: #ffffff; + color: #fff; float: right; margin-left: 5px; } @@ -185,7 +185,7 @@ .active-scripts-server-header.active:after { content: "\2796"; /* "minus" sign (-) */ font-size: 13px; - color: #ffffff; + color: #fff; float: right; margin-left: 5px; } @@ -255,7 +255,7 @@ .active-scripts-script-panel li { background-color: #555; width: auto; - color: #ffffff; + color: #fff; margin-left: 5%; } @@ -276,7 +276,7 @@ .active-scripts-button:hover, .active-scripts-button:focus { - color: #ffffff; + color: #fff; text-decoration: none; cursor: pointer; } @@ -539,7 +539,7 @@ #infiltration-left-panel, #infiltration-right-panel { display:inline-block; - border: 1px solid #ffffff; + border: 1px solid #fff; width: 35%; height: 75%; top: 10px; @@ -548,7 +548,7 @@ } #infiltration-faction-select { - color:#ffffff; + color:#fff; } #infiltration-left-panel p, @@ -582,12 +582,12 @@ padding: 4px; margin: 2px; background-color: #000; - border: 1px solid #ffffff; + border: 1px solid #fff; color: var(--my-font-color); } .stock-market-position-text { - color:#ffffff; + color:#fff; display:inline-block; } @@ -598,7 +598,7 @@ .stock-market-order-cancel-btn { background-color: #000; - border: 1px solid #ffffff; + border: 1px solid #fff; color: var(--my-font-color); margin: 2px; padding: 0px; diff --git a/css/missions.css b/css/missions.css index 4f93b0ec2..6406699f5 100644 --- a/css/missions.css +++ b/css/missions.css @@ -33,7 +33,7 @@ .hack-mission-node p { margin-top:8px; - color:#ffffff; + color:#fff; font-size:12px; text-align:center; -webkit-user-select: none; @@ -43,17 +43,17 @@ } .hack-mission-player-node { - color:#ffffff; + color:#fff; background-color:#00f; } .hack-mission-player-node-active { - border: 2px solid #ffffff; - background-color: #6666ff; + border: 2px solid #fff; + background-color: #66f; } .hack-mission-enemy-node { - color:#ffffff; + color:#fff; background-color:#f00; } @@ -82,7 +82,7 @@ -webkit-transform: skew(-20deg); -moz-transform: skew(-20deg); -o-transform: skew(-20deg); - color:#ffffff; + color:#fff; font-size:12px; margin-top: 8px; text-align:center; @@ -104,7 +104,7 @@ -webkit-transform: skew(20deg); -moz-transform: skew(20deg); -o-transform: skew(20deg); - color:#ffffff; + color:#fff; font-size:12px; margin-top: 8px; text-align:center; @@ -128,5 +128,5 @@ } .hack-mission-action-buttons-container { - border: 2px solid #ffffff; + border: 2px solid #fff; } diff --git a/css/popupboxes.css b/css/popupboxes.css index 74faeeacc..35ae48ae5 100644 --- a/css/popupboxes.css +++ b/css/popupboxes.css @@ -28,7 +28,7 @@ font-weight: bold; padding: 2px; margin: 6px; - border: 1px solid #ffffff; + border: 1px solid #fff; background-color:#000; } @@ -46,7 +46,7 @@ #yes-no-text-input-box-input { color: var(--my-font-color); - border: 1px solid #ffffff; + border: 1px solid #fff; background-color:#000; } @@ -103,7 +103,7 @@ .dialog-box-close-button:hover, .dialog-box-close-button:focus,{ - color: #ffffff; + color: #fff; text-decoration: none; cursor: pointer; } @@ -131,7 +131,7 @@ /* Generic Yes No Box */ #yes-no-text-input-box-input { - color: #ffffff; + color: #fff; } /* Game Options */ @@ -163,7 +163,7 @@ font-weight: bold; -webkit-border-radius: 12px; -moz-border-radius: 12px; - border-radius: 12px #ffffff; + border-radius: 12px #fff; -moz-box-shadow: 1px 1px 3px #000; -webkit-box-shadow: 1px 1px 3px #000; box-shadow: 1px 1px 3px #000; @@ -171,7 +171,7 @@ #game-options-close-button:hover, #game-options-close-button:focus { - color: #ffffff; + color: #fff; text-decoration: none; cursor: pointer; } diff --git a/css/styles.css b/css/styles.css index 695745aec..5ef165ddb 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,7 +1,7 @@ :root{ - --my-font-color: #66ff33; - --my-background-color: #000000; - --my-highlight-color: #ffffff; + --my-font-color: #6f3; + --my-background-color: #000; + --my-highlight-color: #fff; } * { @@ -65,7 +65,7 @@ tr:focus { overflow: auto; border: 0; - border-bottom: 1px solid #000000; + border-bottom: 1px solid #000; border-radius: 0; background-color: #333; } @@ -84,13 +84,13 @@ tr:focus { .mainmenu>li a:hover:not(.active), .mainmenu>li a:focus { background-color: #777; - color: #ffffff; + color: #fff; } /* Panel headers can become active, and they are "lighter" than the rest */ .mainmenu>li a.active { background-color: #777; - color: #ffffff; + color: #fff; } .mainmenu>li a.active:hover { @@ -101,7 +101,7 @@ tr:focus { .mainmenu-accordion-header:after { content: '\02795'; font-size: 13px; - color: #ffffff; + color: #fff; float: right; margin-left: 5px; } @@ -123,21 +123,21 @@ tr:focus { /* Borders */ .mainmenu-accordion-header { - border:2px solid #ffffff; + border:2px solid #fff; } /* Make html links ("a" elements) nice looking buttons with this class */ a:link, a:visited { - color:#ffffff; + color:#fff; } .a-link-button { text-decoration: none; background-color: #555; - color: #ffffff; + color: #fff; padding: 5px; margin: 5px; - border: 1px solid #333333; + border: 1px solid #333; -moz-user-select: none; -ms-user-select: none; @@ -159,10 +159,10 @@ a:link, a:visited { .a-link-button-inactive { text-decoration: none; background-color: #333; - color: #ffffff; + color: #fff; padding: 5px; margin: 5px; - border: 1px solid #333333; + border: 1px solid #333; cursor: default; } @@ -179,11 +179,11 @@ a:link, a:visited { /* Make anchor tags ("a" elements) for activated actions */ .a-link-button-bought { text-decoration: none; - background-color: #00aa00; - color: #ffffff; + background-color: #0a0; + color: #fff; padding: 5px; margin: 5px; - border: 1px solid #00aa00; + border: 1px solid #0a0; cursor: default; } @@ -198,12 +198,12 @@ a:link, a:visited { } .dropdown { - color:#ffffff; + color:#fff; background-color:#000; } .text-input { - color:#ffffff; + color:#fff; background-color:#000; } @@ -221,7 +221,7 @@ a:link, a:visited { .notification-on { background-color: #fa3e3e; - color: #ffffff; + color: #fff; border-radius: 2px; padding: 1px 3px; } @@ -244,7 +244,7 @@ a:link, a:visited { width: 300px; background-color: var(--my-background-color); border: 2px solid var(--my-highlight-color);; - color: #ffffff; + color: #fff; text-align: center; padding: 4px; left: 101%; @@ -259,7 +259,7 @@ a:link, a:visited { width: 300px; background-color: var(--my-background-color); border: 2px solid var(--my-highlight-color);; - color: #ffffff; + color: #fff; text-align: center; padding: 4px; left: 101%; @@ -276,7 +276,7 @@ a:link, a:visited { width: 300px; background-color: var(--my-background-color); border: 2px solid var(--my-highlight-color);; - color: #ffffff; + color: #fff; text-align: center; padding: 4px; left: 40%; @@ -298,7 +298,7 @@ a:link, a:visited { padding:1px; margin-left:3px; color:#fff; - border:1px solid #ffffff; + border:1px solid #fff; border-radius:5px; display:inline-block; } @@ -316,25 +316,25 @@ a:link, a:visited { /* Flashing button (Red) */ @-webkit-keyframes glowing { 0% { background-color: #b20000; -webkit-box-shadow: 0 0 3px #b20000; } - 50% { background-color: #ff0000; -webkit-box-shadow: 0 0 40px #ff0000; } + 50% { background-color: #f00; -webkit-box-shadow: 0 0 40px #f00; } 100% { background-color: #b20000; -webkit-box-shadow: 0 0 3px #b20000; } } @-moz-keyframes glowing { 0% { background-color: #b20000; -moz-box-shadow: 0 0 3px #b20000; } - 50% { background-color: #ff0000; -moz-box-shadow: 0 0 40px #ff0000; } + 50% { background-color: #f00; -moz-box-shadow: 0 0 40px #f00; } 100% { background-color: #b20000; -moz-box-shadow: 0 0 3px #b20000; } } @-o-keyframes glowing { 0% { background-color: #b20000; box-shadow: 0 0 3px #b20000; } - 50% { background-color: #ff0000; box-shadow: 0 0 40px #ff0000; } + 50% { background-color: #f00; box-shadow: 0 0 40px #f00; } 100% { background-color: #b20000; box-shadow: 0 0 3px #b20000; } } @keyframes glowing { 0% { background-color: #b20000; box-shadow: 0 0 3px #b20000; } - 50% { background-color: #ff0000; box-shadow: 0 0 40px #ff0000; } + 50% { background-color: #f00; box-shadow: 0 0 40px #f00; } 100% { background-color: #b20000; box-shadow: 0 0 3px #b20000; } } @@ -409,7 +409,7 @@ a:link, a:visited { #status-text { font-size: 20px; - color: #ffffff; + color: #fff; right: 0; bottom: 0; padding: 4px; @@ -441,7 +441,7 @@ a:link, a:visited { #character-overview-text { padding: 4px; margin: 8px; - color: #ffffff; + color: #fff; background-color: #444; } @@ -464,7 +464,7 @@ a:link, a:visited { #character-overview-save-button:focus, #character-overview-options-button:hover, #character-overview-options-button:focus { - color: #ffffff; + color: #fff; text-decoration: none; cursor: pointer; } @@ -476,7 +476,7 @@ a:link, a:visited { /* Scan analyze links from AutoLink */ .scan-analyze-link { cursor:pointer; - color:#ffffff; + color:#fff; text-decoration:underline; } .scan-analyze-link:hover { @@ -487,7 +487,7 @@ a:link, a:visited { .accordion-header { background-color: #444; font-size: 20px; - color: #ffffff; + color: #fff; margin: 6px 6px 0px 6px; padding: 6px; cursor: pointer; @@ -509,7 +509,7 @@ a:link, a:visited { .accordion-header:after { content: '\02795'; /* "plus" sign (+) */ font-size: 13px; - color: #ffffff; + color: #fff; float: right; margin-left: 5px; } @@ -517,7 +517,7 @@ a:link, a:visited { .accordion-header.active:after { content: "\2796"; /* "minus" sign (-) */ font-size: 13px; - color: #ffffff; + color: #fff; float: right; margin-left: 5px; } diff --git a/css/workinprogress.css b/css/workinprogress.css index ca3bb9b5a..a13664e72 100644 --- a/css/workinprogress.css +++ b/css/workinprogress.css @@ -25,7 +25,7 @@ margin: 10px; padding: 5px; border-radius: 12px; - border: 3px solid #ffffff; + border: 3px solid #fff; -moz-box-shadow: 1px 1px 3px #000; -webkit-box-shadow: 1px 1px 3px #000; box-shadow: 1px 1px 3px #000; @@ -33,7 +33,7 @@ #work-in-progress-cancel-button:hover, #work-in-progress-cancel-button:focus { - color: #ffffff; + color: #fff; text-decoration: none; cursor: pointer; } @@ -51,5 +51,5 @@ } .bitnode:hover, .bitnode-destroyed:hover { - color:#ffffff; + color:#fff; } diff --git a/stylelint.config.js b/stylelint.config.js index 4c6a5b8a2..646bbafa9 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -43,7 +43,7 @@ module.exports = { // "block-opening-brace-newline-before": "never-single-line", // "block-opening-brace-space-before": "always", "color-hex-case": "lower", -// "color-hex-length": "short", + "color-hex-length": "short", "color-named": "never", //"color-no-hex": true, "color-no-invalid-hex": true, From d563d9624ac421a5b25aaeac524c31fb5f8031cc Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 16:42:54 -0400 Subject: [PATCH 04/14] [refactor] Enabled Stylelint 'declaration-colon-space-after' rule --- css/bladeburner.css | 48 ++++++++--------- css/companymanagement.css | 60 +++++++++++----------- css/interactivetutorial.css | 4 +- css/loader.css | 4 +- css/menupages.css | 66 ++++++++++++------------ css/missions.css | 52 +++++++++---------- css/popupboxes.css | 18 +++---- css/styles.css | 100 ++++++++++++++++++------------------ css/terminal.css | 4 +- css/workinprogress.css | 6 +-- stylelint.config.js | 2 +- 11 files changed, 182 insertions(+), 182 deletions(-) diff --git a/css/bladeburner.css b/css/bladeburner.css index 00e30c402..2a658fb8c 100644 --- a/css/bladeburner.css +++ b/css/bladeburner.css @@ -7,9 +7,9 @@ } .bladeburner-action { - border:1px solid #fff; - 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 #fff; + border: 4px solid #fff; } /* Action & Skills panel navigation button */ .bladeburner-nav-button { - border:1px solid #fff; - color:#fff; - 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 #fff; - 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 #fff; - 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 { @@ -84,7 +84,7 @@ .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 index 7a399798f..5c26a25d4 100644 --- a/css/companymanagement.css +++ b/css/companymanagement.css @@ -9,8 +9,8 @@ .cmpy-mgmt-header-tab { display: inline-block; color: #fff; - background-color:#555; - border:1px solid #fff; + background-color: #555; + border: 1px solid #fff; padding: 4px; } @@ -24,7 +24,7 @@ /* Switch between Cities */ .cmpy-mgmt-city-tab { - display:inline-block; + display: inline-block; color: #fff; background-color: #555; border: 1px solid #fff; @@ -46,7 +46,7 @@ .cmpy-mgmt-industry-left-panel, .cmpy-mgmt-industry-right-panel { - display:inline-block; + display: inline-block; width: 45%; height: 100%; top: 10px; @@ -57,73 +57,73 @@ .cmpy-mgmt-industry-overview-panel { border: 1px solid #fff; color: var(--my-font-color); - display:inline-block; + display: inline-block; width: 100%; } .cmpy-mgmt-employee-panel { border: 1px solid #fff; - display:block; - width:100%; + display: block; + width: 100%; } .cmpy-mgmt-warehouse-panel { border: 1px solid #fff; - display:inline-block; - width:100%; + display: inline-block; + width: 100%; } /* Hiring new employees*/ .cmpy-mgmt-find-employee-option { - border:1px solid #fff; + 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 #fff; + padding: 2px; + border: 1px solid #fff; } .cmpy-mgmt-warehouse-product-div { - padding:2px; - border:1px solid #fff; + padding: 2px; + border: 1px solid #fff; } /* Exporting materials/products */ .cmpy-mgmt-existing-export { - border:1px solid #fff; - 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:#333; + background-color: #333; } /* Upgrades */ .cmpy-mgmt-upgrade-container { - border:1px solid #fff; + border: 1px solid #fff; width: 60%; - margin:4px; + margin: 4px; } .cmpy-mgmt-upgrade-div { - display:inline-block; - border:1px solid #fff; - 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:#333; + background-color: #333; } diff --git a/css/interactivetutorial.css b/css/interactivetutorial.css index b861af790..095a626c8 100644 --- a/css/interactivetutorial.css +++ b/css/interactivetutorial.css @@ -1,6 +1,6 @@ /* interactivetutorial.css */ #interactive-tutorial-wrapper { - position:relative; + position: relative; } #interactive-tutorial-container { @@ -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:#000; + background-color: #000; } #interactive-tutorial-exit { diff --git a/css/loader.css b/css/loader.css index c23dfb52f..e6022d953 100644 --- a/css/loader.css +++ b/css/loader.css @@ -140,8 +140,8 @@ button[type="button"] { .loaderoverlay .loaderspinner, .loaderoverlay .loaderspinner:before, .loaderoverlay .loaderspinner:after { - border-top-color: #6f3!important; - border-bottom-color:#6f3 !important; + border-top-color: #6f3 !important; + border-bottom-color: #6f3 !important; } .loaderoverlay .loaderlabel { color: #6f3; diff --git a/css/menupages.css b/css/menupages.css index a73822fa2..e490c0334 100644 --- a/css/menupages.css +++ b/css/menupages.css @@ -17,7 +17,7 @@ /* Script Editor */ #script-editor-container { - background-color:transparent; + background-color: transparent; } #javascript-editor { margin: 10px; @@ -37,14 +37,14 @@ .ace_line, .ace_line * { - background-color:transparent; - margin:0px; - padding:0px; + background-color: transparent; + margin: 0px; + padding: 0px; } .ace_text-input { - font-size:16px; - background-color:transparent; + font-size: 16px; + background-color: transparent; } /* This temp element is used for auto adjusting filename field */ @@ -65,9 +65,9 @@ } #script-editor-wrapper { - height:100%; + height: 100%; width: 70%; - background:transparent; + background: transparent; } #script-editor-filename-wrapper { @@ -83,7 +83,7 @@ display: inline-block; padding-top: 10px; padding-bottom: 0px; - float:center; + float: center; background-color: #555; color: #fff; } @@ -96,7 +96,7 @@ color: #fff; margin: 4px; - padding: 2px; + padding: 2px; border: 2px solid var(--my-highlight-color); -webkit-box-shadow: @@ -116,23 +116,23 @@ } #script-editor-options-panel { - position:absolute; + position: absolute; right: 9%; - bottom:15%; - border:2px solid #fff; - width:19%; - background-color:#444; - padding:2px; - overflow:auto; + bottom: 15%; + border: 2px solid #fff; + width: 19%; + background-color: #444; + padding: 2px; + overflow: auto; z-index: 1; color: #fff; } #script-editor-options-panel fieldset { - margin-top:8px; - margin-bottom:8px; + margin-top: 8px; + margin-bottom: 8px; padding: 2px; - font-size:12px; + font-size: 12px; } /* Active scripts */ @@ -271,7 +271,7 @@ box-shadow: 1px 1px 3px #000; margin: 4px; padding: 4px; - background-color:#000; + background-color: #000; } .active-scripts-button:hover, @@ -403,11 +403,11 @@ } .faction-work-div-wrapper { - overflow:hidden; + overflow: hidden; border: 2px solid #333; padding: 6px; margin: 6px; - width:70%; + width: 70%; } #faction-donate-amount-txt, @@ -416,11 +416,11 @@ margin: 6px; display: inline-block; color: var(--my-font-color); - background-color:#000; + background-color: #000; } #faction-donate-amount-txt { - width:50%; + width: 50%; } #faction-container p, @@ -509,7 +509,7 @@ } #location-container a { - display:inline-block; + display: inline-block; width: 30%; } @@ -538,7 +538,7 @@ } #infiltration-left-panel, #infiltration-right-panel { - display:inline-block; + display: inline-block; border: 1px solid #fff; width: 35%; height: 75%; @@ -548,7 +548,7 @@ } #infiltration-faction-select { - color:#fff; + color: #fff; } #infiltration-left-panel p, @@ -557,7 +557,7 @@ } #infiltration-buttons .a-link-button { - display:inline; + display: inline; width: 25%; } @@ -587,12 +587,12 @@ } .stock-market-position-text { - color:#fff; - display:inline-block; + color: #fff; + display: inline-block; } .stock-market-order-list { - overflow-y:auto; + overflow-y: auto; max-height: 100px; } @@ -615,6 +615,6 @@ } .gang-member-info-div { - float:left; + float: left; background-color: #555; } diff --git a/css/missions.css b/css/missions.css index 6406699f5..261727afa 100644 --- a/css/missions.css +++ b/css/missions.css @@ -2,7 +2,7 @@ /* Hacking missions */ #mission-container { - overflow:hidden; + overflow: hidden; } .hack-mission-grid { @@ -13,29 +13,29 @@ grid-template-rows: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr; grid-gap: 2.5%; height: 90%; - position:absolute; + position: absolute; width: 100%; - overflow-y:auto; + overflow-y: auto; padding-right: 10px; } .hack-mission-grid::-webkit-scrollbar { - display:none; + display: none; } .hack-mission-node { - z-index:5; - background-color:#808080; + z-index: 5; + background-color: #808080; align-self: center; justify-self: center; - display:inline-block; + display: inline-block; } .hack-mission-node p { - margin-top:8px; - color:#fff; - font-size:12px; - text-align:center; + margin-top: 8px; + color: #fff; + font-size: 12px; + text-align: center; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -43,8 +43,8 @@ } .hack-mission-player-node { - color:#fff; - background-color:#00f; + color: #fff; + background-color: #00f; } .hack-mission-player-node-active { @@ -53,21 +53,21 @@ } .hack-mission-enemy-node { - color:#fff; - background-color:#f00; + color: #fff; + background-color: #f00; } .hack-mission-cpu-node { - width:100%; - height:100%; + width: 100%; + height: 100%; -moz-border-radius: 50%; -webkit-border-radius: 50%; border-radius: 50%; } .hack-mission-firewall-node { - width:90%; - height:100%; + width: 90%; + height: 100%; } .hack-mission-database-node { @@ -82,10 +82,10 @@ -webkit-transform: skew(-20deg); -moz-transform: skew(-20deg); -o-transform: skew(-20deg); - color:#fff; - font-size:12px; + color: #fff; + font-size: 12px; margin-top: 8px; - text-align:center; + text-align: center; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -104,10 +104,10 @@ -webkit-transform: skew(20deg); -moz-transform: skew(20deg); -o-transform: skew(20deg); - color:#fff; - font-size:12px; + color: #fff; + font-size: 12px; margin-top: 8px; - text-align:center; + text-align: center; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -116,7 +116,7 @@ .hack-mission-spam-node, .hack-mission-shield-node { - height:100%; + height: 100%; width: 100%; } diff --git a/css/popupboxes.css b/css/popupboxes.css index 35ae48ae5..2b92cdd33 100644 --- a/css/popupboxes.css +++ b/css/popupboxes.css @@ -7,7 +7,7 @@ top: 0; width: 100%; height: 100%; - overflow:auto; + overflow: auto; background-color: rbga(var(--my-background-color), 0.4); } @@ -29,7 +29,7 @@ padding: 2px; margin: 6px; border: 1px solid #fff; - background-color:#000; + background-color: #000; } .popup-box-button:hover, @@ -47,7 +47,7 @@ #yes-no-text-input-box-input { color: var(--my-font-color); border: 1px solid #fff; - background-color:#000; + background-color: #000; } .dialog-box-container, @@ -97,8 +97,8 @@ } #log-box-close, #log-box-kill-script { - float:right; - display:inline-block; + float: right; + display: inline-block; } .dialog-box-close-button:hover, @@ -126,7 +126,7 @@ } #infiltration-faction-select { - background-color:#000; + background-color: #000; } /* Generic Yes No Box */ @@ -177,10 +177,10 @@ } #game-options-left-panel fieldset { - padding:2px; - margin:2px; + padding: 2px; + margin: 2px; } #import-game-file-selector { - display:none; + display: none; } diff --git a/css/styles.css b/css/styles.css index 5ef165ddb..a0fed4938 100644 --- a/css/styles.css +++ b/css/styles.css @@ -42,7 +42,7 @@ span { } #entire-game-container { - background-color:transparent; + background-color: transparent; } /* Disable border highlight on elements */ @@ -51,7 +51,7 @@ textarea:focus, button:focus, td:focus, tr:focus { - outline:none; + outline: none; } /* Main navigation menu */ @@ -94,7 +94,7 @@ tr:focus { } .mainmenu>li a.active:hover { - background-color:#aaa; + background-color: #aaa; } /* Plus and minus signs */ @@ -111,7 +111,7 @@ tr:focus { } .mainmenu-accordion-header.opened { - background-color:#222; + background-color: #222; } /* Slide down transition */ @@ -123,12 +123,12 @@ tr:focus { /* Borders */ .mainmenu-accordion-header { - border:2px solid #fff; + border: 2px solid #fff; } /* Make html links ("a" elements) nice looking buttons with this class */ a:link, a:visited { - color:#fff; + color: #fff; } .a-link-button { @@ -198,18 +198,18 @@ a:link, a:visited { } .dropdown { - color:#fff; - background-color:#000; + color: #fff; + background-color: #000; } .text-input { - color:#fff; - background-color:#000; + color: #fff; + background-color: #000; } /* Notification icon (for create program right now only) */ #create-program-tab { - position:relative; + position: relative; } #create-program-notification { font-size: 10px; @@ -263,7 +263,7 @@ a:link, a:visited { text-align: center; padding: 4px; left: 101%; - bottom:-25%; + bottom: -25%; position: absolute; z-index: 99; @@ -280,7 +280,7 @@ a:link, a:visited { text-align: center; padding: 4px; left: 40%; - bottom:-10%; + bottom: -10%; position: absolute; z-index: 99; @@ -294,13 +294,13 @@ a:link, a:visited { /* help tip. Question mark that opens popup with info/details */ .help-tip { - content:'?'; - padding:1px; - margin-left:3px; - color:#fff; - border:1px solid #fff; - border-radius:5px; - display:inline-block; + content: '?'; + padding: 1px; + margin-left: 3px; + color: #fff; + border: 1px solid #fff; + border-radius: 5px; + display: inline-block; } .help-tip:hover { @@ -357,48 +357,48 @@ a:link, a:visited { } @-keyframes blink{ - 0% { opacity:1; } - 50% { opacity:0; } - 100% { opacity:1; } + 0% { opacity: 1; } + 50% { opacity: 0; } + 100% { opacity: 1; } } @-webkit-keyframes blink{ - 0% { opacity:1; } - 50% { opacity:0; } - 100% { opacity:1; } + 0% { opacity: 1; } + 50% { opacity: 0; } + 100% { opacity: 1; } } @-moz-keyframes blink{ - 0% { opacity:1; } - 50% { opacity:0; } - 100% { opacity:1; } + 0% { opacity: 1; } + 50% { opacity: 0; } + 100% { opacity: 1; } } @-ms-keyframes blink{ - 0% { opacity:1; } - 50% { opacity:0; } - 100% { opacity:1; } + 0% { opacity: 1; } + 50% { opacity: 0; } + 100% { opacity: 1; } } @-o-keyframes blink{ - 0% { opacity:1; } - 50% { opacity:0; } - 100% { opacity:1; } + 0% { opacity: 1; } + 50% { opacity: 0; } + 100% { opacity: 1; } } /* Status text */ @-webkit-keyframes status-text{ from{ - opacity:1; - top:0px; + opacity: 1; + top: 0px; } to{ - opacity:0; - top:0px; + opacity: 0; + top: 0px; } } .status-text{ - display:inline; - position:fixed; - top:0px; - -webkit-animation:status-text 3s 1; + display: inline; + position: fixed; + top: 0px; + -webkit-animation: status-text 3s 1; background-color: transparent; height: 15%; } @@ -457,7 +457,7 @@ a:link, a:visited { -webkit-box-shadow: 1px 1px 3px #000; box-shadow: 1px 1px 3px #000; height: 22px; - background-color:#000; + background-color: #000; } #character-overview-save-button:hover, @@ -475,12 +475,12 @@ a:link, a:visited { /* Scan analyze links from AutoLink */ .scan-analyze-link { - cursor:pointer; - color:#fff; - text-decoration:underline; + cursor: pointer; + color: #fff; + text-decoration: underline; } .scan-analyze-link:hover { - text-decoration:none; + text-decoration: none; } /* Accordion menus (Header with collapsible panel) */ @@ -529,8 +529,8 @@ a:link, a:visited { margin-left: 5%; display: none; background-color: #555; - overflow-y:auto; - overflow-x:none; + overflow-y: auto; + overflow-x: none; } .accordion-panel div, diff --git a/css/terminal.css b/css/terminal.css index 76fb71737..9633edc19 100644 --- a/css/terminal.css +++ b/css/terminal.css @@ -16,7 +16,7 @@ overflow: auto; overflow-y: scroll; background-color: var(--my-background-color); - table-layout:fixed; + table-layout: fixed; } #terminal-input { @@ -39,7 +39,7 @@ .terminal-line { width: 70%; word-wrap: break-word; - hyphens:auto; + hyphens: auto; -webkit-hyphens: auto; -moz-hyphens: auto; } diff --git a/css/workinprogress.css b/css/workinprogress.css index a13664e72..ed922ee65 100644 --- a/css/workinprogress.css +++ b/css/workinprogress.css @@ -44,12 +44,12 @@ } .bitnode { - color:#00f; + color: #00f; } .bitnode-destroyed { - color:#f00; + color: #f00; } .bitnode:hover, .bitnode-destroyed:hover { - color:#fff; + color: #fff; } diff --git a/stylelint.config.js b/stylelint.config.js index 646bbafa9..3098c18bb 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -65,7 +65,7 @@ module.exports = { // "declaration-block-single-line-max-declarations": 1, "declaration-block-trailing-semicolon": "always", "declaration-colon-newline-after": "always-multi-line", -// "declaration-colon-space-after": "always-single-line", + "declaration-colon-space-after": "always-single-line", "declaration-colon-space-before": "never", // "declaration-empty-line-before": "never", //"declaration-no-important": true, From bfa2c3d4f9250c14e7ef03c9962f93162595adfc Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 21:50:35 -0400 Subject: [PATCH 05/14] [refactor] Enabled Stylelint 'no-extra-semicolons' rule --- css/styles.css | 6 +++--- stylelint.config.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/styles.css b/css/styles.css index a0fed4938..d8900ea4f 100644 --- a/css/styles.css +++ b/css/styles.css @@ -243,7 +243,7 @@ a:link, a:visited { visibility: hidden; width: 300px; background-color: var(--my-background-color); - border: 2px solid var(--my-highlight-color);; + border: 2px solid var(--my-highlight-color); color: #fff; text-align: center; padding: 4px; @@ -258,7 +258,7 @@ a:link, a:visited { visibility: hidden; width: 300px; background-color: var(--my-background-color); - border: 2px solid var(--my-highlight-color);; + border: 2px solid var(--my-highlight-color); color: #fff; text-align: center; padding: 4px; @@ -275,7 +275,7 @@ a:link, a:visited { visibility: hidden; width: 300px; background-color: var(--my-background-color); - border: 2px solid var(--my-highlight-color);; + border: 2px solid var(--my-highlight-color); color: #fff; text-align: center; padding: 4px; diff --git a/stylelint.config.js b/stylelint.config.js index 3098c18bb..4ab0d7c22 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -125,7 +125,7 @@ module.exports = { // "no-duplicate-selectors": true, "no-empty-source": true, "no-eol-whitespace": true, -// "no-extra-semicolons": true, + "no-extra-semicolons": true, "no-invalid-double-slash-comments": true, // "no-missing-end-of-source-newline": true, "no-unknown-animations": true, From 877a27654211b940e816221cacc95738bcfd992d Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 22:37:19 -0400 Subject: [PATCH 06/14] [refactor] Enabled Stylelint 'length-zero-no-unit' rule --- css/bladeburner.css | 6 +++--- css/menupages.css | 20 ++++++++++---------- css/styles.css | 16 ++++++++-------- css/terminal.css | 6 +++--- stylelint.config.js | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/css/bladeburner.css b/css/bladeburner.css index 2a658fb8c..9d1736db4 100644 --- a/css/bladeburner.css +++ b/css/bladeburner.css @@ -72,9 +72,9 @@ .bladeburner-console-input { display: inline-block; - padding: 0px !important; - margin: 0px !important; - border: 0px; + padding: 0 !important; + margin: 0 !important; + border: 0; background-color: var(--my-background-color); font-size: 13px; outline: none; diff --git a/css/menupages.css b/css/menupages.css index e490c0334..c1d6c76f3 100644 --- a/css/menupages.css +++ b/css/menupages.css @@ -38,8 +38,8 @@ .ace_line, .ace_line * { background-color: transparent; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } .ace_text-input { @@ -60,8 +60,8 @@ #script-editor-buttons-wrapper { width: 100%; - padding-right: 0xp; - margin-right: 0px; + padding-right: 0; + margin-right: 0; } #script-editor-wrapper { @@ -73,7 +73,7 @@ #script-editor-filename-wrapper { background-color: #555; margin-left: 6px; - margin-right: 0px; + margin-right: 0; padding-left: 6px; width: 100%; border: 2px solid var(--my-highlight-color); @@ -82,7 +82,7 @@ #script-editor-filename-tag { display: inline-block; padding-top: 10px; - padding-bottom: 0px; + padding-bottom: 0; float: center; background-color: #555; color: #fff; @@ -156,7 +156,7 @@ background-color: #444; font-size: 20px; color: #fff; - margin: 6px 6px 0px 6px; + margin: 6px 6px 0 6px; padding: 6px; cursor: pointer; width: 60%; @@ -191,8 +191,8 @@ } .active-scripts-server-panel { - margin: 0px 6px 6px 6px; - padding: 0px 6px 6px 6px; + margin: 0 6px 6px 6px; + padding: 0 6px 6px 6px; width: 55%; margin-left: 5%; display: none; @@ -601,7 +601,7 @@ border: 1px solid #fff; color: var(--my-font-color); margin: 2px; - padding: 0px; + padding: 0; } /* Gang */ diff --git a/css/styles.css b/css/styles.css index d8900ea4f..197cae8ae 100644 --- a/css/styles.css +++ b/css/styles.css @@ -229,8 +229,8 @@ a:link, a:visited { .notification-off { background-color: #333; color: #333; - border-radius: 0px; - padding: 0px; + border-radius: 0; + padding: 0; } /* Tool tips (when hovering over an element */ @@ -386,18 +386,18 @@ a:link, a:visited { @-webkit-keyframes status-text{ from{ opacity: 1; - top: 0px; + top: 0; } to{ opacity: 0; - top: 0px; + top: 0; } } .status-text{ display: inline; position: fixed; - top: 0px; + top: 0; -webkit-animation: status-text 3s 1; background-color: transparent; height: 15%; @@ -488,7 +488,7 @@ a:link, a:visited { background-color: #444; font-size: 20px; color: #fff; - margin: 6px 6px 0px 6px; + margin: 6px 6px 0 6px; padding: 6px; cursor: pointer; width: 80%; @@ -523,8 +523,8 @@ a:link, a:visited { } .accordion-panel { - margin: 0px 6px 6px 6px; - padding: 0px 6px 6px 6px; + margin: 0 6px 6px 6px; + padding: 0 6px 6px 6px; width: 75%; margin-left: 5%; display: none; diff --git a/css/terminal.css b/css/terminal.css index 9633edc19..b3fc648ab 100644 --- a/css/terminal.css +++ b/css/terminal.css @@ -27,9 +27,9 @@ .terminal-input { display: inline-block; - padding: 0px !important; - margin: 0px !important; - border: 0px; + padding: 0 !important; + margin: 0 !important; + border: 0; background-color: var(--my-background-color); font-size: 16px; outline: none; diff --git a/stylelint.config.js b/stylelint.config.js index 4ab0d7c22..de2e149e6 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -102,7 +102,7 @@ module.exports = { "function-whitespace-after": "always", // "indentation": 4, "keyframe-declaration-no-important": true, -// "length-zero-no-unit": true, + "length-zero-no-unit": true, // "max-empty-lines": 1, "max-line-length": 160, "max-nesting-depth": 99, From 30de15efb77e4140c7662d67036beca767009181 Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 22:46:11 -0400 Subject: [PATCH 07/14] [refactor] Enabled Stylelint 'function-comma-space-after' rule --- css/loader.css | 64 ++++++++++++++++++++++----------------------- css/menupages.css | 24 ++++++++--------- stylelint.config.js | 2 +- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/css/loader.css b/css/loader.css index e6022d953..0e18fb004 100644 --- a/css/loader.css +++ b/css/loader.css @@ -1,53 +1,53 @@ @-webkit-keyframes LOADERSPINNER { - 0% { -webkit-transform: translate(-50%,-50%) rotate(0deg); } - 100% { -webkit-transform: translate(-50%,-50%) rotate(360deg); } + 0% { -webkit-transform: translate(-50%, -50%) rotate(0deg); } + 100% { -webkit-transform: translate(-50%, -50%) rotate(360deg); } } @-moz-keyframes LOADERSPINNER { - 0% { -moz-transform: translate(-50%,-50%) rotate(0deg); } - 100% { -moz-transform: translate(-50%,-50%) rotate(360deg); } + 0% { -moz-transform: translate(-50%, -50%) rotate(0deg); } + 100% { -moz-transform: translate(-50%, -50%) rotate(360deg); } } @-ms-keyframes LOADERSPINNER { - 0% { -ms-transform: translate(-50%,-50%) rotate(0deg); } - 100% { -ms-transform: translate(-50%,-50%) rotate(360deg); } + 0% { -ms-transform: translate(-50%, -50%) rotate(0deg); } + 100% { -ms-transform: translate(-50%, -50%) rotate(360deg); } } @-o-keyframes LOADERSPINNER { - 0% { -o-transform: translate(-50%,-50%) rotate(0deg); } - 100% { -o-transform: translate(-50%,-50%) rotate(360deg); } + 0% { -o-transform: translate(-50%, -50%) rotate(0deg); } + 100% { -o-transform: translate(-50%, -50%) rotate(360deg); } } @keyframes LOADERSPINNER { - 0% { transform: translate(-50%,-50%) rotate(0deg); } - 100% { transform: translate(-50%,-50%) rotate(360deg); } + 0% { transform: translate(-50%, -50%) rotate(0deg); } + 100% { transform: translate(-50%, -50%) rotate(360deg); } } @-webkit-keyframes LOADERLABEL { - 0% { opacity: 1.0; -webkit-transform: translate(-50%,-50%) scale(1.0); } - 5% { opacity: 0.5; -webkit-transform: translate(-50%,-50%) scale(0.5); } - 95% { opacity: 0.5; -webkit-transform: translate(-50%,-50%) scale(0.5); } - 100% { opacity: 1.0; -webkit-transform: translate(-50%,-50%) scale(1.0); } + 0% { opacity: 1.0; -webkit-transform: translate(-50%, -50%) scale(1.0); } + 5% { opacity: 0.5; -webkit-transform: translate(-50%, -50%) scale(0.5); } + 95% { opacity: 0.5; -webkit-transform: translate(-50%, -50%) scale(0.5); } + 100% { opacity: 1.0; -webkit-transform: translate(-50%, -50%) scale(1.0); } } @-moz-keyframes LOADERLABEL { - 0% { opacity: 1.0; -moz-transform: translate(-50%,-50%) scale(1.0); } - 5% { opacity: 0.5; -moz-transform: translate(-50%,-50%) scale(0.5); } - 95% { opacity: 0.5; -moz-transform: translate(-50%,-50%) scale(0.5); } - 100% { opacity: 1.0; -moz-transform: translate(-50%,-50%) scale(1.0); } + 0% { opacity: 1.0; -moz-transform: translate(-50%, -50%) scale(1.0); } + 5% { opacity: 0.5; -moz-transform: translate(-50%, -50%) scale(0.5); } + 95% { opacity: 0.5; -moz-transform: translate(-50%, -50%) scale(0.5); } + 100% { opacity: 1.0; -moz-transform: translate(-50%, -50%) scale(1.0); } } @-ms-keyframes LOADERLABEL { - 0% { opacity: 1.0; -ms-transform: translate(-50%,-50%) scale(1.0); } - 5% { opacity: 0.5; -ms-transform: translate(-50%,-50%) scale(0.5); } - 95% { opacity: 0.5; -ms-transform: translate(-50%,-50%) scale(0.5); } - 100% { opacity: 1.0; -ms-transform: translate(-50%,-50%) scale(1.0); } + 0% { opacity: 1.0; -ms-transform: translate(-50%, -50%) scale(1.0); } + 5% { opacity: 0.5; -ms-transform: translate(-50%, -50%) scale(0.5); } + 95% { opacity: 0.5; -ms-transform: translate(-50%, -50%) scale(0.5); } + 100% { opacity: 1.0; -ms-transform: translate(-50%, -50%) scale(1.0); } } @-o-keyframes LOADERLABEL { - 0% { opacity: 1.0; -o-transform: translate(-50%,-50%) scale(1.0); } - 5% { opacity: 0.5; -o-transform: translate(-50%,-50%) scale(0.5); } - 95% { opacity: 0.5; -o-transform: translate(-50%,-50%) scale(0.5); } - 100% { opacity: 1.0; -o-transform: translate(-50%,-50%) scale(1.0); } + 0% { opacity: 1.0; -o-transform: translate(-50%, -50%) scale(1.0); } + 5% { opacity: 0.5; -o-transform: translate(-50%, -50%) scale(0.5); } + 95% { opacity: 0.5; -o-transform: translate(-50%, -50%) scale(0.5); } + 100% { opacity: 1.0; -o-transform: translate(-50%, -50%) scale(1.0); } } @keyframes LOADERLABEL { - 0% { opacity: 1.0; transform: translate(-50%,-50%) scale(1.0); } - 5% { opacity: 0.5; transform: translate(-50%,-50%) scale(0.5); } - 95% { opacity: 0.5; transform: translate(-50%,-50%) scale(0.5); } - 100% { opacity: 1.0; transform: translate(-50%,-50%) scale(1.0); } + 0% { opacity: 1.0; transform: translate(-50%, -50%) scale(1.0); } + 5% { opacity: 0.5; transform: translate(-50%, -50%) scale(0.5); } + 95% { opacity: 0.5; transform: translate(-50%, -50%) scale(0.5); } + 100% { opacity: 1.0; transform: translate(-50%, -50%) scale(1.0); } } *, *:before, *:after { @@ -60,12 +60,12 @@ position: absolute; width: 100%; height: 100%; - background: rgba(255,255,255,1.0); + background: rgba(255, 255, 255, 1.0); } .loaderoverlay .loaderspinner, .loaderoverlay .loaderspinner:before, .loaderoverlay .loaderspinner:after { - border: 20px solid rgba(0,0,0,0); + border: 20px solid rgba(0, 0, 0, 0); border-top: 20px solid #ccc; border-bottom: 20px solid #ccc; border-radius: 1000px; diff --git a/css/menupages.css b/css/menupages.css index c1d6c76f3..884b61b12 100644 --- a/css/menupages.css +++ b/css/menupages.css @@ -100,14 +100,14 @@ border: 2px solid var(--my-highlight-color); -webkit-box-shadow: - inset 0 0 8px rgba(0,0,0,0.1), - 0 0 16px rgba(0,0,0,0.1); + inset 0 0 8px rgba(0, 0, 0, 0.1), + 0 0 16px rgba(0, 0, 0, 0.1); -moz-box-shadow: - inset 0 0 8px rgba(0,0,0,0.1), - 0 0 16px rgba(0,0,0,0.1); + inset 0 0 8px rgba(0, 0, 0, 0.1), + 0 0 16px rgba(0, 0, 0, 0.1); box-shadow: - inset 0 0 8px rgba(0,0,0,0.1), - 0 0 16px rgba(0,0,0,0.1); + inset 0 0 8px rgba(0, 0, 0, 0.1), + 0 0 16px rgba(0, 0, 0, 0.1); } #script-editor-status { @@ -328,14 +328,14 @@ width: 34vw; border: 2px solid var(--my-highlight-color); -webkit-box-shadow: - inset 0 0 8px rgba(0,0,0,0.1), - 0 0 16px rgba(0,0,0,0.1); + inset 0 0 8px rgba(0, 0, 0, 0.1), + 0 0 16px rgba(0, 0, 0, 0.1); -moz-box-shadow: - inset 0 0 8px rgba(0,0,0,0.1), - 0 0 16px rgba(0,0,0,0.1); + inset 0 0 8px rgba(0, 0, 0, 0.1), + 0 0 16px rgba(0, 0, 0, 0.1); box-shadow: - inset 0 0 8px rgba(0,0,0,0.1), - 0 0 16px rgba(0,0,0,0.1); + inset 0 0 8px rgba(0, 0, 0, 0.1), + 0 0 16px rgba(0, 0, 0, 0.1); } .hacknet-node-container { diff --git a/stylelint.config.js b/stylelint.config.js index de2e149e6..d232b2cf6 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -81,7 +81,7 @@ module.exports = { "function-calc-no-unspaced-operator": true, "function-comma-newline-after": "always-multi-line", "function-comma-newline-before": "never-multi-line", -// "function-comma-space-after": "always-single-line", + "function-comma-space-after": "always-single-line", "function-comma-space-before": "never", "function-linear-gradient-no-nonstandard-direction": true, "function-max-empty-lines": 1, From 17c91b83d1b13410e766884c36c5b42182b9e032 Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 23:10:31 -0400 Subject: [PATCH 08/14] [style] Enabled Stylelint 'indentation' rule --- css/bladeburner.css | 12 +-- css/loader.css | 190 ++++++++++++++++++++++---------------------- css/menupages.css | 58 +++++++------- css/missions.css | 24 +++--- css/styles.css | 56 ++++++------- css/terminal.css | 24 +++--- stylelint.config.js | 2 +- 7 files changed, 183 insertions(+), 183 deletions(-) diff --git a/css/bladeburner.css b/css/bladeburner.css index 9d1736db4..149a5d0cf 100644 --- a/css/bladeburner.css +++ b/css/bladeburner.css @@ -72,12 +72,12 @@ .bladeburner-console-input { display: inline-block; - padding: 0 !important; - margin: 0 !important; - border: 0; - 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; } diff --git a/css/loader.css b/css/loader.css index 0e18fb004..606ddcaf5 100644 --- a/css/loader.css +++ b/css/loader.css @@ -1,148 +1,148 @@ @-webkit-keyframes LOADERSPINNER { - 0% { -webkit-transform: translate(-50%, -50%) rotate(0deg); } - 100% { -webkit-transform: translate(-50%, -50%) rotate(360deg); } + 0% { -webkit-transform: translate(-50%, -50%) rotate(0deg); } + 100% { -webkit-transform: translate(-50%, -50%) rotate(360deg); } } @-moz-keyframes LOADERSPINNER { - 0% { -moz-transform: translate(-50%, -50%) rotate(0deg); } - 100% { -moz-transform: translate(-50%, -50%) rotate(360deg); } + 0% { -moz-transform: translate(-50%, -50%) rotate(0deg); } + 100% { -moz-transform: translate(-50%, -50%) rotate(360deg); } } @-ms-keyframes LOADERSPINNER { - 0% { -ms-transform: translate(-50%, -50%) rotate(0deg); } - 100% { -ms-transform: translate(-50%, -50%) rotate(360deg); } + 0% { -ms-transform: translate(-50%, -50%) rotate(0deg); } + 100% { -ms-transform: translate(-50%, -50%) rotate(360deg); } } @-o-keyframes LOADERSPINNER { - 0% { -o-transform: translate(-50%, -50%) rotate(0deg); } - 100% { -o-transform: translate(-50%, -50%) rotate(360deg); } + 0% { -o-transform: translate(-50%, -50%) rotate(0deg); } + 100% { -o-transform: translate(-50%, -50%) rotate(360deg); } } @keyframes LOADERSPINNER { - 0% { transform: translate(-50%, -50%) rotate(0deg); } - 100% { transform: translate(-50%, -50%) rotate(360deg); } + 0% { transform: translate(-50%, -50%) rotate(0deg); } + 100% { transform: translate(-50%, -50%) rotate(360deg); } } @-webkit-keyframes LOADERLABEL { - 0% { opacity: 1.0; -webkit-transform: translate(-50%, -50%) scale(1.0); } - 5% { opacity: 0.5; -webkit-transform: translate(-50%, -50%) scale(0.5); } - 95% { opacity: 0.5; -webkit-transform: translate(-50%, -50%) scale(0.5); } - 100% { opacity: 1.0; -webkit-transform: translate(-50%, -50%) scale(1.0); } + 0% { opacity: 1.0; -webkit-transform: translate(-50%, -50%) scale(1.0); } + 5% { opacity: 0.5; -webkit-transform: translate(-50%, -50%) scale(0.5); } + 95% { opacity: 0.5; -webkit-transform: translate(-50%, -50%) scale(0.5); } + 100% { opacity: 1.0; -webkit-transform: translate(-50%, -50%) scale(1.0); } } @-moz-keyframes LOADERLABEL { - 0% { opacity: 1.0; -moz-transform: translate(-50%, -50%) scale(1.0); } - 5% { opacity: 0.5; -moz-transform: translate(-50%, -50%) scale(0.5); } - 95% { opacity: 0.5; -moz-transform: translate(-50%, -50%) scale(0.5); } - 100% { opacity: 1.0; -moz-transform: translate(-50%, -50%) scale(1.0); } + 0% { opacity: 1.0; -moz-transform: translate(-50%, -50%) scale(1.0); } + 5% { opacity: 0.5; -moz-transform: translate(-50%, -50%) scale(0.5); } + 95% { opacity: 0.5; -moz-transform: translate(-50%, -50%) scale(0.5); } + 100% { opacity: 1.0; -moz-transform: translate(-50%, -50%) scale(1.0); } } @-ms-keyframes LOADERLABEL { - 0% { opacity: 1.0; -ms-transform: translate(-50%, -50%) scale(1.0); } - 5% { opacity: 0.5; -ms-transform: translate(-50%, -50%) scale(0.5); } - 95% { opacity: 0.5; -ms-transform: translate(-50%, -50%) scale(0.5); } - 100% { opacity: 1.0; -ms-transform: translate(-50%, -50%) scale(1.0); } + 0% { opacity: 1.0; -ms-transform: translate(-50%, -50%) scale(1.0); } + 5% { opacity: 0.5; -ms-transform: translate(-50%, -50%) scale(0.5); } + 95% { opacity: 0.5; -ms-transform: translate(-50%, -50%) scale(0.5); } + 100% { opacity: 1.0; -ms-transform: translate(-50%, -50%) scale(1.0); } } @-o-keyframes LOADERLABEL { - 0% { opacity: 1.0; -o-transform: translate(-50%, -50%) scale(1.0); } - 5% { opacity: 0.5; -o-transform: translate(-50%, -50%) scale(0.5); } - 95% { opacity: 0.5; -o-transform: translate(-50%, -50%) scale(0.5); } - 100% { opacity: 1.0; -o-transform: translate(-50%, -50%) scale(1.0); } + 0% { opacity: 1.0; -o-transform: translate(-50%, -50%) scale(1.0); } + 5% { opacity: 0.5; -o-transform: translate(-50%, -50%) scale(0.5); } + 95% { opacity: 0.5; -o-transform: translate(-50%, -50%) scale(0.5); } + 100% { opacity: 1.0; -o-transform: translate(-50%, -50%) scale(1.0); } } @keyframes LOADERLABEL { - 0% { opacity: 1.0; transform: translate(-50%, -50%) scale(1.0); } - 5% { opacity: 0.5; transform: translate(-50%, -50%) scale(0.5); } - 95% { opacity: 0.5; transform: translate(-50%, -50%) scale(0.5); } - 100% { opacity: 1.0; transform: translate(-50%, -50%) scale(1.0); } + 0% { opacity: 1.0; transform: translate(-50%, -50%) scale(1.0); } + 5% { opacity: 0.5; transform: translate(-50%, -50%) scale(0.5); } + 95% { opacity: 0.5; transform: translate(-50%, -50%) scale(0.5); } + 100% { opacity: 1.0; transform: translate(-50%, -50%) scale(1.0); } } *, *:before, *:after { - margin: 0; - padding: 0; - box-sizing: border-box; - vertical-align: top; + margin: 0; + padding: 0; + box-sizing: border-box; + vertical-align: top; } .loaderoverlay { - position: absolute; - width: 100%; - height: 100%; - background: rgba(255, 255, 255, 1.0); + position: absolute; + width: 100%; + height: 100%; + background: rgba(255, 255, 255, 1.0); } .loaderoverlay .loaderspinner, .loaderoverlay .loaderspinner:before, .loaderoverlay .loaderspinner:after { - border: 20px solid rgba(0, 0, 0, 0); - border-top: 20px solid #ccc; - border-bottom: 20px solid #ccc; - border-radius: 1000px; - position: absolute; - top: 50%; - left: 50%; + border: 20px solid rgba(0, 0, 0, 0); + border-top: 20px solid #ccc; + border-bottom: 20px solid #ccc; + border-radius: 1000px; + position: absolute; + top: 50%; + left: 50%; } .loaderoverlay .loaderspinner:before, .loaderoverlay .loaderspinner:after { - content: ""; + content: ""; } .loaderoverlay .loaderspinner { - width: 200px; - height: 200px; - -webkit-animation: LOADERSPINNER 5s linear infinite; - -moz-animation: LOADERSPINNER 5s linear infinite; - -ms-animation: LOADERSPINNER 5s linear infinite; - -o-animation: LOADERSPINNER 5s linear infinite; - animation: LOADERSPINNER 5s linear infinite; + width: 200px; + height: 200px; + -webkit-animation: LOADERSPINNER 5s linear infinite; + -moz-animation: LOADERSPINNER 5s linear infinite; + -ms-animation: LOADERSPINNER 5s linear infinite; + -o-animation: LOADERSPINNER 5s linear infinite; + animation: LOADERSPINNER 5s linear infinite; } .loaderoverlay .loaderspinner:before { - width: 160px; - height: 160px; - -webkit-animation: LOADERSPINNER 10s linear infinite; - -moz-animation: LOADERSPINNER 10s linear infinite; - -ms-animation: LOADERSPINNER 10s linear infinite; - -o-animation: LOADERSPINNER 10s linear infinite; - animation: LOADERSPINNER 10s linear infinite; + width: 160px; + height: 160px; + -webkit-animation: LOADERSPINNER 10s linear infinite; + -moz-animation: LOADERSPINNER 10s linear infinite; + -ms-animation: LOADERSPINNER 10s linear infinite; + -o-animation: LOADERSPINNER 10s linear infinite; + animation: LOADERSPINNER 10s linear infinite; } .loaderoverlay .loaderspinner:after { - width: 120px; - height: 120px; - -webkit-animation: LOADERSPINNER 5s linear infinite; - -moz-animation: LOADERSPINNER 5s linear infinite; - -ms-animation: LOADERSPINNER 5s linear infinite; - -o-animation: LOADERSPINNER 5s linear infinite; - animation: LOADERSPINNER 5s linear infinite; + width: 120px; + height: 120px; + -webkit-animation: LOADERSPINNER 5s linear infinite; + -moz-animation: LOADERSPINNER 5s linear infinite; + -ms-animation: LOADERSPINNER 5s linear infinite; + -o-animation: LOADERSPINNER 5s linear infinite; + animation: LOADERSPINNER 5s linear infinite; } .loaderoverlay .loaderlabel { - color: #6f3; - text-transform: uppercase; - font-family: sans-serif; - font-size: 22px; - font-weight: 700; - letter-spacing: 2px; - position: absolute; - top: 50%; - left: 50%; - -webkit-animation: LOADERLABEL 5s linear infinite; - -moz-animation: LOADERLABEL 5s linear infinite; - -ms-animation: LOADERLABEL 5s linear infinite; - -o-animation: LOADERLABEL 5s linear infinite; - animation: LOADERLABEL 5s linear infinite; + color: #6f3; + text-transform: uppercase; + font-family: sans-serif; + font-size: 22px; + font-weight: 700; + letter-spacing: 2px; + position: absolute; + top: 50%; + left: 50%; + -webkit-animation: LOADERLABEL 5s linear infinite; + -moz-animation: LOADERLABEL 5s linear infinite; + -ms-animation: LOADERLABEL 5s linear infinite; + -o-animation: LOADERLABEL 5s linear infinite; + animation: LOADERLABEL 5s linear infinite; } button[type="button"] { - padding: 0.5rem 1rem; - position: absolute; - z-index: 1; - bottom: 10px; - left: 50%; - -webkit-transform: translateX(-50%); - -moz-transform: translateX(-50%); - -ms-transform: translateX(-50%); - -o-transform: translateX(-50%); - transform: translateX(-50%); + padding: 0.5rem 1rem; + position: absolute; + z-index: 1; + bottom: 10px; + left: 50%; + -webkit-transform: translateX(-50%); + -moz-transform: translateX(-50%); + -ms-transform: translateX(-50%); + -o-transform: translateX(-50%); + transform: translateX(-50%); } /* Customize */ .loaderoverlay { - background: #000; + background: #000; } .loaderoverlay .loaderspinner, .loaderoverlay .loaderspinner:before, .loaderoverlay .loaderspinner:after { - border-top-color: #6f3 !important; - border-bottom-color: #6f3 !important; + border-top-color: #6f3 !important; + border-bottom-color: #6f3 !important; } .loaderoverlay .loaderlabel { - color: #6f3; + color: #6f3; } \ No newline at end of file diff --git a/css/menupages.css b/css/menupages.css index 884b61b12..68c2b5654 100644 --- a/css/menupages.css +++ b/css/menupages.css @@ -1,12 +1,12 @@ /* CSS for different main menu pages, such as character info, script editor, etc (but excluding - terminal which has its own page) */ + terminal which has its own page) */ .generic-menupage-container { height: 100%; padding-left: 10px; margin-left: 10%; width: 99%; - overflow-y: scroll; + overflow-y: scroll; } /* Character Info */ @@ -49,13 +49,13 @@ /* This temp element is used for auto adjusting filename field */ .tmp-element { - visibility: hidden; - white-space: pre; + visibility: hidden; + white-space: pre; } #script-editor-container { - position: fixed; - padding-top: 10px; + position: fixed; + padding-top: 10px; } #script-editor-buttons-wrapper { @@ -91,28 +91,28 @@ #script-editor-filename { background-color: #555; display: inline-block; - float: center; - resize: none; - color: #fff; + float: center; + resize: none; + color: #fff; margin: 4px; padding: 2px; border: 2px solid var(--my-highlight-color); -webkit-box-shadow: - inset 0 0 8px rgba(0, 0, 0, 0.1), - 0 0 16px rgba(0, 0, 0, 0.1); + inset 0 0 8px rgba(0, 0, 0, 0.1), + 0 0 16px rgba(0, 0, 0, 0.1); -moz-box-shadow: - inset 0 0 8px rgba(0, 0, 0, 0.1), - 0 0 16px rgba(0, 0, 0, 0.1); + inset 0 0 8px rgba(0, 0, 0, 0.1), + 0 0 16px rgba(0, 0, 0, 0.1); box-shadow: - inset 0 0 8px rgba(0, 0, 0, 0.1), - 0 0 16px rgba(0, 0, 0, 0.1); + inset 0 0 8px rgba(0, 0, 0, 0.1), + 0 0 16px rgba(0, 0, 0, 0.1); } #script-editor-status { - float: left; - color: #fff; + float: left; + color: #fff; } #script-editor-options-panel { @@ -141,8 +141,8 @@ } #active-scripts-container { - position: fixed; - padding-top: 10px; + position: fixed; + padding-top: 10px; } #active-scripts-text, @@ -328,14 +328,14 @@ width: 34vw; border: 2px solid var(--my-highlight-color); -webkit-box-shadow: - inset 0 0 8px rgba(0, 0, 0, 0.1), - 0 0 16px rgba(0, 0, 0, 0.1); + inset 0 0 8px rgba(0, 0, 0, 0.1), + 0 0 16px rgba(0, 0, 0, 0.1); -moz-box-shadow: - inset 0 0 8px rgba(0, 0, 0, 0.1), - 0 0 16px rgba(0, 0, 0, 0.1); + inset 0 0 8px rgba(0, 0, 0, 0.1), + 0 0 16px rgba(0, 0, 0, 0.1); box-shadow: - inset 0 0 8px rgba(0, 0, 0, 0.1), - 0 0 16px rgba(0, 0, 0, 0.1); + inset 0 0 8px rgba(0, 0, 0, 0.1), + 0 0 16px rgba(0, 0, 0, 0.1); } .hacknet-node-container { @@ -467,7 +467,7 @@ .augmentations-list button, .augmentations-list div { color: var(--my-font-color); - padding: 8px; + padding: 8px; text-decoration: none; } @@ -503,8 +503,8 @@ /* Location */ #location-container { - position: fixed; - padding: 6px; + position: fixed; + padding: 6px; overflow-x: hidden; } @@ -524,7 +524,7 @@ } #location-container * { - margin: 10px 5px 10px 5px; + margin: 10px 5px 10px 5px; } #location-job-reputation, #location-company-favor { diff --git a/css/missions.css b/css/missions.css index 261727afa..2c57e59e9 100644 --- a/css/missions.css +++ b/css/missions.css @@ -72,16 +72,16 @@ .hack-mission-database-node { width: 100%; - height: 90%; - -webkit-transform: skew(20deg); - -moz-transform: skew(20deg); - -o-transform: skew(20deg); + height: 90%; + -webkit-transform: skew(20deg); + -moz-transform: skew(20deg); + -o-transform: skew(20deg); } .hack-mission-database-node p { -webkit-transform: skew(-20deg); - -moz-transform: skew(-20deg); - -o-transform: skew(-20deg); + -moz-transform: skew(-20deg); + -o-transform: skew(-20deg); color: #fff; font-size: 12px; margin-top: 8px; @@ -94,16 +94,16 @@ .hack-mission-transfer-node { width: 100%; - height: 90%; - -webkit-transform: skew(-20deg); - -moz-transform: skew(-20deg); - -o-transform: skew(-20deg); + height: 90%; + -webkit-transform: skew(-20deg); + -moz-transform: skew(-20deg); + -o-transform: skew(-20deg); } .hack-mission-transfer-node p { -webkit-transform: skew(20deg); - -moz-transform: skew(20deg); - -o-transform: skew(20deg); + -moz-transform: skew(20deg); + -o-transform: skew(20deg); color: #fff; font-size: 12px; margin-top: 8px; diff --git a/css/styles.css b/css/styles.css index 197cae8ae..f81180722 100644 --- a/css/styles.css +++ b/css/styles.css @@ -65,9 +65,9 @@ tr:focus { overflow: auto; border: 0; - border-bottom: 1px solid #000; - border-radius: 0; - background-color: #333; + border-bottom: 1px solid #000; + border-radius: 0; + background-color: #333; } /* Default buttons */ @@ -151,8 +151,8 @@ a:link, a:visited { .a-link-button:active { -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6); - -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6); - box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6); + -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6); + box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6); } /* Make anchor tags ("a" elements) inactive (not clickable) */ @@ -309,8 +309,8 @@ a:link, a:visited { .help-tip:active { -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6); - -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6); - box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6); + -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6); + box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6); } /* Flashing button (Red) */ @@ -348,38 +348,38 @@ a:link, a:visited { /* Blinking Cursor */ /* ----- blinking cursor animation ----- */ .typed-cursor{ - opacity: 1; - -webkit-animation: blink 0.95s infinite; - -moz-animation: blink 0.95s infinite; - -ms-animation: blink 0.95s infinite; - -o-animation: blink 0.95s infinite; - animation: blink 0.95s infinite; + opacity: 1; + -webkit-animation: blink 0.95s infinite; + -moz-animation: blink 0.95s infinite; + -ms-animation: blink 0.95s infinite; + -o-animation: blink 0.95s infinite; + animation: blink 0.95s infinite; } @-keyframes blink{ - 0% { opacity: 1; } - 50% { opacity: 0; } - 100% { opacity: 1; } + 0% { opacity: 1; } + 50% { opacity: 0; } + 100% { opacity: 1; } } @-webkit-keyframes blink{ - 0% { opacity: 1; } - 50% { opacity: 0; } - 100% { opacity: 1; } + 0% { opacity: 1; } + 50% { opacity: 0; } + 100% { opacity: 1; } } @-moz-keyframes blink{ - 0% { opacity: 1; } - 50% { opacity: 0; } - 100% { opacity: 1; } + 0% { opacity: 1; } + 50% { opacity: 0; } + 100% { opacity: 1; } } @-ms-keyframes blink{ - 0% { opacity: 1; } - 50% { opacity: 0; } - 100% { opacity: 1; } + 0% { opacity: 1; } + 50% { opacity: 0; } + 100% { opacity: 1; } } @-o-keyframes blink{ - 0% { opacity: 1; } - 50% { opacity: 0; } - 100% { opacity: 1; } + 0% { opacity: 1; } + 50% { opacity: 0; } + 100% { opacity: 1; } } /* Status text */ diff --git a/css/terminal.css b/css/terminal.css index b3fc648ab..54da4e75e 100644 --- a/css/terminal.css +++ b/css/terminal.css @@ -1,10 +1,10 @@ #terminal-container { position: fixed; margin-left: 10%; - height: 100%; + height: 100%; width: 99%; - overflow: auto; - overflow-y: scroll; + overflow: auto; + overflow-y: scroll; } #terminal { @@ -13,8 +13,8 @@ height: auto; width: 70%; font-size: 16px; - overflow: auto; - overflow-y: scroll; + overflow: auto; + overflow-y: scroll; background-color: var(--my-background-color); table-layout: fixed; } @@ -26,13 +26,13 @@ } .terminal-input { - display: inline-block; - padding: 0 !important; - margin: 0 !important; - border: 0; - background-color: var(--my-background-color); - font-size: 16px; - outline: none; + display: inline-block; + padding: 0 !important; + margin: 0 !important; + border: 0; + background-color: var(--my-background-color); + font-size: 16px; + outline: none; color: var(--my-font-color); } diff --git a/stylelint.config.js b/stylelint.config.js index d232b2cf6..cd2beeb40 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -100,7 +100,7 @@ module.exports = { // "var" // ], "function-whitespace-after": "always", -// "indentation": 4, + "indentation": 4, "keyframe-declaration-no-important": true, "length-zero-no-unit": true, // "max-empty-lines": 1, From f2b703d94ccd3f405938d4bed7e4fafea1a03c0d Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 23:14:48 -0400 Subject: [PATCH 09/14] [style] Enabled Stylelint 'max-empty-lines' rule --- css/companymanagement.css | 2 -- css/menupages.css | 1 - stylelint.config.js | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/css/companymanagement.css b/css/companymanagement.css index 5c26a25d4..1109fd21f 100644 --- a/css/companymanagement.css +++ b/css/companymanagement.css @@ -4,7 +4,6 @@ font-size: 13px; } - /* Header tabs */ .cmpy-mgmt-header-tab { display: inline-block; @@ -106,7 +105,6 @@ background-color: #333; } - /* Upgrades */ .cmpy-mgmt-upgrade-container { border: 1px solid #fff; diff --git a/css/menupages.css b/css/menupages.css index 68c2b5654..9960d4a90 100644 --- a/css/menupages.css +++ b/css/menupages.css @@ -368,7 +368,6 @@ padding-top: 10px; } - #world-city-name, #world-city-desc { padding: 4px; diff --git a/stylelint.config.js b/stylelint.config.js index cd2beeb40..c141826d5 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -103,7 +103,7 @@ module.exports = { "indentation": 4, "keyframe-declaration-no-important": true, "length-zero-no-unit": true, -// "max-empty-lines": 1, + "max-empty-lines": 1, "max-line-length": 160, "max-nesting-depth": 99, "media-feature-colon-space-after": "always", From e74b31e3139f6900cb6f14f46a601dc318b2ecc1 Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 23:41:32 -0400 Subject: [PATCH 10/14] [style] Enabled Stylelint "comment-whitespace-inside" rule --- css/companymanagement.css | 2 +- css/missions.css | 2 -- css/styles.css | 1 - stylelint.config.js | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/css/companymanagement.css b/css/companymanagement.css index 1109fd21f..8276cf5cb 100644 --- a/css/companymanagement.css +++ b/css/companymanagement.css @@ -72,7 +72,7 @@ width: 100%; } -/* Hiring new employees*/ +/* Hiring new employees */ .cmpy-mgmt-find-employee-option { border: 1px solid #fff; margin: 6px; diff --git a/css/missions.css b/css/missions.css index 2c57e59e9..6a958ac12 100644 --- a/css/missions.css +++ b/css/missions.css @@ -7,9 +7,7 @@ .hack-mission-grid { display: grid; - /*grid-template-columns: 11% 11% 11% 11% 11% 11% 11% 11%;*/ grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr; - /*grid-template-rows: 10% 10% 10% 10% 10% 10% 10% 10%;*/ grid-template-rows: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr; grid-gap: 2.5%; height: 90%; diff --git a/css/styles.css b/css/styles.css index f81180722..b1e1e7254 100644 --- a/css/styles.css +++ b/css/styles.css @@ -429,7 +429,6 @@ a:link, a:visited { right: 0; top: 0; height: 205px; /* Full height */ - /*margin: 50% auto;*/ padding: 5px; border: 2px solid var(--my-highlight-color); width: 19%; diff --git a/stylelint.config.js b/stylelint.config.js index c141826d5..d5be9dbb8 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -49,7 +49,7 @@ module.exports = { "color-no-invalid-hex": true, // "comment-empty-line-before": "always", "comment-no-empty": true, -// "comment-whitespace-inside": "always", + "comment-whitespace-inside": "always", "comment-word-blacklist": [], "custom-media-pattern": ".+", "custom-property-empty-line-before": "never", From 2851424392c2347511213f52fa9216febf9f8341 Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 23:46:37 -0400 Subject: [PATCH 11/14] [style] Enabled Stylelint 'no-missing-end-of-source-newline' rule --- css/loader.css | 2 +- stylelint.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/loader.css b/css/loader.css index 606ddcaf5..3c3681e6d 100644 --- a/css/loader.css +++ b/css/loader.css @@ -145,4 +145,4 @@ button[type="button"] { } .loaderoverlay .loaderlabel { color: #6f3; -} \ No newline at end of file +} diff --git a/stylelint.config.js b/stylelint.config.js index d5be9dbb8..dda50f47b 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -127,7 +127,7 @@ module.exports = { "no-eol-whitespace": true, "no-extra-semicolons": true, "no-invalid-double-slash-comments": true, -// "no-missing-end-of-source-newline": true, + "no-missing-end-of-source-newline": true, "no-unknown-animations": true, "number-leading-zero": "always", "number-max-precision": [3, { ignoreUnits: [ "%" ] }], From 420b6e9fb9f163e34c539d7932f3a3c21e8a4594 Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Tue, 10 Jul 2018 00:00:21 -0400 Subject: [PATCH 12/14] [style] Enabled Stylelint 'selector-combinator-space-*' rules --- css/styles.css | 12 ++++++------ stylelint.config.js | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/css/styles.css b/css/styles.css index b1e1e7254..b8b320957 100644 --- a/css/styles.css +++ b/css/styles.css @@ -71,7 +71,7 @@ tr:focus { } /* Default buttons */ -.mainmenu>li a { +.mainmenu > li a { display: block; color: #e6e6e6; background-color: #555; @@ -80,20 +80,20 @@ tr:focus { } /* Hovering makes them lighter */ -.mainmenu>li a:hover, -.mainmenu>li a:hover:not(.active), -.mainmenu>li a:focus { +.mainmenu > li a:hover, +.mainmenu > li a:hover:not(.active), +.mainmenu > li a:focus { background-color: #777; color: #fff; } /* Panel headers can become active, and they are "lighter" than the rest */ -.mainmenu>li a.active { +.mainmenu > li a.active { background-color: #777; color: #fff; } -.mainmenu>li a.active:hover { +.mainmenu > li a.active:hover { background-color: #aaa; } diff --git a/stylelint.config.js b/stylelint.config.js index dda50f47b..02fe66ac4 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -237,8 +237,8 @@ module.exports = { "selector-attribute-quotes": "always", "selector-class-pattern": ".+", //"selector-combinator-blacklist": [], -// "selector-combinator-space-after": "always", -// "selector-combinator-space-before": "always", + "selector-combinator-space-after": "always", + "selector-combinator-space-before": "always", //"selector-combinator-whitelist": [], "selector-descendant-combinator-no-non-space": true, "selector-id-pattern": ".+", From afb25719414d4604b03a44366df979278847ee40 Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 23:21:00 -0400 Subject: [PATCH 13/14] [chore] Enabled Stylelint 'selector-attribute-operator-space-*' rules. --- stylelint.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stylelint.config.js b/stylelint.config.js index 02fe66ac4..0ad498e64 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -229,8 +229,8 @@ module.exports = { "scss/selector-no-redundant-nesting-selector": true,*/ "selector-attribute-brackets-space-inside": "never", "selector-attribute-operator-blacklist": [], -// "selector-attribute-operator-space-after": "always", -// "selector-attribute-operator-space-before": "always", + "selector-attribute-operator-space-after": "never", + "selector-attribute-operator-space-before": "never", "selector-attribute-operator-whitelist": [ "=" ], From 65082d4e0b2860e27ea8a5abb01f109eba90bce0 Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Mon, 9 Jul 2018 22:39:16 -0400 Subject: [PATCH 14/14] [chore] Enabled Stylelint 'declaration-bang-space-before' rule --- stylelint.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylelint.config.js b/stylelint.config.js index 0ad498e64..3e758db82 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -55,7 +55,7 @@ module.exports = { "custom-property-empty-line-before": "never", "custom-property-pattern": "my-.+", "declaration-bang-space-after": "never", -// "declaration-bang-space-before": "always", + "declaration-bang-space-before": "always", // "declaration-block-no-duplicate-properties": true, "declaration-block-no-redundant-longhand-properties": true, "declaration-block-no-shorthand-property-overrides": true,