diff --git a/app/scripts/modules/core/src/presentation/forms/inputs/JsonEditor.tsx b/app/scripts/modules/core/src/presentation/forms/inputs/JsonEditor.tsx index 5c559c4bc6e..25bf150c48b 100644 --- a/app/scripts/modules/core/src/presentation/forms/inputs/JsonEditor.tsx +++ b/app/scripts/modules/core/src/presentation/forms/inputs/JsonEditor.tsx @@ -3,6 +3,7 @@ import AceEditor, { AceEditorProps, Annotation } from 'react-ace'; import 'brace/mode/json'; import 'brace/ext/searchbox'; +import './aceEditor.less'; export interface IJsonEditorProps extends AceEditorProps { value: string; diff --git a/app/scripts/modules/core/src/presentation/forms/inputs/aceEditor.less b/app/scripts/modules/core/src/presentation/forms/inputs/aceEditor.less new file mode 100644 index 00000000000..ab14c89571e --- /dev/null +++ b/app/scripts/modules/core/src/presentation/forms/inputs/aceEditor.less @@ -0,0 +1,10 @@ +.ace-editor { + div, + span { + font-family: monospace !important; + } + + > div.ace_gutter { + z-index: 0; + } +} diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/editor/editor.less b/app/scripts/modules/kubernetes/src/v2/manifest/editor/editor.less deleted file mode 100644 index d971cf4ea90..00000000000 --- a/app/scripts/modules/kubernetes/src/v2/manifest/editor/editor.less +++ /dev/null @@ -1,15 +0,0 @@ -@import (reference) '~bootstrap/less/variables.less'; - -.ace-editor { - // TODO(dpeach): Deck's styles are overriding the ace editor's - // font styles, so we have to set them here. Ideally - // we wouldn't have to do this. - div, - span { - font-family: @font-family-monospace; - } - - > div.ace_gutter { - z-index: 0; - } -} diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/editor/json/JsonEditor.tsx b/app/scripts/modules/kubernetes/src/v2/manifest/editor/json/JsonEditor.tsx index ef471620bc6..aede7fe7054 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/editor/json/JsonEditor.tsx +++ b/app/scripts/modules/kubernetes/src/v2/manifest/editor/json/JsonEditor.tsx @@ -4,7 +4,6 @@ import { $log } from 'ngimport'; import 'brace/theme/textmate'; import 'brace/mode/json'; -import '../editor.less'; export interface IJsonEditorProps { value: string; diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/editor/yaml/YamlEditor.tsx b/app/scripts/modules/kubernetes/src/v2/manifest/editor/yaml/YamlEditor.tsx index 26a2deb9fa2..c1bb0dee61f 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/editor/yaml/YamlEditor.tsx +++ b/app/scripts/modules/kubernetes/src/v2/manifest/editor/yaml/YamlEditor.tsx @@ -7,7 +7,6 @@ import { yamlStringToDocuments } from 'kubernetes/v2/manifest/editor/yaml/yamlEd import 'brace/theme/textmate'; import 'brace/mode/yaml'; -import '../editor.less'; export interface IYamlEditorProps { value: string;