dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15191
committer: Mark Polak <markpo@xxxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-05-07 12:53:11 +0200
message:
  Style adjustments for searchable menu
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-05-06 09:20:18 +0000
+++ dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties	2014-05-07 10:53:11 +0000
@@ -829,7 +829,7 @@
 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
 app_order_name_alpha=Alphabetical
-app_search_placeholder=Search in apps
+app_search_placeholder=Search apps
 
 #-- calendars ------------------------------------------------------------------#
 

=== 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-05-06 09:20:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css	2014-05-07 10:53:11 +0000
@@ -12,11 +12,16 @@
 }
 
 #apps-search {
-    width: 330px;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    outline: none;
     padding-right: 25px;
+    padding-left: 5px;
+    width: 328px;
 }
 
 .apps-search-wrap {
+    padding-bottom: 10px;
     position: relative;
     width: 360px;
 }
@@ -31,7 +36,7 @@
     padding: 0;
     position: absolute;
     right: 5px;
-    top: 24%;
+    top: 18%;
     width: 20px;
 }
 
@@ -327,7 +332,7 @@
 {
     display: table;
     height: 34px;
-    padding-top: 12px;
+    padding-top: 8px;
     text-align: center;
     width: 360px;
 	margin-top: 5px;
@@ -375,15 +380,15 @@
 .menu-drop-down-wrap
 {
     overflow: hidden;
-    height: 340px;
+    height: 370px;
 }
 
 .menu-drop-down-scroll
 {
-    height: 340px;
-    width: 384px;
+    height: 370px;
     overflow-y: auto;
     overflow-x: hidden;
+    width: 384px;
 }
 
 #appsDropDown ul.menuDropDownBox {

=== 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-05-06 09:20:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js	2014-05-07 10:53:11 +0000
@@ -629,7 +629,7 @@
                 self.parent().css('width', '360px');
                 self.parent().parent().css('width', '360px');
             } else {
-                if (self.innerHeight() === 340 ) {
+                if (self.innerHeight() === 370 ) {
                     moreAppsElement.hide();
                     self.parent().css('width', '384px');
                     self.parent().parent().css('width', '384px');