diff --git a/webapp/src/components/markdownEditor.tsx b/webapp/src/components/markdownEditor.tsx index b7387f600..cf4475157 100644 --- a/webapp/src/components/markdownEditor.tsx +++ b/webapp/src/components/markdownEditor.tsx @@ -2,6 +2,7 @@ // See LICENSE.txt for license information. import React, {useState, useRef, useMemo} from 'react' import SimpleMDE from 'react-simplemde-editor' +import 'easymde/dist/easymde.min.css' import {Utils} from '../utils' import './markdownEditor.scss' diff --git a/webapp/src/styles/main.scss b/webapp/src/styles/main.scss index e72bd4a0d..4e242a9ad 100644 --- a/webapp/src/styles/main.scss +++ b/webapp/src/styles/main.scss @@ -63,7 +63,7 @@ html { color: var(--link-color-rgb); &:visited { - color: var(--link-visited-color); + color: var(--link-visited-color-rgb); } &:hover { diff --git a/webapp/src/theme.ts b/webapp/src/theme.ts index 7e753e80f..2bc7a116d 100644 --- a/webapp/src/theme.ts +++ b/webapp/src/theme.ts @@ -176,7 +176,7 @@ export function setMattermostTheme(theme: any): Theme { document.documentElement.style.setProperty('--button-color-rgb', color(theme.buttonColor).rgb().array().join(', ')) document.documentElement.style.setProperty('--sidebar-bg-rgb', color(theme.sidebarBg).rgb().array().join(', ')) document.documentElement.style.setProperty('--sidebar-text-rgb', color(theme.sidebarText).rgb().array().join(', ')) - document.documentElement.style.setProperty('--link-color-rgb', color(theme.linkColor).rgb().array().join(', ')) + document.documentElement.style.setProperty('--link-color-rgb', theme.linkColor) document.documentElement.style.setProperty('--sidebar-text-active-border', color(theme.sidebarTextActiveBorder).rgb().array().join(', ')) return setTheme({ @@ -188,7 +188,7 @@ export function setMattermostTheme(theme: any): Theme { sidebarBg: color(theme.sidebarBg).rgb().array().join(', '), sidebarFg: color(theme.sidebarColor || '#ffffff').rgb().array().join(', '), sidebarTextActiveBorder: color(theme.sidebarTextActiveBorder).rgb().array().join(', '), - link: color(theme.linkColor).rgb().array().join(', '), + link: theme.linkColor, }) }