← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7198: More styling

 

------------------------------------------------------------
revno: 7198
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-06-05 23:31:46 +0200
message:
  More styling
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.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/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2012-06-05 19:47:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2012-06-05 21:31:46 +0000
@@ -29,7 +29,7 @@
 a
 {
   text-decoration: none;
-  color: #3b73b8;
+  color: #3567cd;
 }
 
 select
@@ -44,7 +44,7 @@
 
 a:visited
 {
-  color:#3b73b8;
+  color:#3567cd;
 }
 
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2012-06-05 19:47:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2012-06-05 21:31:46 +0000
@@ -29,7 +29,7 @@
 a
 {
   text-decoration: none;
-  color: #3b73b8;
+  color: #3567cd;
 }
 
 select
@@ -44,7 +44,7 @@
 
 a:visited
 {
-  color:#3b73b8;
+  color:#3567cd;
 }
 
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2012-06-04 16:20:41 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2012-06-05 21:31:46 +0000
@@ -579,6 +579,8 @@
 
 .ui-datepicker th 
 {
+  font-family: LiberationSansBold, arial, sans-serif;
+  font-weight: normal;
   padding: 0.5em 0;
   font-size: 9pt;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm	2012-06-04 12:52:49 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm	2012-06-05 21:31:46 +0000
@@ -24,7 +24,7 @@
     <div id="$listId" class="menuDropDownArea">
         <ul class="menuDropDownBox">
         #foreach( $provider in $providerNames )
-            <li class="menuDropDownItem" onclick="setAreaItem( '$divId', '$provider' )">$i18n.getString( "$provider" )&nbsp;</li>
+            <li><a href="javascript:setAreaItem( '$divId', '$provider' )">$i18n.getString( "$provider" )&nbsp;</a></li>
         #end
         </ul>
     </div>
@@ -41,7 +41,7 @@
     <div id="$listId" class="menuDropDownArea">
         <ul class="menuDropDownBox">
         #foreach( $availableChart in $charts )
-            <li class="menuDropDownItem" onclick="setAreaItem( '${divId}', '${availableChart.id}' )">${availableChart.name}&nbsp;</li>
+            <li><a href="javascript:setAreaItem( '${divId}', '${availableChart.id}' )">${availableChart.name}&nbsp;</a></li>
         #end
         </ul>
     </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-04 12:52:49 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-06-05 21:31:46 +0000
@@ -175,22 +175,6 @@
   padding: 4px 0px 0px 6px;
 }
 
-.page a
-{
-  text-decoration:none;
-  color:#3567cd;
-}
-
-.page a:hover
-{
-  text-decoration:underline;
-}
-
-.page a:visited
-{
-  color:#3567cd;
-}
-
 div#selectionTree 
 {
   height:200px;

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2012-04-16 14:54:22 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2012-06-05 21:31:46 +0000
@@ -183,10 +183,10 @@
 
 <div id="pivotMenu" class="menuDropDownArea" onmouseover="cancelHideDropDownTimeout()" onmouseout="hideDropDownTimeout()">
   <ul class="menuDropDownBox">
-    <li class="menuDropDownItem" onclick='viewChart( "single", "period" )'>$i18n.getString( "this_indicator_and_periods" )&nbsp;</li>
-    <li class="menuDropDownItem" onclick='viewChart( "single", "orgunit" )'>$i18n.getString( "this_indicator_and_orgunits" )&nbsp;</li>
-    <li class="menuDropDownItem" onclick='viewChart( "all", "period" )'>$i18n.getString( "all_indicator_and_periods" )&nbsp;</li>
-    <li class="menuDropDownItem" onclick='viewChart( "all", "orgunit" )'>$i18n.getString( "all_indicator_and_orgunits" )&nbsp;</li>
+    <li><a href="javascript:viewChart( 'single', 'period' )">$i18n.getString( "this_indicator_and_periods" )&nbsp;</a></li>
+    <li><a href="javascript:viewChart( 'single', 'orgunit' )">$i18n.getString( "this_indicator_and_orgunits" )&nbsp;</a></li>
+    <li><a href="javascript:viewChart( 'viewChart( 'all', 'period' )">$i18n.getString( "all_indicator_and_periods" )&nbsp;</a></li>
+    <li><a href="javascript:viewChart( 'viewChart( 'all', 'orgunit' )">$i18n.getString( "all_indicator_and_orgunits" )&nbsp;</a></li>
   </ul>
 </div>