← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7143: Minor

 

------------------------------------------------------------
revno: 7143
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-06-01 22:24:15 +0200
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2012-06-01 19:40:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2012-06-01 20:24:15 +0000
@@ -26,23 +26,23 @@
   left: 15px;
   border: 1px solid #ddd;
   border-radius: 2px;
-  width: 135px;
+  width: 120px;
   margin-bottom: 5%;
 }
 
 #titleArea
 {
   position: absolute;
-  top: 15px;
-  left: 180px;
-  font-size: 20px;
+  top: 17px;
+  left: 170px;
+  font-size: 19px;
 }
 
 #loginField
 {
   position: relative;
   margin: 7% auto 0 auto;
-  width: 330px;
+  width: 380px;
   text-align: center;
 }
 
@@ -63,8 +63,10 @@
   border-width: 1px;
   border-color: #D0D0D0;
   padding: 11px;
+  margin-top: 20px;
   display: block;
-  width: 400px;
+  width: 350px;
+  border-radius: 2px;
 }
 
 #footerArea

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2012-06-01 19:40:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2012-06-01 20:24:15 +0000
@@ -28,9 +28,8 @@
         #end
 	    </div>
         <div id="loginField">
-            <div id="bannerArea"><a href="http://dhis2.org";><img alt="" src="logo_banner.png"></a></div>
+            <div id="bannerArea"><img alt="" src="logo_banner.png"></div>
             
-            <div>
             <form id="loginForm" action="../../dhis-web-commons-security/login.action" method="post">
                 <table>
                     <tr>
@@ -50,7 +49,6 @@
                     </tr>
                 </table>
             </form>
-            </div>
             #if( $failed == true )
             <span id="loginMessage">Wrong username or password. Please try again.</span>
 			#end