dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13574
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-01-05 19:03:32 +0100
message:
  Replaced help png icon with fontawesome
removed:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help.png
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm
  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/macros.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/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2013-12-18 11:53:56 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2014-01-05 18:03:32 +0000
@@ -61,7 +61,6 @@
 ../images/search.png
 ../images/colapse.png
 ../images/expand.png
-../images/help.png
 ../images/hide.png
 ../images/comment.png
 ../images/comment_active.png

=== 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	2013-12-28 15:41:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2014-01-05 18:03:32 +0000
@@ -839,3 +839,7 @@
 	color: #777;
 }
 
+.fa-question-circle
+{
+  color: #276696;
+}

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help.png	2011-11-22 10:53:06 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2013-11-25 09:51:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2014-01-05 18:03:32 +0000
@@ -70,7 +70,7 @@
 #end
 
 #macro( openHelp $id )
-<a href="javascript:getHelpContent('${id}')" title="$i18n.getString( 'help' )"><img src="../images/help.png" alt="$i18n.getString( 'help' )"></a>
+<a href="javascript:getHelpContent('${id}')" title="$i18n.getString( 'help' )"><i class="fa fa-question-circle"></i></a>
 #end
 
 #macro( introListImgItem $action $objectKey $image )