TemplateStyles: Add mw-parser-output in XoCssMin, not in TemplateStyles [#704]

400_xowa/src/gplx/xowa/htmls/minifys/XoCssMin.java

@@ -1,3 +1,18 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012-2020 gnosygnu@gmail.com
+
+XOWA is licensed under the terms of the General Public License (GPL) Version 3,
+or alternatively under the terms of the Apache License Version 2.0.
+
+You may use XOWA according to either of these licenses as is most appropriate
+for your project on a case-by-case basis.
+
+The terms of each license can be found in the source code repository:
+
+GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
+Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
+*/
 package gplx.xowa.htmls.minifys;
 
 import gplx.core.bits.Bitmask_;
@@ -275,11 +290,10 @@ public class XoCssMin {
 
 		if (isModeXowa) {
 			// add the '.mw-parser-output ' selector
-			// XO: commented out; handled in TemplateStyles to improve performance
-			// css = JsString_.replace(css, patterns, "\\}([^@}].{2})", "}.mw-parser-output $1");
-			// css = JsString_.replace(css, patterns, "(@media[^\\{]*\\{)", "$1.mw-parser-output ");
-			// if (css.charAt(0) != '@')
-			//     css = ".mw-parser-output " + css;
+			css = JsString_.replace(css, patterns, "\\}([^@}].{2})", "}.mw-parser-output $1");
+			css = JsString_.replace(css, patterns, "(@media[^\\{]*\\{)", "$1.mw-parser-output ");
+			if (css.charAt(0) != '@')
+				css = ".mw-parser-output " + css;
 
 			// change some url(...) entries
 			css = css.replace("//upload.wikimedia.org", "//www.xowa.org/xowa/fsys/bin/any/xowa/upload.wikimedia.org");

400_xowa/src/gplx/xowa/xtns/template_styles/Template_styles_nde.java

@@ -1,3 +1,18 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012-2020 gnosygnu@gmail.com
+
+XOWA is licensed under the terms of the General Public License (GPL) Version 3,
+or alternatively under the terms of the Apache License Version 2.0.
+
+You may use XOWA according to either of these licenses as is most appropriate
+for your project on a case-by-case basis.
+
+The terms of each license can be found in the source code repository:
+
+GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
+Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
+*/
 package gplx.xowa.xtns.template_styles;
 
 import gplx.*;
@@ -108,7 +123,7 @@ public class Template_styles_nde implements Xox_xnde, Mwh_atr_itm_owner2 {
 	public static final byte Xatr__src = 0;
 	private static final    Hash_adp_bry xatrs_hash = Hash_adp_bry.ci_a7().Add_str_byte("src", Xatr__src);
 	private static final    Bry_fmt
-	  html_head  = Bry_fmt.Auto("\n/*TemplateStyles:r~{id}*/\n.mw-parser-output ~{css}") // .mw-parser-output needs to be added to all TemplateStyles CSS, else TS ids called "portal" will affect sidebar; ISSUE#:426; PAGE:en.w:Poland DATE:2020-04-10
+	  html_head  = Bry_fmt.Auto("\n/*TemplateStyles:r~{id}*/\n~{css}")
 	, html_error = Bry_fmt.Auto("<strong class=\"error\">~{msg}</strong>")
 	;
 }

400_xowa/src/gplx/xowa/xtns/template_styles/Template_styles_nde_tst.java

@@ -1,3 +1,18 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012-2020 gnosygnu@gmail.com
+
+XOWA is licensed under the terms of the General Public License (GPL) Version 3,
+or alternatively under the terms of the Apache License Version 2.0.
+
+You may use XOWA according to either of these licenses as is most appropriate
+for your project on a case-by-case basis.
+
+The terms of each license can be found in the source code repository:
+
+GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
+Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
+*/
 package gplx.xowa.xtns.template_styles;
 
 import gplx.String_;

400_xowa/tst/gplx/xowa/htmls/minifys/XoCssMinTest.java

@@ -1,3 +1,18 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012-2020 gnosygnu@gmail.com
+
+XOWA is licensed under the terms of the General Public License (GPL) Version 3,
+or alternatively under the terms of the Apache License Version 2.0.
+
+You may use XOWA according to either of these licenses as is most appropriate
+for your project on a case-by-case basis.
+
+The terms of each license can be found in the source code repository:
+
+GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
+Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
+*/
 package gplx.xowa.htmls.minifys;
 
 import gplx.core.tests.Gftest;