Author: solomax
Date: Wed Dec 2 10:12:16 2015
New Revision: 1717602
URL: http://svn.apache.org/viewvc?rev=1717602&view=rev
Log:
[OPENMEETINGS-1287] mail templates are added to the build, css is fixed
Modified:
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/components/templates.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/templates.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
Modified:
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/components/templates.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/components/templates.xml?rev=1717602&r1=1717601&r2=1717602&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/components/templates.xml
(original)
+++
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/components/templates.xml
Wed Dec 2 10:12:16 2015
@@ -30,5 +30,12 @@
<include>**/*.xml</include>
</includes>
</fileSet>
+ <fileSet>
+
<directory>${project.parent.basedir}/openmeetings-service/src/main/java</directory>
+
<outputDirectory>${om.webapp}/WEB-INF/classes</outputDirectory>
+ <includes>
+ <include>**/*.html</include>
+ </includes>
+ </fileSet>
</fileSets>
</component>
\ No newline at end of file
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css?rev=1717602&r1=1717601&r2=1717602&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
Wed Dec 2 10:12:16 2015
@@ -626,3 +626,6 @@ form .input {
max-height: 80px;
overflow-y: auto;
}
+#contents .btn-file>input {
+ transform: translate(-3000px, 0) scale(1);
+}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/templates.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/templates.xml?rev=1717602&r1=1717601&r2=1717602&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/templates.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/templates.xml
Wed Dec 2 10:12:16 2015
@@ -30,5 +30,12 @@
<include>**/*.xml</include>
</includes>
</fileSet>
+ <fileSet>
+
<directory>${project.parent.basedir}/openmeetings-service/src/main/java</directory>
+
<outputDirectory>${om.webapp}/WEB-INF/classes</outputDirectory>
+ <includes>
+ <include>**/*.html</include>
+ </includes>
+ </fileSet>
</fileSets>
</component>
\ No newline at end of file
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css?rev=1717602&r1=1717601&r2=1717602&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
Wed Dec 2 10:12:16 2015
@@ -626,3 +626,6 @@ form .input {
max-height: 80px;
overflow-y: auto;
}
+#contents .btn-file>input {
+ transform: translate(-3000px, 0) scale(1);
+}
