Merge branch 'master' into bs5darkfixes2

Author: Aniket-Engg

libs/remix-ui/editor/src/lib/remix-ui-editor.css

@@ -21,8 +21,8 @@
 }
 
 .inline-class {
-    background: var(--info) !important;
-    color: var(--white) !important;
+    background: var(--bs-info) !important;
+    color: var(--bs-white) !important;
     filter: opacity(0.5);
     font-weight: bolder;
 }
@@ -32,15 +32,15 @@ div.monaco-list-row > span.title {
 }
 
 .modifiedChangesDecoration {
-    background-color: var(--danger) !important;
+    background-color: var(--bs-danger) !important;
     color: var(--white) !important;
     filter: opacity(0.1);
     font-weight: bolder;
 }
 
 .newChangesDecoration {
     background-color: var(--custom-ai-color) !important;
-    color: var(--white) !important;
+    color: var(--bs-white) !important;
     filter: opacity(0.1);
     font-weight: bolder;
 }

libs/remix-ui/editor/src/lib/remix-ui-editor.tsx

@@ -215,10 +215,10 @@ export const EditorUI = (props: EditorUIProps) => {
     const lightColor = formatColor('--bs-light')
     const infoColor = formatColor('--bs-info')
     const darkColor = formatColor('--bs-dark')
-    const secondaryColor = formatColor('--bs-secondary')
+    const secondaryColor = formatColor('--bs-body-bg')
     const primaryColor = formatColor('--bs-primary')
     const textColor = formatColor('--text') || darkColor
-    const textbackground = formatColor('--text-background') || lightColor
+    const textbackground = formatColor('--bs-body-bg') || lightColor
     const blueColor = formatColor('--bs-blue')
     const successColor = formatColor('--bs-success')
     const warningColor = formatColor('--bs-warning')