From 26b1c434350e5c9228de442de2617001ba6fac7d Mon Sep 17 00:00:00 2001 From: Steven Evans Date: Fri, 24 Aug 2018 11:48:15 -0400 Subject: [PATCH] [style] Sorting properties alphabetically --- css/interactivetutorial.scss | 6 +++--- css/styles.scss | 1 - src/Settings.ts | 14 +++++++------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/css/interactivetutorial.scss b/css/interactivetutorial.scss index 0c5aa3fdd..143260d6d 100644 --- a/css/interactivetutorial.scss +++ b/css/interactivetutorial.scss @@ -15,7 +15,7 @@ padding: 10px; border: 5px solid #fff; width: 23%; - overflow:hidden; + overflow: hidden; background-color: #444; /* Fallback color */ color: #fff; @@ -64,9 +64,9 @@ } */ #interactive-tutorial-exit { - position:absolute; + position: absolute; bottom: 0; - left:0; + left: 0; } #interactive-tutorial-back { diff --git a/css/styles.scss b/css/styles.scss index 6daebde94..b725b4fff 100644 --- a/css/styles.scss +++ b/css/styles.scss @@ -579,7 +579,6 @@ a:visited { &.active:after { content: "\2796"; /* "minus" sign (-) */ } - } .accordion-panel { diff --git a/src/Settings.ts b/src/Settings.ts index ddf5cb0ac..ac081a236 100644 --- a/src/Settings.ts +++ b/src/Settings.ts @@ -39,6 +39,11 @@ interface IDefaultSettings { */ SuppressFactionInvites: boolean; + /** + * Whether to show a popup message when player is hospitalized from taking too much damage + */ + SuppressHospitalizationPopup: boolean; + /** * Whether the user should be shown a dialog box whenever they receive a new message file. */ @@ -48,11 +53,6 @@ interface IDefaultSettings { * Whether the user should be asked to confirm travelling between cities. */ SuppressTravelConfirmation: boolean; - - /** - * Whether to show a popup message when player is hospitalized from taking too much damage - */ - SuppressHospitalizationPopup: boolean; } /** @@ -95,9 +95,9 @@ const defaultSettings: IDefaultSettings = { MaxPortCapacity: 50, SuppressBuyAugmentationConfirmation: false, SuppressFactionInvites: false, + SuppressHospitalizationPopup: false, SuppressMessages: false, SuppressTravelConfirmation: false, - SuppressHospitalizationPopup: false, }; /** @@ -114,9 +114,9 @@ export const Settings: ISettings & ISelfInitializer & ISelfLoading = { MaxPortCapacity: defaultSettings.MaxPortCapacity, SuppressBuyAugmentationConfirmation: defaultSettings.SuppressBuyAugmentationConfirmation, SuppressFactionInvites: defaultSettings.SuppressFactionInvites, + SuppressHospitalizationPopup: defaultSettings.SuppressHospitalizationPopup, SuppressMessages: defaultSettings.SuppressMessages, SuppressTravelConfirmation: defaultSettings.SuppressTravelConfirmation, - SuppressHospitalizationPopup: defaultSettings.SuppressHospitalizationPopup, ThemeBackgroundColor: "#000000", ThemeFontColor: "#66ff33", ThemeHighlightColor: "#ffffff",