[embjopr-commits] EMBJOPR SVN: r784 - in branches/EmbJopr_1_3_1_GA_CP/core/src/main/webapp: css and 1 other directory.
Author: lkrejci
Date: 2009-10-14 04:03:14 -0400 (Wed, 14 Oct 2009)
New Revision: 784
Modified:
branches/EmbJopr_1_3_1_GA_CP/core/src/main/webapp/WEB-INF/facelets/layout.xhtml
branches/EmbJopr_1_3_1_GA_CP/core/src/main/webapp/css/console-style.css
Log:
Merging revision 782 (IE7 rendering fixes, EMBJOPR-250 and EMBJOPR-251) into
EmbJopr_1_3_1_GA_CP branch.
Modified: branches/EmbJopr_1_3_1_GA_CP/core/src/main/webapp/WEB-INF/facelets/layout.xhtml
===================================================================
---
branches/EmbJopr_1_3_1_GA_CP/core/src/main/webapp/WEB-INF/facelets/layout.xhtml 2009-10-13
21:44:10 UTC (rev 783)
+++
branches/EmbJopr_1_3_1_GA_CP/core/src/main/webapp/WEB-INF/facelets/layout.xhtml 2009-10-14
08:03:14 UTC (rev 784)
@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!--
~ Jopr Management Platform
~ Copyright (C) 2005-2009 Red Hat, Inc.
@@ -20,9 +21,6 @@
~ if not, write to the Free Software Foundation, Inc.,
~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
lang="en"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
Modified: branches/EmbJopr_1_3_1_GA_CP/core/src/main/webapp/css/console-style.css
===================================================================
--- branches/EmbJopr_1_3_1_GA_CP/core/src/main/webapp/css/console-style.css 2009-10-13
21:44:10 UTC (rev 783)
+++ branches/EmbJopr_1_3_1_GA_CP/core/src/main/webapp/css/console-style.css 2009-10-14
08:03:14 UTC (rev 784)
@@ -22,6 +22,7 @@
html {
margin: 0;
padding: 0;
+ overflow: auto;
}
body {
@@ -63,10 +64,12 @@
}
#content {
- margin-top: 46px;
- margin-left: 20em;
- margin-right: 0;
- margin-bottom: 20px;
+ position: absolute;
+ top: 46px;
+ left: 300px;
+ right: 0;
+ bottom: 31px;
+ overflow: auto;
padding: 1em;
background: #FFFFFF;
}
@@ -76,7 +79,7 @@
top: 46px;
bottom: 31px; /* Operas 5 + 6 shouldn't see this property */
left: 0;
- width: 20em;
+ width: 300px;
overflow: auto;
background: #eff2f4;
border-right: 1px solid #dee6ee;