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 2017/11/27 13:47:37 UTC

openmeetings git commit: [OPENMEETINGS-1769] stub for custom.css file is used

Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x 8f5e3fe48 -> 8ab9c80c8


[OPENMEETINGS-1769] stub for custom.css file is used


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/8ab9c80c
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8ab9c80c
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8ab9c80c

Branch: refs/heads/4.0.x
Commit: 8ab9c80c8e5f899379376d6cb8cfcb3b584bb878
Parents: 8f5e3fe
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Nov 27 20:47:29 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Nov 27 20:47:29 2017 +0700

----------------------------------------------------------------------
 openmeetings-server/src/site/xdoc/themes-and-branding.xml     | 7 ++++---
 .../main/java/org/apache/openmeetings/web/pages/BasePage.html | 1 +
 openmeetings-web/src/main/webapp/css/custom.css               | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8ab9c80c/openmeetings-server/src/site/xdoc/themes-and-branding.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/themes-and-branding.xml b/openmeetings-server/src/site/xdoc/themes-and-branding.xml
index e009000..35f0da9 100644
--- a/openmeetings-server/src/site/xdoc/themes-and-branding.xml
+++ b/openmeetings-server/src/site/xdoc/themes-and-branding.xml
@@ -46,10 +46,11 @@
 			</p>
 			<p>All other elements might be styled by modifying CSS files in <tt>/webapps/openmeetings/css</tt> folder</p>
 		</section>
-		<section name="Creating custom CSS file">
+		<section name="Creating custom CSS rules">
 			<ol>
-				<li>create <tt>webapps/openmeetings/css/custom.css</tt> file</li>
-				<li>open <tt>webapps/openmeetings/WEB-INF/classes/org/apache/openmeetings/web/pages/BasePage.html</tt> add link to your new CSS file (as last link)</li>
+				<li>open <tt>webapps/openmeetings/css/custom.css</tt> file</li>
+				<li>add you custom rules</li>
+				<li>restart OM (force reload might be required)</li>
 			</ol>
 		</section>
 	</body>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8ab9c80c/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
----------------------------------------------------------------------
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 ff81973..1267617 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,6 +58,7 @@
 		}
 	</style>
 	<wicket:header-items/>
+	<link type="text/css" rel="stylesheet" href="css/custom.css" media="all">
 	<title wicket:id="pageTitle">[title]</title>
 </head>
 <body>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8ab9c80c/openmeetings-web/src/main/webapp/css/custom.css
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/css/custom.css b/openmeetings-web/src/main/webapp/css/custom.css
new file mode 100644
index 0000000..a0d4431
--- /dev/null
+++ b/openmeetings-web/src/main/webapp/css/custom.css
@@ -0,0 +1 @@
+/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */