dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11310
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-07-02 18:18:27 +0200
message:
  Fix for index pages for avoiding long descriptions to break around icon
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.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/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-07-01 19:06:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-07-02 16:18:27 +0000
@@ -396,7 +396,7 @@
 .introList
 {
   list-style-type:none;
-  width: 465px;
+  width: 490px;
   padding-top: 10px;
   padding-bottom: 20px;
   padding-left: 5px;
@@ -413,8 +413,7 @@
 
 .introIcon
 {
-  float: left; 
-  margin-right: 25px;
+  float: left;
 }
 
 .introItem
@@ -437,6 +436,11 @@
   font-size: 13px;
 }
 
+.introItemText
+{
+  margin-left: 73px;
+}
+
 /*----------------------------------------------------------------------------*/
 /* @font-face                                                                 */
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-07-01 19:06:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-07-02 16:18:27 +0000
@@ -394,14 +394,12 @@
 .introList
 {
   list-style-type:none;
-  width: 450px;
-  background-color: #d5efd5;
-  border: 1px solid #a4d2a3;
+  width: 490px;
   padding-top: 10px;
   padding-bottom: 20px;
   padding-left: 5px;
   padding-right: 5px;
-  border-radius: 5px;
+  color: #444;
 }
 
 .introTwoColList
@@ -413,22 +411,20 @@
 
 .introIcon
 {
-  float: left; 
-  margin-right: 25px;
+  float: left;
 }
 
 .introItem
 {
-  padding: 12px;
+  padding: 18px;
   cursor: pointer;
-  border: 1px solid #d5efd5;
   min-height: 44px;
-  border-radius: 3px;
+  border-bottom: 1px solid #e0e0e0;
 }
 
 .introItem:hover
 {
-  background-color: #a4d2a3;
+  background-color: #f6f6f6;
 }
 
 .introItemHeader
@@ -438,6 +434,11 @@
   font-size: 13px;
 }
 
+.introItemText
+{
+  margin-left: 73px;
+}
+
 /*----------------------------------------------------------------------------*/
 /* @font-face                                                                 */
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-07-01 19:06:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-07-02 16:18:27 +0000
@@ -391,7 +391,7 @@
 .introList
 {
   list-style-type:none;
-  width: 465px;
+  width: 490px;
   padding-top: 10px;
   padding-bottom: 20px;
   padding-left: 5px;
@@ -408,8 +408,7 @@
 
 .introIcon
 {
-  float: left; 
-  margin-right: 25px;
+  float: left;
 }
 
 .introItem
@@ -432,6 +431,11 @@
   font-size: 13px;
 }
 
+.introItemText
+{
+  margin-left: 73px;
+}
+
 /*----------------------------------------------------------------------------*/
 /* @font-face                                                                 */
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-07-01 19:06:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-07-02 16:18:27 +0000
@@ -391,14 +391,12 @@
 .introList
 {
   list-style-type:none;
-  width: 450px;
-  background-color: #d5efd5;
-  border: 1px solid #a4d2a3;
+  width: 490px;
   padding-top: 10px;
   padding-bottom: 20px;
   padding-left: 5px;
   padding-right: 5px;
-  border-radius: 5px;
+  color: #444;
 }
 
 .introTwoColList
@@ -410,21 +408,20 @@
 
 .introIcon
 {
-  float: left; 
-  margin-right: 25px;
+  float: left;
 }
 
 .introItem
 {
-  padding: 12px;
+  padding: 18px;
   cursor: pointer;
   min-height: 44px;
-  border-radius: 3px;
+  border-bottom: 1px solid #e0e0e0;
 }
 
 .introItem:hover
 {
-  background-color: #a4d2a3;
+  background-color: #f6f6f6;
 }
 
 .introItemHeader
@@ -434,6 +431,11 @@
   font-size: 13px;
 }
 
+.introItemText
+{
+  margin-left: 73px;
+}
+
 /*----------------------------------------------------------------------------*/
 /* @font-face                                                                 */
 /*----------------------------------------------------------------------------*/

=== 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-06-29 13:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2013-07-02 16:18:27 +0000
@@ -73,15 +73,10 @@
 <a href="javascript:getHelpContent('${id}')" title="$i18n.getString( 'help' )"><img src="../images/help.png" alt="$i18n.getString( 'help' )"></a>
 #end
 
-#macro( introListItem $action $objectKey )
-<li class="introItem" onclick="window.location.href='${action}'">
-  <span class="introItemHeader">$i18n.getString( "${objectKey}" )</span><br>$i18n.getString( "intro_${objectKey}" )
-</li>
-#end
-
 #macro( introListImgItem $action $objectKey $image )
 <li class="introItem" onclick="window.location.href='${action}'">
-  <span class="introItemHeader"><img src="../icons/${image}.png" class="introIcon">$i18n.getString( "${objectKey}" )</span><br>$i18n.getString( "intro_${objectKey}" )
+  <img src="../icons/${image}.png" class="introIcon">
+  <div class="introItemText"><div class="introItemHeader">$i18n.getString( "${objectKey}" )</div><div>$i18n.getString( "intro_${objectKey}" )</div></div>
 </li>
 #end