← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11300: Made header and left bar fixed

 

------------------------------------------------------------
revno: 11300
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-07-01 21:06:27 +0200
message:
  Made header and left bar fixed
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/dhis-web-commons/css/widgets.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.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-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 14:54:40 +0000
+++ 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
@@ -56,7 +56,8 @@
 {
   background-color: #467e4a;
   height: 44px;
-  position: absolute;
+  position: fixed;
+  z-index: 10;
   top: 0px;
   left: 0px;
   right: 0px;
@@ -208,7 +209,7 @@
 {
   height: 580px;
   width: 235px;
-  position: absolute;
+  position: fixed;
   top: 46px;
   left: 0px;
   padding-top: 6px;
@@ -394,7 +395,6 @@
 
 .introList
 {
-  display: none;
   list-style-type:none;
   width: 465px;
   padding-top: 10px;

=== 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 14:54:40 +0000
+++ 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
@@ -56,7 +56,8 @@
 {
   background-color: #ea5911;
   height: 44px;
-  position: absolute;
+  position: fixed;
+  z-index: 10;
   top: 0px;
   left: 0px;
   right: 0px;
@@ -209,7 +210,7 @@
   background-color: #518a0f;
   height: 535px;
   width: 235px;
-  position: absolute;
+  position: fixed;
   top: 44px;
   left: 0px;
   padding-top: 6px;
@@ -392,7 +393,6 @@
 
 .introList
 {
-  display: none;
   list-style-type:none;
   width: 450px;
   background-color: #d5efd5;

=== 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 14:54:40 +0000
+++ 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
@@ -56,7 +56,8 @@
 {
   background-color: #276696;
   height: 44px;
-  position: absolute;
+  position: fixed;
+  z-index: 10;
   top: 0px;
   left: 0px;
   right: 0px;
@@ -208,7 +209,7 @@
 {
   height: 580px;
   width: 235px;
-  position: absolute;
+  position: fixed;
   top: 46px;
   left: 0px;
   padding-top: 6px;
@@ -389,7 +390,6 @@
 
 .introList
 {
-  display: none;
   list-style-type:none;
   width: 465px;
   padding-top: 10px;

=== 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 14:54:40 +0000
+++ 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
@@ -56,7 +56,8 @@
 {
   background-color: #b40303;
   height: 44px;
-  position: absolute;
+  position: fixed;
+  z-index: 10;
   top: 0px;
   left: 0px;
   right: 0px;
@@ -209,7 +210,7 @@
   background-color: #b91010;
   height: 535px;
   width: 235px;
-  position: absolute;
+  position: fixed;
   top: 44px;
   left: 0px;
   padding-top: 6px;
@@ -389,7 +390,6 @@
 
 .introList
 {
-  display: none;
   list-style-type:none;
   width: 450px;
   background-color: #d5efd5;

=== 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	2013-06-29 14:41:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2013-07-01 19:06:27 +0000
@@ -1,15 +1,3 @@
-/*----------------------------------------------------------------------------*/
-/* Search button for orgunit                                                  */
-/*----------------------------------------------------------------------------*/
-
-.searchOrgunit
-{
-  display: none; 
-  position: absolute;
-  width: 200px;
-  margin-left: 22px;
-  z-index: 9999;
-}
 
 /*----------------------------------------------------------------------------*/
 /* Right bar                                                                  */
@@ -22,7 +10,7 @@
   height: 454px;
   width: 300px;
   float: right;
-  position: absolute;
+  position: fixed;
   top: 85px;
   right: 10px;
   border: 1px solid #a4d2a3;
@@ -159,7 +147,7 @@
 #showLeftBar
 {
   display: none;
-  position: fixed;
+  position: absolute;
   left: 23px;
   top: 53px;
   font-family: LiberationSansBold, arial;
@@ -455,7 +443,6 @@
 
 div.inputCriteria
 {
-  position: relative;
   border: 1px solid #a4d2a3;
   background-color: #d5efd5;
   padding-top: 10px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2013-06-29 13:03:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2013-07-01 19:06:27 +0000
@@ -66,10 +66,6 @@
 	{
 		hideDropDownTimeout();
 	} );
-	
-	// Intro fade in
-	
-	$( ".introList" ).fadeIn();
 }
 
 function setTableStyles()