Tweaks to styles for newstyle ZIMs

Former-commit-id: 955517a58f182079dbc75c7f4d285ab8fd823162 [formerly 9042d7cca1334fb2c33152b46344a7a10818e4f5]
Former-commit-id: c18dc6d618a01b830885b68d6166c76bb14cb118
This commit is contained in:
Jaifroid 2019-08-16 17:56:25 +01:00
parent 2eac25bf57
commit 63e78d6dc0
3 changed files with 7 additions and 2 deletions

View File

@ -23,6 +23,10 @@ h2 {
padding: 0;
}
a {
text-decoration: none;
}
#content {
width: 100%;
overflow: hidden;

View File

@ -267,7 +267,7 @@ div[style*="background-color: #cee0f2"], div[style*="background-color: #cedff2"]
}
div:not([style*="-color"]), div[style*="background-color"], span:not([class*="color"]),
table, tr:not([style*="border-bottom"]), th, td:not([style*="border-bottom"]),
summary:not([style*="-color"]), table, tr:not([style*="border-bottom"]), th, td:not([style*="border-bottom"]),
h1, h2, h3, h4, h5, h6, ul, li, input, select, #bodyContent code {
border-color: #555 !important;
}
@ -353,6 +353,7 @@ span[style*="color:#555"], span[style*="background-color:#EE"] {
ul, .portlet li {
list-style-image: none !important;
background-color: black !important;
}
table[style*="border:4px ridge"], .jfk-bubble-closebtn {

View File

@ -28,7 +28,7 @@ define(['util', 'uiUtil'], function (util, uiUtil) {
/* zl = zimLink; zim = zimType; cc = cssCache; cs = cssSource; i] */
function filterCSS(zl, zim, cc, cs, i) {
var rtnFunction = "injectCSS";
if ((zim != cs) && zl.match(/(-\/s\/style\.css)|minerva|mobile|parsoid/i)) { //If it's the wrong ZIM type and style matches main styles...
if ((zim != cs) && zl.match(/(-\/s\/(?:css_modules\/)?style\.css)|minerva|mobile|parsoid/i)) { //If it's the wrong ZIM type and style matches main styles...
if (zl.match(/-\/s\/style\.css|minerva|style-mobile\.css/i)) { //If it matches one of the required styles...
zl = (cs == "mobile") ? prefix + "-/s/style-mobile.css" : prefix + "-/s/style.css"; //Take it from cache, because not in the ZIM
console.log("Matched #" + i + " [" + zl + "] from local filesystem because style is not in ZIM" +