From 7cf87bc25213a72c9a623dad697fe5c4e4196673 Mon Sep 17 00:00:00 2001 From: Sahar Jafari Date: Tue, 15 Mar 2016 15:22:09 -0700 Subject: [PATCH] Clean up --- app/scripts/services/editor.js | 3 ++- app/styles/components/editor.less | 18 ------------------ app/styles/fonts.less | 6 +----- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/app/scripts/services/editor.js b/app/scripts/services/editor.js index 254b0431da0..c83f7000b1f 100644 --- a/app/scripts/services/editor.js +++ b/app/scripts/services/editor.js @@ -50,13 +50,14 @@ SwaggerEditor.service('Editor', function Editor(Autocomplete, ASTManager, ace.config.set('basePath', 'bower_components/ace-builds/src-noconflict'); Autocomplete.init(e); + // Set editor options editor.setOptions({ - fontFamily: 'Source Code Pro', enableBasicAutocompletion: true, enableLiveAutocompletion: true, enableSnippets: true }); + loadEditorSettings(); // Editor is ready, fire the on-ready function and flush the queue diff --git a/app/styles/components/editor.less b/app/styles/components/editor.less index 9070bf24c29..712948e460d 100644 --- a/app/styles/components/editor.less +++ b/app/styles/components/editor.less @@ -1,24 +1,6 @@ @import "../fonts"; @import "../colors"; -.ace-editor{ - .editor-font; - font-size: .8em; - .editor-error-message { - padding: .3em; - background: @editor-error; - color: @white; - max-height: 5.6em; - pre { - font-size: 1em; - } - } - - * { - .editor-font; - } - -} .ace-atom-dark{ .ace_search { color: @gray-dk; diff --git a/app/styles/fonts.less b/app/styles/fonts.less index d55c2a2ec7f..f28b57a568f 100644 --- a/app/styles/fonts.less +++ b/app/styles/fonts.less @@ -82,12 +82,8 @@ url('@{fonts-folder}/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } -.editor-font { - font-weight: 300; -} - .pre-font { - font-family: monospace; + font-family: 'Source Code Pro', monospace; } .sw-font {