Author: dongxu
Date: Thu Sep 12 02:05:39 2013
New Revision: 1522113
URL: http://svn.apache.org/r1522113
Log:
decorate the theme
Modified:
james/hupa/trunk/client/src/main/webapp/Hupa.html
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.html
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.html?rev=1522113&r1=1522112&r2=1522113&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.html (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.html Thu Sep 12 02:05:39 2013
@@ -42,6 +42,7 @@
.loading img {
position: absolute;
<<<<<<< HEAD
+<<<<<<< HEAD
top: 37%;
left: 50%;
}
@@ -50,6 +51,9 @@
}
=======
top: 50%;
+=======
+ top: 37%;
+>>>>>>> decorate the theme
left: 50%;
}
<<<<<<< HEAD
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
