dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6055
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-02-20 15:49:55 +0100
message:
  Vietnam style extreme make-over
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/dom.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_background.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_banner.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_separator.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.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/dhis-web-commons/css/vietnam/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/dom.js	2010-07-01 03:25:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/dom.js	2012-02-20 14:49:55 +0000
@@ -3,31 +3,27 @@
 {        
   $( "li.menuDropDownItem" ).mouseover( function() // Over dropdown item
   {
-    $( this ).css( "background-color", "#942d32" );
-    $( this ).css( "border", "1px solid #d0d0d0" );
+    $( this ).css( "background-color", "#cf4343" );
   });
   
   $( "li.menuDropDownItem" ).mouseout( function() // Out dropdown item
   {
-    $( this ).css( "background-color", "#7B0A0F" );
-    $( this ).css( "border", "1px solid #7B0A0F" );
+    $( this ).css( "background-color", "#b91010" );
   });
   
   $( "li.introItem" ).mouseover( function() // Over intro item
   {
     $( this ).css( "background-color", "#a4d2a3" );
-    $( this ).css( "border", "1px solid #ffffff" );
   });
   
   $( "li.introItem" ).mouseout( function() // Out intro item
   {
     $( this ).css( "background-color", "#d5efd5" );
-    $( this ).css( "border", "1px solid #d5efd5" );
   });
 });
 
 // Called from main/Leftbar
 function setMainPageNormal()
 {
-	document.getElementById( 'mainPage' ).style.marginLeft = '300px';
+	document.getElementById( 'mainPage' ).style.marginLeft = '270px';
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_background.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_background.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_background.png	2012-02-20 14:49:55 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_banner.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_banner.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_banner.png	2012-02-20 14:49:55 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_separator.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_separator.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_separator.png	2012-02-20 14:49:55 +0000 differ
=== 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	2012-02-20 14:25:48 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2012-02-20 14:49:55 +0000
@@ -5,8 +5,8 @@
 
 * 
 {
-  font-family: arial, sans-serif;
-  line-height: 125%;
+  font-family: LiberationSansRegular, arial;
+  line-height: 140%;
 }
 
 html,body 
@@ -26,6 +26,44 @@
   padding: 0px;
 }
 
+a
+{
+  text-decoration: none;
+  color: #3b73b8;
+}
+
+select
+{
+  padding: 1px;
+}
+
+a:hover
+{
+  text-decoration:underline;
+}
+
+a:visited
+{
+  color:#3b73b8;
+}
+
+.ui-widget 
+{
+	font-family: LiberationSansRegular, arial, sans-serif !important;
+	font-size: 11px;
+}
+
+.ui-widget .ui-widget 
+{
+	font-size: 11px;
+}
+
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button 
+{
+	font-family: LiberationSansRegular, arial, sans-serif !important;
+	font-size: 11px;
+}
+
 /*----------------------------------------------------------------------------*/
 /* Header                                                                     */
 /*----------------------------------------------------------------------------*/
