From 842026b938b298e8a3c9379ab924161326313dc4 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Fri, 11 Aug 2023 19:56:15 +1000 Subject: [PATCH 1/2] Revert "fix: disable test for now due to outage (#1298)" This reverts commit d978fdaace1c0d940d529a7ad1c99e2a25167042. --- tests/integration/{fix-364.spec.js.disable => fix-364.spec.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/integration/{fix-364.spec.js.disable => fix-364.spec.js} (100%) diff --git a/tests/integration/fix-364.spec.js.disable b/tests/integration/fix-364.spec.js similarity index 100% rename from tests/integration/fix-364.spec.js.disable rename to tests/integration/fix-364.spec.js From 243f9d64c31c93f19c1ba86e2c1d8fdef8fc851f Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Fri, 11 Aug 2023 19:56:28 +1000 Subject: [PATCH 2/2] Revert "Add Hardware Failure Notice" This reverts commit d586ed99a18f1a1f634940ae789b4bdf8826d3a2. --- src/components/StatusBar.vue | 3 --- src/scss/status-bar.scss | 7 +------ src/store/modules/app/mutations.js | 2 +- src/store/modules/app/state.js | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/components/StatusBar.vue b/src/components/StatusBar.vue index f26d647c30..ef27b93fa8 100644 --- a/src/components/StatusBar.vue +++ b/src/components/StatusBar.vue @@ -13,9 +13,6 @@ v{{ version }} -
- Compile jobs are currently disabled due to a hardware failure. -
diff --git a/src/scss/status-bar.scss b/src/scss/status-bar.scss index 479fde779e..18b7b60f46 100644 --- a/src/scss/status-bar.scss +++ b/src/scss/status-bar.scss @@ -5,7 +5,7 @@ top: 0; left: 0; width: 100%; - grid-template: 1fr / 5% [qmk-branding] 2fr [standing-notice] 3fr [server-status] 2fr [bes-discord] 2fr [controls] 1fr 5%; + grid-template: 1fr / 5% [qmk-branding] 2fr [server-status] 2fr [bes-discord] 1fr [controls] 1fr 5%; align-items: center; font-size: 16px; line-height: 2.5; @@ -120,8 +120,3 @@ font-size: 14px; cursor: pointer; } - -.standing-notice { - color: #ff7373; - font-weight: bold; -} diff --git a/src/store/modules/app/mutations.js b/src/store/modules/app/mutations.js index f39c3a2a22..9443a06c46 100644 --- a/src/store/modules/app/mutations.js +++ b/src/store/modules/app/mutations.js @@ -5,7 +5,7 @@ import { PREVIEW_LABEL } from '@/store/modules/constants'; const mutations = { enableCompile(state) { - state.compileDisabled = true; + state.compileDisabled = false; }, disableCompile(state) { state.compileDisabled = true; diff --git a/src/store/modules/app/state.js b/src/store/modules/app/state.js index 25abe26979..4fe0d3ffca 100644 --- a/src/store/modules/app/state.js +++ b/src/store/modules/app/state.js @@ -47,7 +47,7 @@ const state = { layout: '', layouts: {}, keymapName: '', - compileDisabled: true, + compileDisabled: false, isPreview: false, previewRequested: false, jobID: '',