X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Futil%2FBundleCmsTheme.java;h=9a3cf9d47d87b653fcb5de6d346284e27950dc2c;hp=3b2669e02242e9f96c39238f5c4f804695933982;hb=ecf8ab7382eadecab5a93261f261d0fd2168ffa8;hpb=061371ee55c9593b16be0f589d9772802ebdd102

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/BundleCmsTheme.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/BundleCmsTheme.java
index 3b2669e02..9a3cf9d47 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/BundleCmsTheme.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/BundleCmsTheme.java
@@ -33,6 +33,9 @@ public class BundleCmsTheme extends AbstractCmsTheme {
 	public final static String CMS_THEME_PROPERTY = "argeo.cms.theme";
 	public final static String CMS_THEME_BUNDLE_PROPERTY = "argeo.cms.theme.bundle";
 
+	private final static String HEADER_CSS = "header.css";
+	private final static String FONTS_TXT = "fonts.txt";
+
 //	private final static Log log = LogFactory.getLog(BundleCmsTheme.class);
 
 	private String themeId;
@@ -103,14 +106,17 @@ public class BundleCmsTheme extends AbstractCmsTheme {
 		addFonts("*.woff2");
 
 		// fonts
-		URL fontsUrl = themeBundle.getEntry(basePath + "fonts.txt");
+		URL fontsUrl = themeBundle.getEntry(basePath + FONTS_TXT);
 		if (fontsUrl != null) {
 			loadFontsUrl(fontsUrl);
 		}
 
 		// common CSS header (plain CSS)
-		URL headerCssUrl = themeBundle.getEntry(basePath + "header.css");
+		URL headerCssUrl = themeBundle.getEntry(basePath + HEADER_CSS);
 		if (headerCssUrl != null) {
+			// added to plain Web CSS
+			webCssPaths.add(basePath + HEADER_CSS);
+			// and it will also be used by RAP:
 			try (BufferedReader buffer = new BufferedReader(new InputStreamReader(headerCssUrl.openStream(), UTF_8))) {
 				headerCss = buffer.lines().collect(Collectors.joining("\n"));
 			} catch (IOException e) {