@@ -34,173 +72,156 @@
 {
   background-image: url('logo_background.png');
   background-repeat: repeat-x;
-  height: 83px;
+  height: 46px;
   position: absolute;
   top: 0px;
-  left: 10px;
-  right: 10px;
+  left: 0px;
+  right: 0px;
 }
 
 img#headerBanner
 {
   position: absolute;
-  top: 13px;
-  left: 25px;
+  top: 5px;
+  left: 59px;
 }
 
 img#menuSeparator1
 {
   position: absolute;
   top: 0px;
-  left: 570px;
+  left: 580px;
 }
 
 img#menuSeparator2
 {
   position: absolute;
   top: 0px;
-  left: 670px;
+  left: 680px;
 }
 
 img#menuSeparator3
 {
   position: absolute;
   top: 0px;
-  left: 770px;
+  left: 780px;
 }
 
 img#menuSeparator4
 {
   position: absolute;
   top: 0px;
-  left: 870px;
+  left: 880px;
 }
 
 img#menuSeparator5
 {
   position: absolute;
   top: 0px;
-  left: 970px;
+  left: 980px;
 }
 
 .menuLink
 {
-  height: 68px;
+  height: 47px;
   width: 98px;
-  font-size: 12px;
-  color: #ffff00;
-  font-weight: bold;
+  font-family: LiberationSansRegular, arial;
+  font-size: 13px;
+  color: #ffffff;
   text-align: center;
-  line-height: 67px;
+  line-height: 45px;
   cursor: pointer;
 }
 
 div#menuLink1
 {
   position: absolute;
-  top: 7px;
-  left: 572px;
+  left: 582px;
 }
 
 div#menuLink2
 {
   position: absolute;
-  top: 7px;
-  left: 672px;
+  left: 682px;
 }
 
 div#menuLink3
 {
   position: absolute;
-  top: 7px;
-  left: 772px;
+  left: 782px;
 }
 
 div#menuLink4
 {
   position: absolute;
-  top: 7px;
-  left: 872px;
+  left: 882px;
 }
 
 span#headerText
 {
   position: absolute;
-  top: 30px;
-  left: 228px;
+  top: 13px;
+  left: 253px;
+  font-family: LiberationSansBold, arial;
   font-weight: lighter;
   color: white;
-  font-size: 13pt;
-}
-
-div#popupHeader 
-{
-  background-color: #425073;
-  height: 34px;
-  width: 100%;
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  border-bottom: 1px solid #202020;
-}
-
-span#popupHeaderText
-{
-  position: absolute;
-  top: 3px;
-  left: 30px;
-  font-size: 14px;
-  color: white;
-  margin: 5px;
+  font-size: 16px;
 }
 
 div#menuDropDown1
 {
   position: absolute;
-  top: 76px;
-  left: 570px;
+  top: 46px;
+  left: 580px;
 }
 
 div#menuDropDown2
 {
   position: absolute;
-  top: 76px;
-  left: 670px;
+  top: 46px;
+  left: 680px;
 }
 
 div#menuDropDown3
 {
   position: absolute;
-  top: 76px;
-  left: 770px;
+  top: 46px;
+  left: 780px;
 }
 
 .menuDropDownArea
 {
   font-size: 12px;
   color: #ffffff;
-  border: 1px solid #282c35;
+  border-right: 1px solid #282c35;
+  border-bottom: 1px solid #282c35;
+  border-left: 1px solid #282c35;
   padding-left: 5px;
   padding-right: 5px;
   width: 189px;
-  background-color: #7B0A0F;
+  background-color: #b91010;
   display: none;
   z-index: 10;
+  filter: alpha(opacity=90);
+  opacity: 0.90;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 
 .menuDropDownBox
 {
   list-style-type:none;
+  margin-left: 0;
 }
 
 .menuDropDownItem
 {
-  padding-top: 5px;
+  padding-top: 6px;
   padding-left: 10px;
   padding-bottom: 5px;
   padding-right: 10px;
-  border: 1px solid #7B0A0F;
   cursor: pointer;
+  border-radius: 3px;
 }
 
 /*----------------------------------------------------------------------------*/
@@ -209,16 +230,19 @@
 
 #leftBar
 {
-  background-color: #7B0A0F;
-  height: 100%;
-  width: 250px;
+  background-color: #b91010;
+  height: 535px;
+  width: 235px;
   float: left;
   position: absolute;
-  top: 85px;
-  left: 10px;
-  border-style: solid;
-  border-width: 1px;
-  border-color: #606060;
+  top: 46px;
+  left: 0px;
+  padding-top: 6px;
+  border-right: 1px solid #10375f;
+  border-bottom: 1px solid #10375f;
+  filter: alpha(opacity=90);
+  opacity: 0.90;
+  border-bottom-right-radius: 5px;
 }
 
 #leftBarContents
@@ -230,23 +254,18 @@
 #leftBarContents h2
 {
   font-size: 14px;
-  margin-top: 16px;
-  margin-right: 17px;
-  margin-left: 17px;
-  background-color: #942d32;
-  padding-top: 6px;
-  padding-bottom: 5px;
-  padding-left: 10px;
-  color: #ffff00;
-  border-style: solid;
-  border-width: 1px;
-  border-color: #d0d0d0;
+  background-color: #cf4343;
+  margin: 16px 15px 0px 15px;
+  padding: 5px 0px 4px 10px;
+  color: white;
+  font-weight: normal;
+  border-radius: 3px;
 }
 
 #leftBarContents ul
 {
-  margin-left: 40px;
-  list-style-type: square;
+  margin-left: 26px;
+  list-style-type: none;
   color: white;
 }
 
@@ -258,7 +277,7 @@
 
 #leftBarContents a:hover
 {
-  color: #ffff00;
+  color: #acc8de;
 }
 
 /*----------------------------------------------------------------------------*/
@@ -322,22 +341,24 @@
   font-size: 9pt;
 }
 
