dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19243
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-06-02 11:55:21 +0200
message:
  Replaced png icons with fontawesome in main template
modified:
  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/main.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/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2015-05-17 14:46:45 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2015-06-02 09:55:21 +0000
@@ -175,6 +175,14 @@
   clear: both;
 }
 
+.leftBarIcon
+{
+  height: 16px;
+  width: 16px;
+  color: #666;
+  font-size: 10pt;
+}
+
 #showLeftBar
 {
   display: none;

=== 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	2015-01-20 10:05:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2015-06-02 09:55:21 +0000
@@ -122,7 +122,7 @@
 
       <span id="showLeftBar">
         <a href="javascript:dhis2.leftBar.showAnimated()" title="$i18n.getString( 'show_menu' )">
-          <img src="../images/show_menu.png" width="16" height="16" alt="$i18n.getString( 'show_menu' )"/></a>
+          <i class="fa fa-arrow-right leftBarIcon"></i></a>
       </span>
     </div>
 
@@ -134,11 +134,11 @@
     <div id="leftBar">
       <div id="hideLeftBar">
         <a href="index.action" title="$i18n.getString( 'show_main_menu' )" id="showMainMenuLink">
-          <img src="../images/home_small.png" width="16" height="16" /></a>
+          <i class="fa fa-home leftBarIcon"></i></a>
         <a href="javascript:dhis2.leftBar.hideAnimated()" title="$i18n.getString( 'hide_menu' )" id="hideMainMenuLink">
-          <img src="../images/hide_menu.png" width="16" height="16" /></a>
+          <i class="fa fa-arrow-left leftBarIcon"></i></a>
         <a href="javascript:dhis2.leftBar.extendAnimated()" title="$i18n.getString( 'extend_menu' )" id="extendMainMenuLink">
-          <img src="../images/extend_menu.png" width="16" height="16" /></a>
+          <i class="fa fa-arrow-right leftBarIcon"></i></a>
       </div>
 
       <div id="leftBarContents">
@@ -166,7 +166,7 @@
 
     <div id="rightBar">
       <span id="hideRightBar"><a href="javascript:hideHelpContent()" title="$i18n.getString( 'close' )">
-        <img id="hideRightBarImg" src="../images/hide.png" alt="$i18n.getString( 'close' )"/></a>
+        <i class="fa fa-times leftBarIcon"></i></a>
       </span>
       <div id="rightBarContents"></div>
     </div>