Author: alexsmirnov Date: 2009-05-06 17:48:34 -0400 (Wed, 06 May 2009) New Revision: 14044 Added: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts.xcss trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/page.xcss Modified: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss trunk/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx Log: https://jira.jboss.org/jira/browse/RF-7042 Added: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts.xcss =================================================================== --- trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts.xcss (rev 0) +++ trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts.xcss 2009-05-06 21:48:34 UTC (rev 14044) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<f:template xmlns:f='http:/jsf.exadel.com/template' + xmlns:u='http:/jsf.exadel.com/template/util' + xmlns="http://www.w3.org/1999/xhtml"> + +<u:selector name="body" > + <u:style name="font" value="13px/1.231 arial,helvetica,clean,sans-serif" /> + <u:style name="*font-size" value="small" /> /* for IE */ + <u:style name="*font" value="x-small" /> /* for IE in quirks mode */ +</u:selector> + +/** + * Nudge down to get to 13px equivalent for these form elements + */ +<u:selector name="select,input,button,textarea" > + <u:style name="font" value="99% arial,helvetica,clean,sans-serif" /> +</u:selector> + +/** + * To help tables remember to inherit + */ +<u:selector name="table" > + <u:style name="font-size" value="inherit" /> + <u:style name="font" value="100%" /> +</u:selector> + +/** + * Bump up IE to get to 13px equivalent for these fixed-width elements + */ +<u:selector name="pre,code,kbd,samp,tt"> + <u:style name="font-family" value="monospace" /> + <u:style name="*font-size" value="108%" /> + <u:style name="line-height" value="100%" /> +</u:selector> +</f:template> \ No newline at end of file Added: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/page.xcss =================================================================== --- trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/page.xcss (rev 0) +++ trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/page.xcss 2009-05-06 21:48:34 UTC (rev 14044) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<f:template xmlns:f='http:/jsf.exadel.com/template' + xmlns:u='http:/jsf.exadel.com/template/util' + xmlns="http://www.w3.org/1999/xhtml"> +<u:selector name=".rich-page-footer"> + <u:style name="clear" value="both" /> +</u:selector> +<u:selector name=".rich-page"> + <u:style name="margin" value="auto" /> + <u:style name="text-align" value="left" /> + <u:style name="min-width" value="750px" /> +</u:selector> +<u:selector name=".rich-page-sidebar"> + <u:style name="position" value="relative" /> +</u:selector> +<u:selector name=".rich-page-sidebar,.rich-page-body"> + <u:style name="_position" value="static" /> +</u:selector> +<u:selector name=".rich-page-body"> + <u:style name="position" value="static" /> +</u:selector> +<u:selector name=".rich-page-main "> + <u:style name="width" value="100%" /> +</u:selector> +<u:selector name=".rich-page-content:after"> + <u:style name="content" value="'.'" /> + <u:style name="display" value="block" /> + <u:style name="height" value="0" /> + <u:style name="clear" value="both" /> + <u:style name="visibility" value="hidden" /> +</u:selector> +<u:selector name=".rich-page-content"> + <u:style name="zoom" value="1" /> +</u:selector> +</f:template> \ No newline at end of file Modified: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss =================================================================== --- trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss 2009-05-06 21:47:59 UTC (rev 14043) +++ trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss 2009-05-06 21:48:34 UTC (rev 14044) @@ -43,13 +43,15 @@ </u:selector> <u:selector name=".rich-page-content"> - <!-- u:style name="background-image"> + <!-- + <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.images.PageContentGradient"/> - </u:style--> - <u:style name="min-height" value="200px" /> - <u:style name="background-color" skin="generalBackgroundColor"/> + <u:style name="min-height" value="200px" /> + </u:style> <u:style name="background-repeat" value="repeat-x"/> <u:style name="background-position" value="top left"/> + --> + <u:style name="background-color" skin="generalBackgroundColor"/> <u:style name="border" value="2px solid" /> <u:style name="border-color" skin="panelBorderColor" /> </u:selector> Modified: trunk/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx =================================================================== --- trunk/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-05-06 21:47:59 UTC (rev 14043) +++ trunk/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-05-06 21:48:34 UTC (rev 14044) @@ -11,7 +11,7 @@ baseclass="org.richfaces.renderkit.AbstractPageRenderer" component="org.richfaces.component.UIPage" - <h:styles>css/fonts.css,css/page.css</h:styles> + <h:styles>css/page.xcss</h:styles> <f:clientid var="clientId"/> <c:set var="namespace" value="#{this:prolog(context,component)}"/> <html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}"