-.page th, thead tr
+.page th, thead tr, .tabHead
 {
-  background-image: url('head.png');
+  background-color: #cbddeb;
   background-repeat: repeat-x;
   text-align: left;
-  color: #3f5d8e;
+  color: #39547d;
+  padding:3px 0px 2px 6px;
   border-style: solid;
   border-width: 1px;
-  border-color: #99bbe8;
-  padding-left: 7px;
-  height: 19px;
+  border-color: #c8dbea;
+  font-family: LiberationSansBold, arial;
+  font-size: 13px;
+  font-weight: normal;
 }
 
 #mainPage 
 {
-  margin: 102px 10px 10px 300px;
+  margin: 69px 10px 10px 270px;
 }
 
 #popupPage 
@@ -359,7 +380,7 @@
 
 .listTable td
 {
-  padding: 2px;
+  padding: 2px 2px 2px 5px;
 }
 
 .listRow
@@ -380,7 +401,7 @@
 
 .bold, .bold td
 {
-  font-weight: bold;
+  font-family: LiberationSansBold, arial;
 }
 
 /*----------------------------------------------------------------------------*/
@@ -398,22 +419,54 @@
   padding-bottom: 20px;
   padding-left: 5px;
   padding-right: 5px;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
+  border-radius: 5px;
 }
-	
+
 .introItem
 {
-  padding: 15px;
+  padding: 12px;
   cursor: pointer;
-  border: 1px solid #d5efd5;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
+  border-radius: 3px;
 }
 
 .introItemHeader
 {
+  font-family: LiberationSansBold, arial;
   color: #3c533c;
-  font-weight: bold;
-}
-
+  font-size: 13px;
+}
+
+/*----------------------------------------------------------------------------*/
+/* jQuery overrides                                                           */
+/*----------------------------------------------------------------------------*/
+
+.ui-datepicker th {
+  padding: 0.5em 0;
+  font-size: 11px;
+}
+
+/*----------------------------------------------------------------------------*/
+/* @font-face                                                                 */
+/*----------------------------------------------------------------------------*/
+
+@font-face {
+    font-family: 'LiberationSansRegular';
+    src: url('../../fonts/LiberationSans-Regular-webfont.eot');
+    src: url('../../fonts/LiberationSans-Regular-webfont.eot?#iefix') format('eot'),
+         url('../../fonts/LiberationSans-Regular-webfont.woff') format('woff'),
+         url('../../fonts/LiberationSans-Regular-webfont.ttf') format('truetype'),
+         url('../../fonts/LiberationSans-Regular-webfont.svg#webfontc8rbNdBe') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'LiberationSansBold';
+    src: url('../../fonts/LiberationSans-Bold-webfont.eot');
+    src: url('../../fonts/LiberationSans-Bold-webfont.eot?#iefix') format('eot'),
+         url('../../fonts/LiberationSans-Bold-webfont.woff') format('woff'),
+         url('../../fonts/LiberationSans-Bold-webfont.ttf') format('truetype'),
+         url('../../fonts/LiberationSans-Bold-webfont.svg#webfontHyWb8e07') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}