← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10771: Light, nicer top menu and click on logo goes to index page

 

------------------------------------------------------------
revno: 10771
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-05-06 12:22:55 +0200
message:
  Light, nicer top menu and click on logo goes to index page
modified:
  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-light/src/main/webapp/dhis-web-light/main.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm	2012-10-09 04:45:29 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm	2013-05-06 10:22:55 +0000
@@ -11,7 +11,7 @@
 <div id="wrap">
 
 <div id="header">
-	<img src="../dhis-web-commons/security/logo_mobile.png" alt="DHIS2" width="64" height="20">
+	<a href="index.action"><img id="logo" src="../dhis-web-commons/security/logo_mobile.png" alt="DHIS2" width="64" height="18"></a>
 </div>
 
 <div id="content" align="center" style="text-align: left;">

=== 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	2012-07-09 06:15:25 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css	2013-05-06 10:22:55 +0000
@@ -93,7 +93,7 @@
  */
 body div#header
 {
-    height           : 20px;
+    height           : 21px;
     background-color : #1d5288;
     border-bottom    : 2px solid #184572;
     padding-top      : 1px;
@@ -117,6 +117,12 @@
     border : none;
 }
 
+body img#logo
+{
+    margin-top: 2px;
+    margin-left: 8px;
+}
+
 /*
  * FOOTER
  * 
@@ -241,10 +247,9 @@
     font-size        : 0.9em;
     padding-left     : 2%;
     padding-right    : 2%;
+	padding-bottom   : 0.2em;
     color            : black;
-    background-color : #F6F6F6;
-    border-top       : 1px solid #D8D8D8;
-    border-bottom    : 2px solid #D8D8D8;
+    border-bottom    : 1px solid #D8D8D8;
     margin-top       : 0;
     margin-bottom    : 0.4em;
     line-height      : normal;