From a522db3ef4e9579decba92a203e1f311fe05da9b Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Thu, 30 Apr 2020 14:24:02 +0200 Subject: [PATCH] colibris: do not color link with primary color when author color are on Change link color to blue Still color the link the authorship have been cleared closes #3960 --- src/static/css/iframe_editor.css | 8 ++++++++ src/static/js/ace2_inner.js | 9 --------- src/static/skins/colibris/src/pad-editor.css | 5 ----- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css index d80c5125..021c8d1f 100644 --- a/src/static/css/iframe_editor.css +++ b/src/static/css/iframe_editor.css @@ -34,6 +34,14 @@ html.inner-editor { padding-bottom: 10px; /* some space when we scroll to the bottom */ } +#innerdocbody a { + color: #2e96f3; +} +#innerdocbody.authorColors [class^='author-'] a { + color: inherit; +} + + /* --------------------- */ /* -- BROWSER SUPPORT -- */ /* --------------------- */ diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index b819ba49..b69cc168 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -249,7 +249,6 @@ function Ace2Inner(){ var authorStyle = dynamicCSS.selectorStyle(authorSelector); var parentAuthorStyle = parentDynamicCSS.selectorStyle(authorSelector); - var anchorStyle = dynamicCSS.selectorStyle(authorSelector + ' > a') // author color authorStyle.backgroundColor = bgcolor; @@ -258,14 +257,6 @@ function Ace2Inner(){ var textColor = colorutils.textColorFromBackgroundColor(bgcolor, parent.parent.clientVars.skinName); authorStyle.color = textColor; parentAuthorStyle.color = textColor; - - // anchor text contrast - if(colorutils.luminosity(colorutils.css2triple(bgcolor)) < 0.55) - { - anchorStyle.color = colorutils.triple2css(colorutils.complementary(colorutils.css2triple(bgcolor))); - }else{ - anchorStyle.color = null; - } } } } diff --git a/src/static/skins/colibris/src/pad-editor.css b/src/static/skins/colibris/src/pad-editor.css index 3c35a440..f48db3b8 100644 --- a/src/static/skins/colibris/src/pad-editor.css +++ b/src/static/skins/colibris/src/pad-editor.css @@ -17,9 +17,4 @@ option { text-transform: capitalize; -} - -#innerdocbody a { - color: #64d29b; - color: var(--primary-color); } \ No newline at end of file