dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14583
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-04-01 12:21:31 +0200
message:
  Top menu fix
modified:
  dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties
  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/javascripts/dhis2/dhis2.menu.js


--
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-services/dhis-service-i18n/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties	2014-03-30 20:47:31 +0000
+++ dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties	2014-04-01 10:21:31 +0000
@@ -779,7 +779,5 @@
 app_manager=Apps
 app_favorite_description=This icon indicates an app that will be displayed in your dropdown menu.
 app_draggable_description=Items are draggable to change their order, so it's easy to customize your favorite apps.
-
-app_order_custom=My own order (Custom)
-
+app_order_custom=My own order
 app_order_name_alpha=Alphabetical

=== 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-03-31 19:15:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css	2014-04-01 10:21:31 +0000
@@ -60,8 +60,8 @@
 .app-menu .app-menu-placeholder {
     margin: 10px;
     display: block;
-    border: 1px solid #ccc;
-    background-color: #f5f5f7;
+    border: 1px solid #d0d0d0;
+    background-color: #fff;
     width: 225px;
     height: 56px;
     border-radius: 5px;
@@ -78,10 +78,11 @@
 }
 
 .app-menu .app-menu-item span {
-    font-size: 1.25em;
+    font-size: 1.2em;
     padding-left: 48px;
     display: block;
-    padding-top: 15px;
+    padding-top: 18px;
+    color: #404040;
 }
 
 .app-menu .app-menu-placeholder,
@@ -110,12 +111,13 @@
     right: 0;
     bottom: 0;
     left: 0;
-    background: #276696;
+    background: #fff;
+    border: 1px solid #d0d0d0;
     display: block;
     margin: 10px;
     padding: 10px 10px;
     font-size: 1em;
-    color: #fff;
+    color: #555;
     border-radius: 5px;
 }
 
@@ -124,11 +126,11 @@
 }
 
 .app-menu li.ui-sortable-helper:hover a {
-    background-color: rgba(200, 200, 210, 0.30);
+    background-color: rgba(255, 255, 255, 0.30);
 }
 
 .app-menu-item .app-menu-item-description span {
-    color: #7fc9fd;
+    color: #444;
     display: block;
     font-size: 1em;
     padding: 0;
@@ -228,6 +230,7 @@
     padding-right: 10px;
     text-align: center;
     width: 100px;
+    color: #404040;
 }
 
 .app-menu-dropdown .caret-up-background,

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js	2014-03-31 18:24:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js	2014-04-01 10:21:31 +0000
@@ -353,9 +353,9 @@
         selector = 'appsMenu';
 
     markup += '<li data-id="${id}" data-app-name="${name}" data-app-action="${defaultAction}">';
-    markup += '  <a href="${defaultAction}" class="app-menu-item" title="${name}">';
+    markup += '  <a href="${defaultAction}" class="app-menu-item">';
     markup += '    <img src="${icon}" onError="javascript: this.onerror=null; this.src = \'../icons/program.png\';">';
-    markup += '    <span>${name}</span>';
+    markup += '    <span class="bold">${name}</span>';
     markup += '    <div class="app-menu-item-description"><span class="bold">${name}</span><i class="fa fa-arrows"></i><p>${description}</p></div>';
     markup += '  </a>';
     markup += '</li>';