dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 22088
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2016-03-01 12:12:47 +0100
message:
  Dashboard css fix.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.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/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2016-01-12 13:06:50 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2016-03-01 11:12:47 +0000
@@ -17,7 +17,7 @@
     <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/calendars/css/jquery.calendars.picker.css?_rev=$!{buildRevision}" />
 	<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/select2/select2.css?_rev=$!{buildRevision}" />
     #foreach ( $style in $stylesheets )
-    <link type="text/css" rel="stylesheet" href="${style}?_rev=$!{buildRevision}">
+    <link type="text/css" rel="stylesheet" media="screen" href="${style}?_rev=$!{buildRevision}" />
     #end
     <link type="text/css" rel="stylesheet" href="../api/files/style?_rev=$!{buildRevision}" />
     <link rel="shortcut icon" href="../favicon.ico" />

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2016-02-25 15:51:22 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2016-03-01 11:12:47 +0000
@@ -713,14 +713,14 @@
 /* Map plugin (Leaflet) specific z-index overrides                            */
 /*----------------------------------------------------------------------------*/
 
+/* dhis2 theme css */
+#header
+{
+  z-index: 1100;
+}
+
 /* jQuery ui css */
-.ui-front {
-{
-  z-index: 1100;
-}
-
-/* dhis2 theme css */
-#header {
-{
-  z-index: 1100;
+.ui-front
+{
+  z-index: 1101;
 }