=== 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-10-29 20:17:23 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css 2012-11-01 06:49:12 +0000 @@ -33,8 +33,8 @@ #flagArea { position: absolute; - top: 15px; - left: 20px; + top: 22px; + left: 52px; border: 1px solid #d5d5d5; border-radius: 2px; width: 105px; @@ -44,8 +44,8 @@ #titleArea { position: absolute; - top: 17px; - left: 145px; + top: 24px; + left: 177px; font-size: 19px; } @@ -53,8 +53,8 @@ { width: 250px; position: absolute; - top: 46px; - left: 145px; + top: 53px; + left: 177px; font-size: 17px; color: #bfd9f2; } @@ -73,18 +73,11 @@ #accountArea { position: absolute; - right: 10px; + right: 17px; padding: 18px 30px 18px 0; font-size: 17px; } -#accountIntro -{ - position: relative; - top: 1px; - padding-right: 15px -} - #loginField { position: relative; === 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-10-29 20:17:23 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm 2012-11-01 06:49:12 +0000 @@ -33,7 +33,7 @@ #if ( $keyConfig.selfRegistrationAllowed() )
#end- - + | + + #if( $!dataEntryForm ) - + #end |
- + | |
- | |
- + | |