fix: some minor styling fixes, clean up fixed todo's

josdejong · Dec 6, 2023 · f31a075 · f31a075
1 parent 3e20fe9
commit f31a075
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/lib/components/modals/repair/JSONRepairComponent.scss b/src/lib/components/modals/repair/JSONRepairComponent.scss
@@ -9,7 +9,10 @@
 
   .jse-menu {
     .jse-info {
-      padding: 0 $padding;
+      padding: $padding-half;
+      font-family: $font-family;
+      font-size: $font-size;
+      vertical-align: center;
     }
   }
 
@@ -19,7 +22,7 @@
     padding: $contents-padding;
     font-family: $font-family-mono;
     font-size: $font-size-mono;
-    background: $background-color;
+    background: $input-background;
     color: $text-color;
 
     resize: none;

diff --git a/src/lib/components/modes/textmode/codemirror/codemirror-theme.ts b/src/lib/components/modes/textmode/codemirror/codemirror-theme.ts
@@ -1,9 +1,6 @@
 import { HighlightStyle, syntaxHighlighting } from '@codemirror/language'
 import { tags } from '@lezer/highlight'
 
-/**
- * @todo FIX THIS, these variables do not use our SCSS defaults
- */
 const highlightStyle = HighlightStyle.define([
   { tag: tags.propertyName, color: 'var(--internal-key-color)' }, // keys
   { tag: tags.number, color: 'var(--internal-value-color-number)' },

diff --git a/src/lib/themes/defaults.scss b/src/lib/themes/defaults.scss
@@ -78,7 +78,6 @@ $panel-color: var(--jse-panel-color, $text-color);
 $panel-color-readonly: var(--jse-panel-color-readonly, #b2b2b2);
 $panel-border: var(--jse-panel-border, $main-border);
 
-// @todo check if this works as expected, since inherit is not a value that works as expected in CSS custom property land
 $panel-button-color: var(--jse-panel-button-color, inherit);
 $panel-button-background: var(--jse-panel-button-background, transparent);
 $panel-button-color-highlight: var(--panel-button-color-highlight, $text-color);
@@ -108,7 +107,6 @@ $context-menu-pointer-color: var(--jse-context-menu-pointer-color, $context-menu
 $context-menu-pointer-size: var(--jse-context-menu-pointer-size, calc(1em + 4px));
 $context-menu-tip-background: var(--jse-context-menu-tip-background, rgba(255, 255, 255, 0.2));
 
-// @todo check if this works as expected, since inherit is not a value that works as expected in CSS custom property land
 $context-menu-tip-color: var(--context-menu-tip-color, inherit);
 
 /* contents: json key and values */
@@ -160,7 +158,7 @@ $table-row-odd-background: var(--jse-table-row-odd-background, rgba(0, 0, 0, 0.0
 $controls-box-shadow: var(--jse-controls-box-shadow, 0 2px 6px 0 rgba(0, 0, 0, 0.24));
 $input-background: var(--jse-input-background, $background-color);
 $input-background-readonly: var(--jse-input-background-readonly, transparent);
-$input-color: var(--jse-input-color, green);
+$input-color: var(--jse-input-color, $text-color);
 $input-border: var(--jse-input-border, 1px solid #d8dbdf);
 $input-border-focus: var(
   --jse-input-border-focus,