dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16135
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6053: Green style extreme make-over
------------------------------------------------------------
revno: 6053
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-02-20 15:25:48 +0100
message:
Green style extreme make-over
removed:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/head.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_left.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_right.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/head.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_left.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_right.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/head.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_left.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_right.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/head.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_left.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_right.png
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/dom.js
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/logo_background.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_banner.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_separator.png
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/dom.js
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/logo_background.png
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/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/css/green/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/dom.js 2010-07-01 03:25:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/dom.js 2012-02-20 14:25:48 +0000
@@ -3,31 +3,27 @@
{
$( "li.menuDropDownItem" ).mouseover( function() // Over dropdown item
{
- $( this ).css( "background-color", "#5a845d" );
- $( this ).css( "border", "1px solid #D0D0D0" );
+ $( this ).css( "background-color", "#44b06a" );
});
$( "li.menuDropDownItem" ).mouseout( function() // Out dropdown item
{
- $( this ).css( "background-color", "#405f43" );
- $( this ).css( "border", "1px solid #405f43" );
+ $( this ).css( "background-color", "#278f43" );
});
$( "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/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2011-08-18 16:40:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2012-02-20 14:25:48 +0000
@@ -5,8 +5,8 @@
*
{
- font-family: arial, sans-serif;
- line-height: 125%;
+ font-family: LiberationSansRegular, arial;
+ line-height: 140%;
}
html,body
@@ -26,16 +26,40 @@
padding: 0px;
}
-.ui-widget {
+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 {
+.ui-widget .ui-widget
+{
font-size: 11px;
}
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button
+{
font-family: LiberationSansRegular, arial, sans-serif !important;
font-size: 11px;
}
@@ -48,170 +72,140 @@
{
background-image: url('logo_background.png');
background-repeat: repeat-x;
- height: 83px;
+ height: 46px;
position: absolute;
top: 0px;
- left: 10px;
- right: 10px;
-}
-
-img#header1
-{
- float: left;
-}
-
-img#header2
+ left: 0px;
+ right: 0px;
+}
+
+img#headerBanner
{
position: absolute;
- top: 13px;
- left: 25px;
-}
-
-img#header3
-{
- float: right;
+ 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;
+ font-family: LiberationSansRegular, arial;
+ font-size: 13px;
color: #ffffff;
- font-weight: bold;
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 #19211a;
+ border-right: 1px solid #1f6432;
+ border-bottom: 1px solid #1f6432;
+ border-left: 1px solid #1f6432;
padding-left: 5px;
padding-right: 5px;
width: 189px;
- background-color: #405f43;
+ background-color: #278f43;
display: none;
z-index: 10;
filter: alpha(opacity=90);
opacity: 0.90;
+ border-bottom-left-radius: 3px;
+ border-bottom-right-radius: 3px;
}
.menuDropDownBox
@@ -222,12 +216,12 @@
.menuDropDownItem
{
- padding-top: 5px;
+ padding-top: 6px;
padding-left: 10px;
padding-bottom: 5px;
padding-right: 10px;
- border: 1px solid #405f43;
cursor: pointer;
+ border-radius: 3px;
}
/*----------------------------------------------------------------------------*/
@@ -236,18 +230,19 @@
#leftBar
{
- background-color: #405f43;
- height: 472px;
- width: 250px;
+ background-color: #278f43;
+ height: 535px;
+ width: 235px;
float: left;
position: absolute;
- top: 85px;
- left: 10px;
- border-style: solid;
- border-width: 1px;
- border-color: #343a47;
+ top: 46px;
+ left: 0px;
+ padding-top: 6px;
+ border-right: 1px solid #1f6432;
+ border-bottom: 1px solid #1f6432;
filter: alpha(opacity=90);
opacity: 0.90;
+ border-bottom-right-radius: 5px;
}
#leftBarContents
@@ -259,23 +254,18 @@
#leftBarContents h2
{
font-size: 14px;
- margin-top: 16px;
- margin-right: 17px;
- margin-left: 17px;
- background-color: #5c8760;
- padding-top: 6px;
- padding-bottom: 5px;
- padding-left: 10px;
+ background-color: #44b06a;
+ margin: 16px 15px 0px 15px;
+ padding: 5px 0px 4px 10px;
color: white;
- border-style: solid;
- border-width: 1px;
- border-color: #D0D0D0;
+ font-weight: normal;
+ border-radius: 3px;
}
#leftBarContents ul
{
- margin-left: 40px;
- list-style-type: square;
+ margin-left: 26px;
+ list-style-type: none;
color: white;
}
@@ -287,7 +277,7 @@
#leftBarContents a:hover
{
- color: #cdd9ce;
+ color: #acc8de;
}
/*----------------------------------------------------------------------------*/
@@ -351,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
@@ -388,7 +380,7 @@
.listTable td
{
- padding: 2px;
+ padding: 2px 2px 2px 5px;
}
.listRow
@@ -409,7 +401,7 @@
.bold, .bold td
{
- font-weight: bold;
+ font-family: LiberationSansBold, arial;
}
/*----------------------------------------------------------------------------*/
@@ -427,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;
+}
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/head.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/head.png 2010-11-29 16:55:31 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/head.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_background.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/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/green/logo_background.png 2012-02-20 14:25:48 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_banner.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/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/green/logo_banner.png 2012-02-20 14:25:48 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_left.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_left.png 2009-07-07 18:12:59 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_left.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_right.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_right.png 2009-07-07 18:12:59 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_right.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_separator.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/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/green/logo_separator.png 2012-02-20 14:25:48 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/head.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/head.png 2010-11-29 16:55:31 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/head.png 1970-01-01 00:00:00 +0000 differ
=== 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 2012-02-13 12:30:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2012-02-20 14:25:48 +0000
@@ -79,23 +79,13 @@
right: 0px;
}
-img#header1
-{
- float: left;
-}
-
-img#header2
+img#headerBanner
{
position: absolute;
top: 5px;
left: 59px;
}
-img#header3
-{
- float: right;
-}
-
img#menuSeparator1
{
position: absolute;
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_left.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_left.png 2012-02-13 12:30:11 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_left.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_right.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_right.png 2012-02-13 12:30:11 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_right.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/dom.js 2011-04-26 11:04:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/dom.js 2012-02-20 14:25:48 +0000
@@ -4,25 +4,21 @@
$( "li.menuDropDownItem" ).mouseover( function() // Over dropdown item
{
$( this ).css( "background-color", "#4A89BA" );
- $( this ).css( "border", "1px solid #4A89BA" );
});
$( "li.menuDropDownItem" ).mouseout( function() // Out dropdown item
{
$( this ).css( "background-color", "#2a5a8a" );
- $( this ).css( "border", "1px solid #2a5a8a" );
});
$( "li.introItem" ).mouseover( function() // Over intro item
{
$( this ).css( "background-color", "#a4d2a3" );
- $( this ).css( "border", "1px solid #a4d2a3" );
});
$( "li.introItem" ).mouseout( function() // Out intro item
{
$( this ).css( "background-color", "#d5efd5" );
- $( this ).css( "border", "1px solid #d5efd5" );
});
});
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/head.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/head.png 2011-02-26 22:07:25 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/head.png 1970-01-01 00:00:00 +0000 differ
=== 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 2011-09-13 13:19:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2012-02-20 14:25:48 +0000
@@ -79,23 +79,13 @@
right: 0px;
}
-img#header1
-{
- float: left;
-}
-
-img#header2
+img#headerBanner
{
position: absolute;
top: 5px;
left: 59px;
}
-img#header3
-{
- float: right;
-}
-
img#menuSeparator1
{
position: absolute;
@@ -178,27 +168,6 @@
font-size: 16px;
}
-div#popupHeader
-{
- background-color: #1d5288;
- height: 34px;
- width: 100%;
- position: absolute;
- top: 0px;
- left: 0px;
- border-bottom: 1px solid #202020;
-}
-
-span#popupHeaderText
-{
- position: absolute;
- top: 3px;
- left: 218px;
- font-size: 14px;
- color: white;
- margin: 5px;
-}
-
div#menuDropDown1
{
position: absolute;
@@ -237,8 +206,6 @@
opacity: 0.90;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
- -moz-border-radius-bottomleft: 3px; /* Firefox */
- -moz-border-radius-bottomright: 3px; /* Firefox */
}
.menuDropDownBox
@@ -249,14 +216,12 @@
.menuDropDownItem
{
- padding-top: 5px;
+ padding-top: 6px;
padding-left: 10px;
- padding-bottom: 4px;
+ padding-bottom: 5px;
padding-right: 10px;
- border: 1px solid #2a5a8a;
cursor: pointer;
border-radius: 3px;
- -moz-border-radius: 3px; /* Firefox */
}
/*----------------------------------------------------------------------------*/
@@ -278,7 +243,6 @@
filter: alpha(opacity=90);
opacity: 0.90;
border-bottom-right-radius: 5px;
- -moz-border-radius-bottomright: 5px; /* Firefox */
}
#leftBarContents
@@ -292,14 +256,10 @@
font-size: 14px;
background-color: #4a89ba;
margin: 16px 15px 0px 15px;
- padding: 4px 0px 3px 10px;
+ padding: 5px 0px 4px 10px;
color: white;
- border-style: solid;
- border-width: 1px;
- border-color: #4a89ba;
font-weight: normal;
border-radius: 3px;
- -moz-border-radius: 3px; /* Firefox */
}
#leftBarContents ul
@@ -460,16 +420,13 @@
padding-left: 5px;
padding-right: 5px;
border-radius: 5px;
- -moz-border-radius: 5px; /* Firefox */
}
-
+
.introItem
{
padding: 12px;
cursor: pointer;
- border: 1px solid #d5efd5;
border-radius: 3px;
- -moz-border-radius: 3px; /* Firefox */
}
.introItemHeader
=== 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 2011-04-26 13:11:49 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png 2012-02-20 14:25:48 +0000 differ
=== removed 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 2011-04-26 13:11:49 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_left.png 1970-01-01 00:00:00 +0000 differ
=== removed 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 2011-04-26 13:11:49 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_right.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/head.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/head.png 2010-11-29 16:55:31 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/head.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_left.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_left.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_left.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_right.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_right.png 2009-07-07 18:41:01 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_right.png 1970-01-01 00:00:00 +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 2011-08-18 16:40:36 +0000
+++ 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
@@ -41,23 +41,13 @@
right: 10px;
}
-img#header1
-{
- float: left;
-}
-
-img#header2
+img#headerBanner
{
position: absolute;
top: 13px;
left: 25px;
}
-img#header3
-{
- float: right;
-}
-
img#menuSeparator1
{
position: absolute;
=== 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-02-17 05:01:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2012-02-20 14:25:48 +0000
@@ -103,10 +103,8 @@
#parse( "macros.vm" )
<div id="header">
- <img id="header1" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_left.png">
- <img id="header2" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png"#if( $startModule ) onclick="window.location.href='../${startModule}/index.action'" style="cursor:pointer"#end>
- <img id="header3" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_right.png">
-
+ <img id="headerBanner" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png"#if( $startModule ) onclick="window.location.href='../${startModule}/index.action'" style="cursor:pointer"#end>
+
<img id="menuSeparator1" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
<img id="menuSeparator2" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
<img id="menuSeparator3" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
