Correct prefix for newstyle

Former-commit-id: ff0412eb5e38485a65a36ae13a6e0d2fe9ea9a82 [formerly 14eed5b8e7fe48bd09ad61ea2f5ab03a964058ef]
Former-commit-id: 2880f43f37245d5bb8c25a22d7b21a7d4474ab53
This commit is contained in:
Jaifroid 2019-08-08 15:20:42 +01:00
parent f92e8ac7b3
commit 0afc3ea834

View File

@ -42,7 +42,7 @@ define(['util', 'uiUtil'], function (util, uiUtil) {
zl = "#"; //Void these mobile styles
}
// Rename this required mobile style so that we don't trigger reading ZIM as mobile in print intercept
zl = /css_modules\/mobile_main_page\.css/.test(zl) && cs == 'desktop' ? "-/s/css_modules/newstyle_main_page.css" : zl;
zl = /css_modules\/mobile_main_page\.css/.test(zl) && cs == 'desktop' ? prefix + "-/s/css_modules/newstyle_main_page.css" : zl;
//injectCSS();
return {zl : zl, rtnFunction : rtnFunction};
} else {
@ -87,7 +87,7 @@ define(['util', 'uiUtil'], function (util, uiUtil) {
zl = (cs == "mobile") ? "-/s/style-mobile.css" : "-/s/style.css";
}
// Rename this required mobile style so that we don't trigger reading ZIM as mobile in print intercept
zl = /css_modules\/mobile_main_page\.css/.test(zl) ? "-/s/css_modules/newstyle_main_page.css" : zl;
zl = /css_modules\/mobile_main_page\.css/.test(zl) ? prefix + "-/s/css_modules/newstyle_main_page.css" : zl;
// Replace bootstrap with own: DEV: when upgrading to Bootstrap 4, stop doing this!
zl = zl.replace(/.+(bootstrap[^\/]*?\.css)/i, "css/$1");
//Make link href relative to root