From 84eb2036db7f9792a8add7e180768126cc88834d Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sat, 28 Aug 2021 13:48:02 +0100 Subject: [PATCH] :lipstick: Adds color variable for progress bar --- src/components/Configuration/AppVersion.vue | 2 +- src/components/Configuration/CloudBackupRestore.vue | 2 +- src/components/Configuration/JsonEditor.vue | 2 +- src/components/Configuration/RebuildApp.vue | 2 +- src/styles/color-palette.scss | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/Configuration/AppVersion.vue b/src/components/Configuration/AppVersion.vue index 2cc95fb5..973cbb4f 100644 --- a/src/components/Configuration/AppVersion.vue +++ b/src/components/Configuration/AppVersion.vue @@ -40,7 +40,7 @@ export default { data() { return { appVersion: process.env.VUE_APP_VERSION, // Current version, from package.json - progress: new ProgressBar(), + progress: new ProgressBar({ color: 'var(--progress-bar)' }), latestVersion: '', // Will store latest version, when request returns checksEnabled: true, // Should we check for updates isUpToDate: true, // Is current version === latest version diff --git a/src/components/Configuration/CloudBackupRestore.vue b/src/components/Configuration/CloudBackupRestore.vue index 49adae7b..b0341cd9 100644 --- a/src/components/Configuration/CloudBackupRestore.vue +++ b/src/components/Configuration/CloudBackupRestore.vue @@ -78,7 +78,7 @@ export default { restorePassword: '', restoreCode: '', backupId: localStorage[localStorageKeys.BACKUP_ID] || '', - progress: new ProgressBar(), + progress: new ProgressBar({ color: 'var(--progress-bar)' }), }; }, components: { diff --git a/src/components/Configuration/JsonEditor.vue b/src/components/Configuration/JsonEditor.vue index 372cdba7..35ee10a6 100644 --- a/src/components/Configuration/JsonEditor.vue +++ b/src/components/Configuration/JsonEditor.vue @@ -90,7 +90,7 @@ export default { responseText: '', saveSuccess: undefined, allowWriteToDisk: this.shouldAllowWriteToDisk(), - progress: new ProgressBar(), + progress: new ProgressBar({ color: 'var(--progress-bar)' }), }; }, computed: { diff --git a/src/components/Configuration/RebuildApp.vue b/src/components/Configuration/RebuildApp.vue index 099cb56f..1ac323d4 100644 --- a/src/components/Configuration/RebuildApp.vue +++ b/src/components/Configuration/RebuildApp.vue @@ -70,7 +70,7 @@ export default { output: '', message: '', allowRebuild: true, - progress: new ProgressBar(), + progress: new ProgressBar({ color: 'var(--progress-bar)' }), }), methods: { /* Calls to the rebuild endpoint, to kickoff the app build */ diff --git a/src/styles/color-palette.scss b/src/styles/color-palette.scss index 39bf55be..13bdfbc1 100644 --- a/src/styles/color-palette.scss +++ b/src/styles/color-palette.scss @@ -98,6 +98,7 @@ --scroll-bar-background: var(--background-darker); --highlight-color: var(--background); --highlight-background: var(--primary); + --progress-bar: var(--primary); // Misc components --loading-screen-color: var(--primary); --loading-screen-background: var(--background);