← Back to team overview

dhis2-devs team mailing list archive

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

 

------------------------------------------------------------
revno: 7161
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-06-03 22:33:54 +0200
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.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/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-06-03 17:20:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-06-03 20:33:54 +0000
@@ -122,7 +122,7 @@
 
     #if( $hideMenu && $hideMenu == "true" )
     <style type="text/css">
-      #mainPage { margin-left: 35px; }
+      #mainPage { margin-left: 28px; }
     </style>
     #else
     <div id="leftBar">    

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2012-06-03 17:20:55 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2012-06-03 20:33:54 +0000
@@ -6,7 +6,7 @@
 </h3>
 
 <div id="subMenu">
-	<ul><li><a href="">Dashboard</a></li><li><a href="message.action">Messages</a></li><li><a href="interpretation.action">Interpretations</a></li></ul>
+	<ul><li><a href="message.action">Messages</a></li><li><a href="interpretation.action">Interpretations</a></li></ul>
 </div>
 
 <div id="contentDiv"></div>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-06-03 17:20:55 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-06-03 20:33:54 +0000
@@ -5,7 +5,7 @@
 
 .contentProviderTable
 {
-  width:305px;
+  width:295px;
 }
 
 .contentProviderTable td
@@ -26,7 +26,7 @@
   border:1px solid #d0d0d0;
   padding:1px;
   height:196px;
-  width:305px;
+  width:295px;
   overflow:hidden;
   margin-bottom:15px;
 }
@@ -81,13 +81,14 @@
 
 #subMenu a
 {
-  padding: 6px 10px;
+  padding: 6px 12px;
   height: 25px;
   border: 1px solid #aaa;
   border-radius: 3px;
   margin-right: 4px;
   font-family: LiberationSansBold, arial;
-  color: #666;
+  font-size: 13px;
+  color: #606060;
   background-color: #f3f3f3;
 }