diff --git a/www/-/s/css_modules/newstyle_main_page.css b/www/-/s/css_modules/newstyle_main_page.css index 91c9e66e..c0dd7043 100644 --- a/www/-/s/css_modules/newstyle_main_page.css +++ b/www/-/s/css_modules/newstyle_main_page.css @@ -23,6 +23,10 @@ h2 { padding: 0; } +a { + text-decoration: none; +} + #content { width: 100%; overflow: hidden; diff --git a/www/-/s/style-dark.css b/www/-/s/style-dark.css index 91fd80c6..545d6a8b 100644 --- a/www/-/s/style-dark.css +++ b/www/-/s/style-dark.css @@ -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 { diff --git a/www/js/lib/transformStyles.js b/www/js/lib/transformStyles.js index 483605d2..61574dd6 100644 --- a/www/js/lib/transformStyles.js +++ b/www/js/lib/transformStyles.js @@ -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" +