← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11262: Moved styling from login page to css file

 

------------------------------------------------------------
revno: 11262
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-06-25 20:35:42 +0200
message:
  Moved styling from login page to css file
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	2013-06-17 17:39:32 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2013-06-25 18:35:42 +0000
@@ -91,6 +91,12 @@
   padding-right: 5px;
 }
 
+#loginField input[type=text],input[type=password]
+{
+  width: 240px;
+  height: 20px;
+}
+
 #loginMessage
 {
   background-color: #3b6da1;
@@ -113,7 +119,8 @@
   border-radius: 3px;
 }
 
-#notificationArea a {
+#notificationArea a 
+{
   color: #6b90b8;
 }
 
@@ -160,6 +167,7 @@
   border: 1px solid #444;
   border-radius: 3px;
   color: #222;
+  width: 120px;
 }
 
 .button:hover 

=== 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	2013-06-22 19:50:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2013-06-25 18:35:42 +0000
@@ -45,17 +45,17 @@
                 <table>
                     <tr>
                         <td><label for="j_username">Username</label></td>
-                        <td><input type="text" id="j_username" name="j_username" style="width:240px; height:20px;"></td>
+                        <td><input type="text" id="j_username" name="j_username"></td>
                     </tr>
                     <tr>
                         <td><label for="j_password">Password</label></td>
-                        <td><input type="password" id="j_password" name="j_password" style="width:240px; height:20px;" autocomplete="off"></td>
+                        <td><input type="password" id="j_password" name="j_password" autocomplete="off"></td>
                     </tr>
                     <tr>
                         <td></td>
                         <td>
-                            <input id="submit" class="button" type="submit" value="Login" style="width:120px">
-                            <input id="reset" class="button" type="reset" value="Clear" style="width:120px">
+                            <input id="submit" class="button" type="submit" value="Login">
+                            <input id="reset" class="button" type="reset" value="Clear">
                         </td>
                     </tr>
                     <tr>