dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4656
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-09-23 16:40:15 +0200
message:
  color adjustments in mobile ui
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css


--
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_mobile.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css	2011-09-23 13:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css	2011-09-23 14:40:15 +0000
@@ -73,9 +73,9 @@
  * 
  */
 body div#header {
-	height: 2.0em;
+	height:	60px;
 	background-color: #1d5288;
-	border-bottom: 4px solid #2770B9;
+	border-bottom: 4px solid #184572;
 	padding-top: 2px;
 	padding-bottom: 2px;
 	margin-bottom: .5em;
@@ -91,6 +91,10 @@
 	margin-top: .4em;
 }
 
+body div#header a {
+	border: none;
+}
+
 /*
  * FOOTER
  * 
@@ -186,7 +190,7 @@
 	padding-left: 2%;
 	padding-right: 2%;
 	color: white;
-	background-color: #44AA33;
+	background-color: #327FA9;
 	border-top: 1px solid #67DD30;
 	border-bottom: 2px solid #378C29;
 	margin-top: 0;
@@ -211,7 +215,7 @@
 	width: 95%;
 	margin: 0em auto;
 	padding: 0.3em 0.3em;
-	background-color: #0038E1;
+	background-color: #1d5288;
 	color: white;
 }
 
@@ -339,6 +343,7 @@
 }
 
 body form {
+	font-size: 1.15em;
 	margin: 0;
 	color: #333333;
 }
@@ -352,6 +357,7 @@
 
 body form input {
 	width: 100%;
+	font-size: 1.15em;
 }
 
 body input[type='text'] { 
@@ -376,12 +382,12 @@
 }
 
 body input[type='button'] {
+	font-size: 1.15em;
 	padding: 1em 1.3em;
 	color: #D8D8D8;
 	margin: 1em 0em;
 }
 
-
 /*
  * TABLES
  * 
@@ -453,11 +459,11 @@
 /* 2px border is required to ensure header is flush with the box */
 body div.header-box h3 {
 	font-size: 1.2em;
-	border: 2px solid #0038E1;
+	border: 2px solid #1D5287;
 	width: 92%;
 	margin: 0em auto;
 	padding: 0.3em 0.3em;
-	background-color: #0038E1;
+	background-color: #1d5288;
 	color: white;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm	2011-09-23 13:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm	2011-09-23 14:40:15 +0000
@@ -13,7 +13,7 @@
 <div id="wrap">
 
 <div id="header">
-	<img src="logo_banner.png" alt="DHIS2" width="120" height="36">
+	<a href="login.action"><img src="logo_banner.png" alt="DHIS2" width="143" height="60"></a>
 </div>
 
 <div id="content">
@@ -27,10 +27,10 @@
 	</p>
 </div>
 
-<div class="header-box">
+<div class="header-box" align="center">
 	<p>
-		<input type="submit" style="width: 48%" value="Login"/>
-		<input type="reset" style="width: 48%" value="Reset"/>
+		<input type="submit" style="width: 48%;" value="Login"/>
+		<input type="reset" style="width: 48%;" value="Reset"/>
 	</p>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm	2011-09-23 13:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm	2011-09-23 14:40:15 +0000
@@ -11,7 +11,7 @@
 <div id="wrap">
 
 <div id="header">
-	<img src="../dhis-web-commons/security/logo_banner.png" alt="DHIS2" width="120" height="36">
+	<a href="index.action"><img src="../dhis-web-commons/security/logo_banner.png" alt="DHIS2" width="143" height="60"></a>
 </div>
 
 <div id="content">

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css	2011-09-23 13:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css	2011-09-23 14:40:15 +0000
@@ -73,9 +73,9 @@
  * 
  */
 body div#header {
-	height: 2.0em;
+	height:	60px;
 	background-color: #1d5288;
-	border-bottom: 4px solid #2770B9;
+	border-bottom: 4px solid #184572;
 	padding-top: 2px;
 	padding-bottom: 2px;
 	margin-bottom: .5em;
@@ -91,6 +91,10 @@
 	margin-top: .4em;
 }
 
+body div#header a {
+	border: none;
+}
+
 /*
  * FOOTER
  * 
@@ -185,10 +189,10 @@
 	font-size: 1.3em;
 	padding-left: 2%;
 	padding-right: 2%;
-	color: white;
-	background-color: #44AA33;
-	border-top: 1px solid #67DD30;
-	border-bottom: 2px solid #378C29;
+	color: black;
+	background-color: #F6F6F6;
+	border-top: 1px solid #D8D8D8;
+	border-bottom: 2px solid #D8D8D8;
 	margin-top: 0;
 	margin-bottom: 0.4em;
 	line-height: normal;
@@ -207,12 +211,12 @@
 	border-bottom: 2px solid #000C30;
 	*/
 	font-size: 0.8em;
-	border: 2px solid #0038E1;
+	border: 2px solid #D8D8D8;
 	width: 95%;
 	margin: 0em auto;
 	padding: 0.3em 0.3em;
-	background-color: #0038E1;
-	color: white;
+	background-color: #F6F6F6;
+	color: black;
 }
 
 body h4 {
@@ -339,12 +343,13 @@
 }
 
 body form {
+	font-size: 1.15em;
 	margin: 0;
 	color: #333333;
 }
 
 body form label {
-	font-size: medium;
+	font-size: 1.15em;
 	width: 100%;
 	margin-bottom: .5em;
 	margin-top: .5em;
@@ -352,36 +357,41 @@
 
 body form input {
 	width: 100%;
+	font-size: 1.15em;
 }
 
 body input[type='text'] { 
+	font-size: 1.15em;
 	padding: 0.2em;
 	margin-bottom: .5em;
 	display: block;
 }
 
-body textarea { 
+body textarea {
+	font-size: 1.15em;
 	padding: 0.2em;
 	margin-bottom: .7em;
 	display: block;
 }
 
 body form input[type='radio'], body form input[type='checkbox'] { 
+	font-size: 1.15em;
 	margin:0.1em 0em;
 	padding: 0;
 }
 
 body select {
+	font-size: 1.15em;
 	margin-bottom: 0;
 }
 
 body input[type='button'] {
+	font-size: 1.15em;
 	padding: 1em 1.3em;
 	color: #D8D8D8;
 	margin: 1em 0em;
 }
 
-
 /*
  * TABLES
  * 
@@ -447,13 +457,13 @@
 	width: 92%;
 	margin: 0 auto 0.6em auto;
 	padding: 0.4em 0.4em;
-	background-color: #F6F6F6;
+	background-color: #E8E8E8;
 }
 
 /* 2px border is required to ensure header is flush with the box */
 body div.header-box h3 {
 	font-size: 0.8em;
-	border: 2px solid #0038E1;
+	border: 2px solid #D8D8D8;
 	width: 92%;
 	margin: 0em auto;
 	padding: 0.3em 0.3em;