← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8515: Moved style from template to stylesheet

 

------------------------------------------------------------
revno: 8515
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-10-12 19:04:19 +0200
message:
  Moved style from template to stylesheet
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menuDashboard.vm
  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/about/menuDashboard.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menuDashboard.vm	2012-10-11 16:02:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menuDashboard.vm	2012-10-12 17:04:19 +0000
@@ -1,7 +1,7 @@
 
 #if ( $keyFlag )
-<img src="../dhis-web-commons/flags/${keyFlagImage}" onclick="window.location.href='../${startModule}/index.action'"
-    style="margin-top: 16px; margin-left: 16px; border: 1px solid #D0D0D0; border-radius: 2px; cursor: pointer;" title="$i18n.getString( 'view_home_page' )">
+<img class="dashboardMenuFlag" src="../dhis-web-commons/flags/${keyFlagImage}" onclick="window.location.href='../${startModule}/index.action'"
+    title="$i18n.getString( 'view_home_page' )">
 #end
 
 <h2>$i18n.getString( "dashboard" )&nbsp;</h2>

=== 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	2012-10-05 13:13:44 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2012-10-12 17:04:19 +0000
@@ -586,6 +586,15 @@
 {
 }
 
+.dashboardMenuFlag
+{
+  margin-top: 18px; 
+  margin-left: 16px; 
+  border: 1px solid #D0D0D0; 
+  border-radius: 2px; cursor: pointer;
+  width: 160px;
+}
+
 /*----------------------------------------------------------------------------*/
 /* jQuery overrides                                                           */
 /*----------------------------------------------------------------------------*/

=== 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	2012-10-12 16:37:02 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-10-12 17:04:19 +0000
@@ -130,7 +130,7 @@
 
     #if( $hideMenu && $hideMenu == "true" )
     <style type="text/css">
-      #mainPage { margin-left: 28px; }
+      #mainPage { margin-left: 20px; }
     </style>
     #else
     <div id="leftBar">