From 7fa7c89d3e233906f3c922abe29baefbfb536056 Mon Sep 17 00:00:00 2001 From: Brandon Stull Date: Tue, 21 Nov 2023 17:09:54 -0500 Subject: [PATCH] #554 Necessary Prettier fixes. --- .../components/variables/variable-block.js | 10 ++-- .../components/variables/variable-block.scss | 54 +++++++++---------- .../variable-property/variable-value.js | 14 ++--- .../viewer/stores/assessment-state-helpers.js | 6 ++- .../src/parsers/action-button-node-parser.js | 7 ++- .../src/parsers/figure-node-parser.js | 4 +- .../src/parsers/list-node-parser.js | 10 +++- .../src/parsers/page-node-parser.js | 7 ++- .../20231027205008-modify-visits-add-state.js | 43 ++++++++------- .../obojobo-express/server/models/visit.js | 10 ++-- 10 files changed, 94 insertions(+), 71 deletions(-) diff --git a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/variables/variable-block.js b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/variables/variable-block.js index d46277022..8f27c2fd0 100644 --- a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/variables/variable-block.js +++ b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/variables/variable-block.js @@ -126,11 +126,11 @@ const VariableBlock = props => { } })()} - { variable.errors ? - - {Object.keys(variable.errors).length} issues - - : null } + {variable.errors ? ( + + {Object.keys(variable.errors).length} issues + + ) : null} ) } diff --git a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/variables/variable-block.scss b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/variables/variable-block.scss index 8535e65f4..7470949e5 100644 --- a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/variables/variable-block.scss +++ b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/variables/variable-block.scss @@ -3,37 +3,37 @@ $variable-selected: #285aa4; .single-variable { - border: none; - background: transparent; - font-family: 'Libre Franklin', Arial, sans-serif; - width: 100%; - cursor: pointer; - margin: 0; - color: inherit; - font-size: 1em; - background-color: $color-bg; - border-bottom: solid 1px rgba(0, 0, 0, 0.1); - border-right: solid 1px rgba(0, 0, 0, 0.1); - padding: 0.5em; - text-align: left; - padding-left: 1em; + border: none; + background: transparent; + font-family: $font-default; + width: 100%; + cursor: pointer; + margin: 0; + color: inherit; /* stylelint-disable-line scale-unlimited/declaration-strict-value */ + font-size: 1em; + background-color: $color-bg; + border-bottom: solid 1px rgba(0, 0, 0, 0.1); + border-right: solid 1px rgba(0, 0, 0, 0.1); + padding: 0.5em; + text-align: left; + padding-left: 1em; - h4 { - padding: 0; - margin: 0; - } + h4 { + padding: 0; + margin: 0; + } - small { - font-size: 0.75em; + small { + font-size: 0.75em; - &.error-count { - display: block; - color: $color-dangerous; - } - } + &.error-count { + display: block; + color: $color-dangerous; + } + } } .variable-is-selected { - border-right: none; - color: $variable-selected; + border-right: none; + color: $variable-selected; } diff --git a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/variables/variable-property/variable-value.js b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/variables/variable-property/variable-value.js index e3922fcbe..2447cba51 100644 --- a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/variables/variable-property/variable-value.js +++ b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/variables/variable-property/variable-value.js @@ -327,13 +327,13 @@ const VariableValues = props => { - {variable.errors - && variable.errors.seriesType - && (! SERIES_TYPE_OPTIONS.includes(variable.seriesType)) ? - - Invalid option "{variable.seriesType}" - - : null} + {variable.errors && + variable.errors.seriesType && + !SERIES_TYPE_OPTIONS.includes(variable.seriesType) ? ( + + Invalid option "{variable.seriesType}" + + ) : null}