You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/08/12 10:08:10 UTC
[openmeetings] branch 4.0.x updated: no jira: custom.css is
rendered later than theme.css
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 31b0695 no jira: custom.css is rendered later than theme.css
31b0695 is described below
commit 31b069533e96fb0a09159d8f55fcb51b120cf116
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sun Aug 12 17:07:59 2018 +0700
no jira: custom.css is rendered later than theme.css
---
.../src/main/java/org/apache/openmeetings/web/pages/BasePage.html | 1 -
.../src/main/java/org/apache/openmeetings/web/pages/BasePage.java | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
index 1267617..ff81973 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
@@ -58,7 +58,6 @@
}
</style>
<wicket:header-items/>
- <link type="text/css" rel="stylesheet" href="css/custom.css" media="all">
<title wicket:id="pageTitle">[title]</title>
</head>
<body>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index 1da0819..b53e94f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -109,6 +109,7 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage {
script.append(getGaCode()).append("');").append(isMainPage() ? "initHash()" : "init()").append(';');
response.render(OnDomReadyHeaderItem.forScript(script));
}
+ response.render(CssHeaderItem.forUrl("css/custom.css"));
}
@Override