=== 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 2010-06-21 06:48:31 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2010-06-30 18:44:56 +0000 @@ -34,7 +34,7 @@ { background-image: url('logo_background.png'); background-repeat: repeat-x; - height: 83px; + height: 71px; position: absolute; top: 0px; left: 0px; @@ -49,7 +49,7 @@ img#header2 { position: absolute; - top: 9px; + top: 7px; left: 35px; } @@ -95,13 +95,13 @@ .menuLink { - height: 68px; + height: 64px; width: 98px; font-size: 12px; color: #ffffff; font-weight: bold; text-align: center; - line-height: 59px; + line-height: 53px; cursor: pointer; } @@ -136,7 +136,7 @@ span#headerText { position: absolute; - top: 26px; + top: 24px; left: 228px; color: white; font-size: 17px; @@ -166,21 +166,21 @@ div#menuDropDown1 { position: absolute; - top: 76px; + top: 72px; left: 580px; } div#menuDropDown2 { position: absolute; - top: 76px; + top: 72px; left: 680px; } div#menuDropDown3 { position: absolute; - top: 76px; + top: 72px; left: 780px; } @@ -223,14 +223,14 @@ { background-color: #33669b; height: 472px; - width: 250px; + width: 235px; float: left; position: absolute; - top: 85px; - left: 10px; - border-style: solid; - border-width: 1px; - border-color: #10375f; + top: 79px; + left: 0px; + border-top: 1px solid #10375f; + border-right: 1px solid #10375f; + border-bottom: 1px solid #10375f; filter: alpha(opacity=90); opacity: 0.90; } @@ -245,8 +245,8 @@ { font-size: 14px; margin-top: 16px; - margin-right: 17px; - margin-left: 17px; + margin-right: 15px; + margin-left: 15px; background-color: #265687; padding-top: 5px; padding-bottom: 5px; @@ -260,8 +260,8 @@ #leftBarContents ul { - margin-left: 40px; - list-style-type: square; + margin-left: 26px; + list-style-type: none; color: white; } @@ -346,7 +346,7 @@ #mainPage { - margin: 102px 10px 10px 300px; + margin: 96px 10px 10px 270px; } #popupPage === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png 2010-06-19 15:46:22 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png 2010-06-30 18:44:56 +0000 differ === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_left.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_left.png 2010-06-19 15:46:22 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_left.png 2010-06-30 18:44:56 +0000 differ === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_right.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_right.png 2010-06-19 15:46:22 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_right.png 2010-06-30 18:44:56 +0000 differ === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/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/light_blue/logo_separator.png 2010-06-30 18:44:56 +0000 differ === 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 2010-05-25 04:08:37 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2010-06-30 18:44:56 +0000 @@ -102,7 +102,7 @@ display: none; position: fixed; left: 23px; - top: 56px; + top: 53px; font-size: 9pt; font-weight: bold; cursor: pointer; @@ -137,7 +137,7 @@ font-size: 9pt; /* <-- Size to change */ background-color: white; overflow: auto; - width: 248px; + width: 233px; height: 329px; border: 1px inset #FFFFFF; } @@ -157,7 +157,6 @@ { list-style-type: none; white-space: nowrap; /* Makes list items never wrap */ - margin-top: 0pt; margin-right: 0pt; margin-bottom: 0pt; @@ -165,7 +164,7 @@ padding-top: 1px; padding-right: 0pt; padding-bottom: 1px; - padding-left: 15px; + padding-left: 14px; background-color: transparent; background-image: url("../images/treeview-gray-line.gif"); background-repeat: no-repeat; @@ -694,31 +693,33 @@ div#ui-datepicker-div { - font-size:10pt; - z-index:99999999; + font-size:10pt; + z-index:99999999; } +/*----------------------------------------------------------------------------*/ +/* Sorting */ +/*----------------------------------------------------------------------------*/ + table thead tr .header { - background-image: url('../images/bg.gif'); + background-image: url('../images/bg.gif'); } - table thead tr .headerSortUp { - background-image: url('../images/asc.gif'); + background-image: url('../images/asc.gif'); } table thead tr .headerSortDown { - background-image: url('../images/desc.gif'); + background-image: url('../images/desc.gif'); } - table thead tr .headerSortUp, table thead tr .headerSortDown, table thead tr .header { - background-repeat:no-repeat; - background-position: center right; - cursor:pointer; + background-repeat:no-repeat; + background-position: center right; + cursor:pointer; } === 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 2010-06-29 00:24:10 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js 2010-06-30 18:44:56 +0000 @@ -159,7 +159,7 @@ this.showAnimated = function() { setMenuVisible(); - setMainPageLeftMargin( '300px' ); + setMainPageLeftMargin( '270px' ); $( 'div#leftBar' ).show( 'fast' ); $( 'span#showLeftBar' ).hide( 'fast' ); };