diff --git a/.gitattributes b/.gitattributes index 38f518f571..9dd77ca667 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ -public/js/lib/codemirror/* linguist-vendored *.jsx linguist-language=JavaScript diff --git a/client/less/code-mirror.less b/client/less/code-mirror.less deleted file mode 100644 index 0e5316e950..0000000000 --- a/client/less/code-mirror.less +++ /dev/null @@ -1,37 +0,0 @@ -.ReactCodeMirror { - height: 100%; -} - -.CodeMirror { - height: 100%; - line-height: 1 !important; -} - -.CodeMirror span { - font-size: 15px; - font-family: "Ubuntu Mono"; - padding-bottom: 0px; - margin-bottom: 0px; - height: 100%; -} - -.CodeMirror-gutters { - background-color: @body-bg; -} -.CodeMirror-linenumber { - font-size: 15px; - font-family: "Ubuntu Mono"; -} - -.CodeMirror-scroll { - padding-bottom: 30px; -} - -.challenge-log .CodeMirror { - height: 100%; - width: 100%; -} - -.CodeMirror-lint-tooltip { - z-index: 9999; -} diff --git a/client/less/main.less b/client/less/main.less index ed1c05c103..8893dabc0c 100644 --- a/client/less/main.less +++ b/client/less/main.less @@ -1069,7 +1069,6 @@ and (max-width : 400px) { // surrounding downstream import with &{} // creates locally scoped imports // and prevents vaiables from overwriting each other -&{ @import "./code-mirror.less"; } &{ @import "./toastr.less"; } &{ @import "../../common/index.less"; } &{ @import "./userHome.less"; } diff --git a/package-lock.json b/package-lock.json index b20fef3ef7..06666ab27d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3385,11 +3385,6 @@ "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz", "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=" }, - "caniuse-db": { - "version": "1.0.30000756", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000756.tgz", - "integrity": "sha1-6TimuZFjDzDSJj3TRYvrZdNiJos=" - }, "caniuse-lite": { "version": "1.0.30000865", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000865.tgz", @@ -3954,11 +3949,6 @@ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, - "codemirror": { - "version": "5.15.2", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.15.2.tgz", - "integrity": "sha1-WLPccyxtENeq6Ab0x83VapuH/o8=" - }, "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", @@ -5588,22 +5578,6 @@ "integrity": "sha1-80Ea3pdYp1Zd+Eiy2gy70bRsvWQ=", "dev": true }, - "emmet": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/emmet/-/emmet-1.6.3.tgz", - "integrity": "sha1-/hPXdO7jMv5L9sCsjLLWhhbqUME=", - "requires": { - "caniuse-db": "1.0.30000756" - } - }, - "emmet-codemirror": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/emmet-codemirror/-/emmet-codemirror-1.2.5.tgz", - "integrity": "sha1-bFfuniJTe4oWmP9jagPLMBbffBY=", - "requires": { - "emmet": "1.6.3" - } - }, "emojis-list": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", diff --git a/package.json b/package.json index d2cb3c137a..b31bad684e 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "cal-heatmap": "~3.5.2", "chai": "~3.4.1", "classnames": "^2.1.2", - "codemirror": "~5.15.2", "compression": "^1.6.0", "connect-mongo": "^1.3.2", "cookie-parser": "^1.4.0", @@ -66,7 +65,6 @@ "debug": "^2.2.0", "dedent": "~0.7.0", "dotenv": "^4.0.0", - "emmet-codemirror": "^1.2.5", "enzyme": "^3.2.0", "enzyme-adapter-react-15": "^1.0.5", "express": "^4.13.3", diff --git a/server/views/partials/footer.jade b/server/views/partials/footer.jade index a0c81ef1a4..509801a862 100644 --- a/server/views/partials/footer.jade +++ b/server/views/partials/footer.jade @@ -1,2 +1,2 @@ // scripts should be moved here -script(src="https://cdn.optimizely.com/js/999692993.js") + diff --git a/server/views/partials/react-stylesheets.jade b/server/views/partials/react-stylesheets.jade index 35d70815ac..635c47b9ff 100644 --- a/server/views/partials/react-stylesheets.jade +++ b/server/views/partials/react-stylesheets.jade @@ -1,9 +1,6 @@ link(rel='stylesheet', type='text/css' href='/css/lato.css') link(rel='stylesheet', type='text/css' href='/css/ubuntu.css') link(rel='stylesheet', href='https://use.fontawesome.com/releases/v5.0.13/js/all.css' integrity='sha384-xymdQtn1n3lH2wcu0qhcdaOpQwyoarkgLVxC/wZ5q7h9gHtxICrpcaSUfygqZGOe' crossorigin='anonymous') -link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.30.0/codemirror.min.css') -link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.30.0/theme/dracula.min.css') -link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.30.0/addon/lint/lint.min.css') link(rel='stylesheet', href=cacheBreaker(rev('/css', 'main.css'))) include meta