From 362a1e7d331b43c44251eba17525dc2f3031b5cf Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Thu, 4 Dec 2014 13:33:30 +0000 Subject: [PATCH] Strip footnotes from excerpts fixes #4572 - Remove both inline and bottom footnotes from excerpt output before stripping the remaining HTML - No more red errors, black text or bold links in codemirror, as codemirror gets confused by footnote syntax. This is a step towards the new editor which has no syntax highlighting in the editor --- ghost/admin/assets/sass/layouts/editor.scss | 16 ++++++++++++---- ghost/admin/assets/sass/vendor/codemirror.scss | 8 ++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ghost/admin/assets/sass/layouts/editor.scss b/ghost/admin/assets/sass/layouts/editor.scss index 8f0cf0edc0..e3b1f1978c 100644 --- a/ghost/admin/assets/sass/layouts/editor.scss +++ b/ghost/admin/assets/sass/layouts/editor.scss @@ -256,7 +256,7 @@ } .cm-header { - color: #000; + color: #3c4043; font-size: 1.4em; line-height: 1.4em; font-weight: bold; @@ -268,18 +268,22 @@ color: lighten($darkgrey, 10%); } - .cm-string, + .cm-strong, - .cm-link, .cm-comment, .cm-quote, .cm-number, .cm-atom, .cm-tag { - color: #000; + color: #3c4043; font-weight: bold; } + .cm-string, + .cm-link { + color: #3c4043; + } + .entry-preview { // Align the tab of entry-preview on the right .floatingheader { @@ -370,6 +374,10 @@ text-decoration: underline; } + sup a { + text-decoration: none; + } + .btn { text-decoration: none; color: $grey; diff --git a/ghost/admin/assets/sass/vendor/codemirror.scss b/ghost/admin/assets/sass/vendor/codemirror.scss index 5720405aeb..c72b327720 100644 --- a/ghost/admin/assets/sass/vendor/codemirror.scss +++ b/ghost/admin/assets/sass/vendor/codemirror.scss @@ -55,16 +55,16 @@ .cm-s-default .cm-atom {color: #219;} .cm-s-default .cm-number {color: #164;} .cm-s-default .cm-def {color: #00f;} -.cm-s-default .cm-variable {color: black;} +.cm-s-default .cm-variable {color: #3c4043;} .cm-s-default .cm-variable-2 {color: #05a;} .cm-s-default .cm-variable-3 {color: #085;} -.cm-s-default .cm-property {color: black;} -.cm-s-default .cm-operator {color: black;} +.cm-s-default .cm-property {color: #3c4043;} +.cm-s-default .cm-operator {color: #3c4043;} .cm-s-default .cm-comment {color: #a50;} .cm-s-default .cm-string {color: #a11;} .cm-s-default .cm-string-2 {color: #f50;} .cm-s-default .cm-meta {color: #555;} -.cm-s-default .cm-error {color: #f00;} +.cm-s-default .cm-error {color: #3c4043;} .cm-s-default .cm-qualifier {color: #555;} .cm-s-default .cm-builtin {color: #30a;} .cm-s-default .cm-bracket {color: #997;}