dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Mark Polak (markpo)
------------------------------------------------------------
revno: 14592 [merge]
committer: Mark Polak <markpo@xxxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-04-01 22:44:02 +0200
message:
  Fix menu bug and adds small style changes to app management header
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.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/dhis-web-commons/about/modules.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm	2014-03-30 10:32:05 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm	2014-04-01 20:39:26 +0000
@@ -1,10 +1,10 @@
 
 <div class="app-manager-header ui-helper-clearfix">
     <h3>$i18n.getString( "app_manager")</h3>
-    <p>
+    <div class="app-menu-help">
       <i class="fa fa-bookmark"></i> $i18n.getString( "app_favorite_description" )<br>
       <i class="fa fa-arrows"></i> $i18n.getString( "app_draggable_description" )
-    </p>
+    </div>
     <select id="menuOrderBy">
         <option selected value="custom">$i18n.getString( "app_order_custom" )</option>
         <option value="name-asc">$i18n.getString( "app_order_name_alpha" )</option>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css	2014-04-01 19:50:22 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css	2014-04-01 20:44:02 +0000
@@ -149,7 +149,7 @@
 {
     color: #444;
     display: block;
-    font-size: 1em;
+    font-size: 1.1em;
     padding: 0;
     padding-bottom: 5px;
     margin: 0;
@@ -370,6 +370,22 @@
     display: block;
 }
 
+.app-menu-help
+{
+    color: #444;
+    line-height: 1.75em;
+}
+
+.app-menu-help .fa
+{
+    font-size: 1.2em;
+}
+
+.app-menu-help .fa-bookmark
+{
+    color: #276696;
+}
+
 /*
  * Media queries for the menu
  */