Merge pull request #197 from MeasureAuthoringTool/508-contrast-fix

MAT-6431: 508 contrast fix
MeasureAuthoringTool · Nov 28, 2023 · a3036b2 · a3036b2
2 parents 0561d51 + 2f05448
commit a3036b2
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 62 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -6,6 +6,7 @@ module.exports = {
     "^.+\\.(j|t)sx?$": "babel-jest",
   },
   moduleNameMapper: {
+    "^axios$": require.resolve("axios"),
     "\\.(css)$": "identity-obj-proxy",
     "single-spa-react/parcel": "single-spa-react/lib/cjs/parcel.cjs",
   },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -75,13 +75,13 @@
   "dependencies": {
     "@madie/cql-antlr-parser": "^1.0.1",
     "@testing-library/user-event": "^13.5.0",
+    "axios": "^1.6.2",
     "lodash": "^4.17.21",
     "react": "^17.0.2",
     "react-ace": "^10.0.0",
     "react-dom": "^17.0.2",
     "single-spa": "^5.9.3",
-    "single-spa-react": "^4.6.1",
-    "axios": "^0.26.0"
+    "single-spa-react": "^4.6.1"
   },
   "types": "dist/madie-madie-editor.d.ts",
   "browserslist": [

diff --git a/src/AceEditor/madie-custom.css b/src/AceEditor/madie-custom.css
@@ -4,5 +4,16 @@
 }
 
 .ace_gutter-cell {
-  color: #b0b0b0;
+  color: #9c9c9c;
+}
+
+.ace_comment {
+  color: #9c9c9c !important;
+}
+
+.ace-monokai .ace_entity.ace_name.ace_tag,
+.ace-monokai .ace_keyword,
+.ace-monokai .ace_meta.ace_tag,
+.ace-monokai .ace_storage {
+  color: #fb4b8c !important;
 }