libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

colibris: do not color link with primary color when author color are on

Browse source 
Change link color to blue
Still color the link the authorship have been cleared
closes #3960
This commit is contained in:
Sebastian Castro 2020-04-30 14:24:02 +02:00 committed by muxator
parent ff1191d24a
commit a522db3ef4
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/static/css/iframe_editor.css
View file

@ -34,6 +34,14 @@ html.inner-editor {
padding-bottom: 10px; /* some space when we scroll to the bottom */ padding-bottom: 10px; /* some space when we scroll to the bottom */
} }
#innerdocbody a {
color: #2e96f3;
}
#innerdocbody.authorColors [class^='author-'] a {
color: inherit;
}
/* --------------------- */ /* --------------------- */
/* -- BROWSER SUPPORT -- */ /* -- BROWSER SUPPORT -- */
/* --------------------- */ /* --------------------- */

9
src/static/js/ace2_inner.js
View file

@ -249,7 +249,6 @@ function Ace2Inner(){
var authorStyle = dynamicCSS.selectorStyle(authorSelector); var authorStyle = dynamicCSS.selectorStyle(authorSelector);
var parentAuthorStyle = parentDynamicCSS.selectorStyle(authorSelector); var parentAuthorStyle = parentDynamicCSS.selectorStyle(authorSelector);
var anchorStyle = dynamicCSS.selectorStyle(authorSelector + ' > a')
// author color // author color
authorStyle.backgroundColor = bgcolor; authorStyle.backgroundColor = bgcolor;
@ -258,14 +257,6 @@ function Ace2Inner(){
var textColor = colorutils.textColorFromBackgroundColor(bgcolor, parent.parent.clientVars.skinName); var textColor = colorutils.textColorFromBackgroundColor(bgcolor, parent.parent.clientVars.skinName);
authorStyle.color = textColor; authorStyle.color = textColor;
parentAuthorStyle.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;
}
} }
} }
} }

5
src/static/skins/colibris/src/pad-editor.css
View file

@ -18,8 +18,3 @@
option { option {
text-transform: capitalize; text-transform: capitalize;
} }
#innerdocbody a {
color: #64d29b;
color: var(--primary-color);
}