[richfaces-svn-commits] JBoss Rich Faces SVN: r12881 - in trunk/sandbox: ui/layout/src/main/java/org/richfaces/renderkit and 2 other directories.

Author: alexsmirnov Date: 2009-03-06 14:36:15 -0500 (Fri, 06 Mar 2009) New Revision: 12881 Added: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts-context.css trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids-context.css trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset-context.css Modified: trunk/sandbox/samples/layout-sample/src/main/webapp/pages/index.xhtml trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageBackgroundGradient.java trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageContentGradient.java trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts.css trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids.css trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset.css trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss Log: simple skin improvements Modified: trunk/sandbox/samples/layout-sample/src/main/webapp/pages/index.xhtml =================================================================== (Binary files differ) Modified: trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java =================================================================== --- trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-03-06 18:51:47 UTC (rev 12880) +++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-03-06 19:36:15 UTC (rev 12881) @@ -208,7 +208,7 @@ .append("em;"); ; format.append("*margin").append(position).append(":").append( - ieWidth + 1.05f).append("em;}\n"); + ieWidth + .975f).append("em;}\n"); writer.write(format.toString()); } Modified: trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageBackgroundGradient.java =================================================================== --- trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageBackgroundGradient.java 2009-03-06 18:51:47 UTC (rev 12880) +++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageBackgroundGradient.java 2009-03-06 19:36:15 UTC (rev 12881) @@ -12,6 +12,6 @@ public class PageBackgroundGradient extends BaseGradient { public PageBackgroundGradient() { - super(1, 250, 130, false); + super(1, 350, 300,"shadowBackgroundColor","additionalBackgroundColor", false); } } Modified: trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageContentGradient.java =================================================================== --- trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageContentGradient.java 2009-03-06 18:51:47 UTC (rev 12880) +++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageContentGradient.java 2009-03-06 19:36:15 UTC (rev 12881) @@ -12,6 +12,6 @@ public class PageContentGradient extends BaseGradient { public PageContentGradient() { - super(1, 250, 130, false); + super(1, 250, 230,"headerGradientColor","generalBackgroundColor", false); } } Added: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts-context.css =================================================================== --- trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts-context.css (rev 0) +++ trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts-context.css 2009-03-06 19:36:15 UTC (rev 12881) @@ -0,0 +1,46 @@ +/* +Copyright (c) 2008, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 3.0.0pr2 +*/ +/** + * Percents could work for IE, but for backCompat purposes, we are using keywords. + * x-small is for IE6/7 quirks mode. + */ +.yui-cssfonts body, .yui-cssfonts { + font:13px/1.231 arial,helvetica,clean,sans-serif; + *font-size:small; /* for IE */ + *font:x-small; /* for IE in quirks mode */ +} + +/** + * Nudge down to get to 13px equivalent for these form elements + */ +.yui-cssfonts select, +.yui-cssfonts input, +.yui-cssfonts button, +.yui-cssfonts textarea { + font:99% arial,helvetica,clean,sans-serif; +} + +/** + * To help tables remember to inherit + */ +.yui-cssfonts table { + font-size:inherit; + font:100%; +} + +/** + * Bump up IE to get to 13px equivalent for these fixed-width elements + */ +.yui-cssfonts pre, +.yui-cssfonts code, +.yui-cssfonts kbd, +.yui-cssfonts samp, +.yui-cssfonts tt { + font-family:monospace; + *font-size:108%; + line-height:100%; +} \ No newline at end of file Property changes on: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts-context.css ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts.css =================================================================== --- trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts.css 2009-03-06 18:51:47 UTC (rev 12880) +++ trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/fonts.css 2009-03-06 19:36:15 UTC (rev 12881) @@ -2,27 +2,45 @@ Copyright (c) 2008, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.txt -version: 2.5.2 -*/ /** +version: 3.0.0pr2 +*/ +/** * Percents could work for IE, but for backCompat purposes, we are using keywords. * x-small is for IE6/7 quirks mode. */ body { - font: 13px/ 1.231 arial, helvetica, clean, sans-serif; * - font-size: small; * - font: x-small; + font:13px/1.231 arial,helvetica,clean,sans-serif; + *font-size:small; /* for IE */ + *font:x-small; /* for IE in quirks mode */ } +/** + * Nudge down to get to 13px equivalent for these form elements + */ +select, +input, +button, +textarea { + font:99% arial,helvetica,clean,sans-serif; +} + +/** + * To help tables remember to inherit + */ table { - font-size: inherit; - font: 100%; + font-size:inherit; + font:100%; } /** - * Bump up IE to get to 13px equivalent + * Bump up IE to get to 13px equivalent for these fixed-width elements */ -pre,code,kbd,samp,tt { - font-family: monospace; * - font-size: 108%; - line-height: 100%; +pre, +code, +kbd, +samp, +tt { + font-family:monospace; + *font-size:108%; + line-height:100%; } \ No newline at end of file Added: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids-context.css =================================================================== --- trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids-context.css (rev 0) +++ trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids-context.css 2009-03-06 19:36:15 UTC (rev 12881) @@ -0,0 +1,490 @@ +/* +Copyright (c) 2008, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 3.0.0pr2 +*/ +/* +* +* The YUI CSS Foundation uses the *property and _property CSS filter +* techniques to shield a value from A-grade browsers [1] other than +* IE6 & IE7 (*property) and IE6 (_property) +* +/ +Section: General Rules +*/ +.yui-cssgrids body { + /* center the page */ + text-align: center; + margin-left: auto; + margin-right: auto; +} +/* +Section: Page Width Rules (#doc, #doc2, #doc3, #doc4) +*/ +/* +Subsection: General +*/ +.yui-cssgrids .yui-d0, /* 100% */ +.yui-cssgrids .yui-d1, /* 750px */ +.yui-cssgrids .yui-d1f, /* 750px fixed */ +.yui-cssgrids .yui-d2, /* 950px */ +.yui-cssgrids .yui-d2f, /* 950px fixed */ +.yui-cssgrids .yui-d3, /* 974px */ +.yui-cssgrids .yui-d3f { /* 974px fixed */ + margin: auto; + text-align: left; + width: 57.69em; + *width: 56.25em; /* doc1*/ +} + +.yui-cssgrids .yui-t1, +.yui-cssgrids .yui-t2, +.yui-cssgrids .yui-t3, +.yui-cssgrids .yui-t4, +.yui-cssgrids .yui-t5, +.yui-cssgrids .yui-t6 { + margin: auto; + text-align: left; + width: 100%; +} + +/* +Subsection: 100% (doc) +*/ +.yui-cssgrids .yui-d0 { + /* Left and Right margins are not a structural part of Grids. Without them Grids + works fine, but content bleeds to the very edge of the document, which often + impairs readability and usability. They are + provided because they prevent the content from "bleeding" into the browser's chrome.*/ + margin: auto 10px; + width: auto; +} +.yui-cssgrids .yui-d0f { + width: 100%; +} + +/* +Subsection: 950 Centered (doc2) +*/ +.yui-cssgrids .yui-d2 { + width: 73.076em; + *width: 71.25em; +} +.yui-cssgrids .yui-d2f { + width: 950px; +} +/* +Subsection: 974 Centered (doc3) +*/ +.yui-cssgrids .yui-d3 { + width: 74.923em; + *width: 73.05em; +} +.yui-cssgrids .yui-d3f { + width: 974px; +} +/* +Section: Preset Template Rules (.yui-t[1-6]) +*/ +/* +Subsection: General +*/ + +/* to preserve source-order independence for Gecko without breaking IE */ +.yui-cssgrids .yui-b { + position: relative; +} +.yui-cssgrids .yui-b { + _position: static; +} +.yui-cssgrids .yui-main .yui-b { + position: static; +} +.yui-cssgrids .yui-main { + width: 100%; +} +.yui-cssgrids .yui-t1 .yui-main, +.yui-cssgrids .yui-t2 .yui-main, +.yui-cssgrids .yui-t3 .yui-main { + float: right; + /* IE: preserve layout at narrow widths */ + margin-left: -25em; +} +.yui-cssgrids .yui-t4 .yui-main, +.yui-cssgrids .yui-t5 .yui-main, +.yui-cssgrids .yui-t6 .yui-main { + float: left; + /* IE: preserve layout at narrow widths */ + margin-right: -25em; +} + +/* Subsection: For Specific Template Presets */ + +/** +* Nudge down to get to 13px equivalent for these form elements +*/ + +/* +TODO Create t1-6's that are based on fixed widths +*/ +/* t1 narrow block = left, equivalent of 160px */ +.yui-cssgrids .yui-t1 .yui-b { + float: left; + width: 12.30769em; + *width: 12.00em; +} +.yui-cssgrids .yui-t1 .yui-main .yui-b { + margin-left: 13.30769em; + *margin-left:12.975em; +} +/* t2 narrow block = left, equivalent of 180px */ +.yui-cssgrids .yui-t2 .yui-b { + float: left; + width: 13.84615em; + *width: 13.50em; +} +.yui-cssgrids .yui-t2 .yui-main .yui-b { + margin-left: 14.84615em; + *margin-left: 14.475em; +} +/* t3 narrow block = left, equivalent of 300px */ +.yui-cssgrids .yui-t3 .yui-b { + float: left; + width: 23.0769em; + *width: 22.50em; +} +.yui-cssgrids .yui-t3 .yui-main .yui-b { + margin-left: 24.0769em; + *margin-left: 23.475em; +} +/* t4 narrow block = right, equivalent of 180px */ +.yui-cssgrids .yui-t4 .yui-b { + float: right; + width: 13.8456em; + *width: 13.50em; +} +.yui-cssgrids .yui-t4 .yui-main .yui-b { + margin-right: 14.8456em; + *margin-right: 14.475em; +} +/* t5 narrow block = right, equivalent of 240px */ +.yui-cssgrids .yui-t5 .yui-b { + float: right; + width: 18.4615em; + *width: 18.00em; +} +.yui-cssgrids .yui-t5 .yui-main .yui-b { + margin-right: 19.4615em; + *margin-right: 18.975em; +} +/* t6 narrow block = equivalent of 300px */ +.yui-cssgrids .yui-t6 .yui-b { + float: right; + width: 23.0769em; + *width: 22.50em; +} +.yui-cssgrids .yui-t6 .yui-main .yui-b { + margin-right: 24.0769em; + *margin-right: 23.475em; +} + +.yui-cssgrids .yui-main .yui-b { + float: none; + width: auto; +} + +/* +Section: Grids and Nesting Grids +*/ + +/* +Subsection: Children generally take half the available space +*/ + +.yui-cssgrids .yui-gb .yui-u, +.yui-cssgrids .yui-g .yui-gb .yui-u, +.yui-cssgrids .yui-gb .yui-g, +.yui-cssgrids .yui-gb .yui-gb, +.yui-cssgrids .yui-gb .yui-gc, +.yui-cssgrids .yui-gb .yui-gd, +.yui-cssgrids .yui-gb .yui-ge, +.yui-cssgrids .yui-gb .yui-gf, +.yui-cssgrids .yui-gc .yui-u, +.yui-cssgrids .yui-gc .yui-g, +.yui-cssgrids .yui-gd .yui-u { + float: left; +} + +/*Float units (and sub grids) to the right */ +.yui-cssgrids .yui-g .yui-u, +.yui-cssgrids .yui-g .yui-g, +.yui-cssgrids .yui-g .yui-gb, +.yui-cssgrids .yui-g .yui-gc, +.yui-cssgrids .yui-g .yui-gd, +.yui-cssgrids .yui-g .yui-ge, +.yui-cssgrids .yui-g .yui-gf, +.yui-cssgrids .yui-gc .yui-u, +.yui-cssgrids .yui-gd .yui-g, +.yui-cssgrids .yui-g .yui-gc .yui-u, +.yui-cssgrids .yui-ge .yui-u, +.yui-cssgrids .yui-ge .yui-g, +.yui-cssgrids .yui-gf .yui-g, +.yui-cssgrids .yui-gf .yui-u { + float: right; +} + +/*Float units (and sub grids) to the left */ +.yui-cssgrids .yui-g div.first, +.yui-cssgrids .yui-gb div.first, +.yui-cssgrids .yui-gc div.first, +.yui-cssgrids .yui-gd div.first, +.yui-cssgrids .yui-ge div.first, +.yui-cssgrids .yui-gf div.first, +.yui-cssgrids .yui-g .yui-gc div.first, +.yui-cssgrids .yui-g .yui-ge div.first, +.yui-cssgrids .yui-gc div.first div.first { + float: left; +} + +.yui-cssgrids .yui-g .yui-u, +.yui-cssgrids .yui-g .yui-g, +.yui-cssgrids .yui-g .yui-gb, +.yui-cssgrids .yui-g .yui-gc, +.yui-cssgrids .yui-g .yui-gd, +.yui-cssgrids .yui-g .yui-ge, +.yui-cssgrids .yui-g .yui-gf { + width: 49.1%; +} + +.yui-cssgrids .yui-gb .yui-u, +.yui-cssgrids .yui-g .yui-gb .yui-u, +.yui-cssgrids .yui-gb .yui-g, +.yui-cssgrids .yui-gb .yui-gb, +.yui-cssgrids .yui-gb .yui-gc, +.yui-cssgrids .yui-gb .yui-gd, +.yui-cssgrids .yui-gb .yui-ge, +.yui-cssgrids .yui-gb .yui-gf, +.yui-cssgrids .yui-gc .yui-u, +.yui-cssgrids .yui-gc .yui-g, +.yui-cssgrids .yui-gd .yui-u { + width: 32%; + margin-left: 2.0%; +} + +/* Give IE some extra breathing room for 1/3-based rounding issues */ +.yui-cssgrids .yui-gb .yui-u { + *width: 31.8%; + *margin-left: 1.9%; +} + +.yui-cssgrids .yui-gc div.first, +.yui-cssgrids .yui-gd .yui-u { + width: 66%; + _width: 65.7%; +} +.yui-cssgrids .yui-gd div.first { + width: 32%; + _width: 31.5%; +} + +.yui-cssgrids .yui-ge div.first, +.yui-cssgrids .yui-gf .yui-u { + width: 74.2%; + _width: 74%; +} + +.yui-cssgrids .yui-ge .yui-u, +.yui-cssgrids .yui-gf div.first { + width: 24%; + _width: 23.8%; +} + +.yui-cssgrids .yui-g .yui-gb div.first, +.yui-cssgrids .yui-gb div.first, +.yui-cssgrids .yui-gc div.first, +.yui-cssgrids .yui-gd div.first { + margin-left: 0; +} + +/* +Section: Deep Nesting +*/ +.yui-cssgrids .yui-g .yui-g .yui-u, +.yui-cssgrids .yui-gb .yui-g .yui-u, +.yui-cssgrids .yui-gc .yui-g .yui-u, +.yui-cssgrids .yui-gd .yui-g .yui-u, +.yui-cssgrids .yui-ge .yui-g .yui-u, +.yui-cssgrids .yui-gf .yui-g .yui-u { + width: 49%; + *width: 48.1%; + *margin-left: 0; +} + +.yui-cssgrids .yui-g .yui-gb div.first, +.yui-cssgrids .yui-gb .yui-gb div.first { + *margin-right: 0; + *width: 32%; + _width: 31.7%; +} + +.yui-cssgrids .yui-g .yui-gc div.first, +.yui-cssgrids .yui-gd .yui-g { + width: 66%; +} + +.yui-cssgrids .yui-gb .yui-g div.first { + *margin-right: 4%; + _margin-right: 1.3%; +} + +.yui-cssgrids .yui-gb .yui-gc div.first, +.yui-cssgrids .yui-gb .yui-gd div.first { + *margin-right: 0; +} + +.yui-cssgrids .yui-gb .yui-gb .yui-u, +.yui-cssgrids .yui-gb .yui-gc .yui-u { + *margin-left: 1.8%; + _margin-left: 4%; +} + +.yui-cssgrids .yui-g .yui-gb .yui-u { + _margin-left: 1.0%; +} + +.yui-cssgrids .yui-gb .yui-gd .yui-u { + *width: 66%; + _width: 61.2%; +} +.yui-cssgrids .yui-gb .yui-gd div.first { + *width: 31%; + _width: 29.5%; +} + +.yui-cssgrids .yui-g .yui-gc .yui-u, +.yui-cssgrids .yui-gb .yui-gc .yui-u { + width: 32%; + _float: right; + margin-right: 0; + _margin-left: 0; +} +.yui-cssgrids .yui-gb .yui-gc div.first { + width: 66%; + *float: left; + *margin-left: 0; +} + +.yui-cssgrids .yui-gb .yui-ge .yui-u, +.yui-cssgrids .yui-gb .yui-gf .yui-u { + margin: 0; +} + +.yui-cssgrids .yui-gb .yui-gb .yui-u { + _margin-left: .7%; +} + +.yui-cssgrids .yui-gb .yui-g div.first, +.yui-cssgrids .yui-gb .yui-gb div.first { + *margin-left:0; +} + +.yui-cssgrids .yui-gc .yui-g .yui-u, +.yui-cssgrids .yui-gd .yui-g .yui-u { + *width: 48.1%; + *margin-left: 0; +} + +.yui-cssgrids .yui-gb .yui-gd div.first { + width: 32%; +} +.yui-cssgrids .yui-g .yui-gd div.first { + _width: 29.9%; +} + +.yui-cssgrids .yui-ge .yui-g { + width: 24%; +} +.yui-cssgrids .yui-gf .yui-g { + width: 74.2%; +} + +.yui-cssgrids .yui-gb .yui-ge div.yui-u, +.yui-cssgrids .yui-gb .yui-gf div.yui-u { + float: right; +} +.yui-cssgrids .yui-gb .yui-ge div.first, +.yui-cssgrids .yui-gb .yui-gf div.first { + float: left; +} + +/* Width Accommodation for Nested Contexts */ +.yui-cssgrids .yui-gb .yui-ge .yui-u, +.yui-cssgrids .yui-gb .yui-gf div.first { + *width: 24%; + _width: 20%; +} + +/* Width Accommodation for Nested Contexts */ + +.yui-cssgrids .yui-gc .yui-gf .yui-u { + width: 74%; + _width: 73%; +} + +.yui-cssgrids .yui-gc .yui-gf div.first { + width: 24%; +} + +.yui-cssgrids .yui-gb .yui-ge div.first, +.yui-cssgrids .yui-gb .yui-gf .yui-u { + *width: 73.5%; + _width: 65.5%; +} + +/* Patch for GD within GE */ +.yui-cssgrids .yui-ge div.first .yui-gd .yui-u { + width: 65%; +} +.yui-cssgrids .yui-ge div.first .yui-gd div.first { + width: 32%; +} + +/* +Section: Clearing. zoom for IE, :after for others +*/ + +.yui-cssgrids #bd:after, +.yui-cssgrids .yui-g:after, +.yui-cssgrids .yui-gb:after, +.yui-cssgrids .yui-gc:after, +.yui-cssgrids .yui-gd:after, +.yui-cssgrids .yui-ge:after, +.yui-cssgrids .yui-gf:after, +.yui-cssgrids .yui-t1:after, +.yui-cssgrids .yui-t2:after, +.yui-cssgrids .yui-t3:after, +.yui-cssgrids .yui-t4:after, +.yui-cssgrids .yui-t5:after, +.yui-cssgrids .yui-t6:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +.yui-cssgrids #bd, +.yui-cssgrids .yui-g, +.yui-cssgrids .yui-gb, +.yui-cssgrids .yui-gc, +.yui-cssgrids .yui-gd, +.yui-cssgrids .yui-ge, +.yui-cssgrids .yui-gf, +.yui-cssgrids .yui-t1, +.yui-cssgrids .yui-t2, +.yui-cssgrids .yui-t3, +.yui-cssgrids .yui-t4, +.yui-cssgrids .yui-t5, +.yui-cssgrids .yui-t6 { + zoom: 1; +} \ No newline at end of file Property changes on: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids-context.css ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids.css =================================================================== --- trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids.css 2009-03-06 18:51:47 UTC (rev 12880) +++ trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids.css 2009-03-06 19:36:15 UTC (rev 12881) @@ -2,282 +2,479 @@ Copyright (c) 2008, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.txt -version: 2.5.2 +version: 3.0.0pr2 */ /* - Note: Throughout this file, the *property filter is used to - give a value to IE that other browsers do not see. +* +* The YUI CSS Foundation uses the *property and _property CSS filter +* techniques to shield a value from A-grade browsers [1] other than +* IE6 & IE7 (*property) and IE6 (_property) +* +/ +Section: General Rules */ - +body { + /* center the page */ + text-align: center; + margin-left: auto; + margin-right: auto; +} /* - Section: General Rules +Section: Page Width Rules (#doc, #doc2, #doc3, #doc4) */ +/* +Subsection: General +*/ +.yui-d0, /* 100% */ +.yui-d1, /* 750px */ +.yui-d1f, /* 750px fixed */ +.yui-d2, /* 950px */ +.yui-d2f, /* 950px fixed */ +.yui-d3, /* 974px */ +.yui-d3f { /* 974px fixed */ + margin: auto; + text-align: left; + width: 57.69em; + *width: 56.25em; /* doc1*/ +} - body { - text-align:center; - } - - #ft { - clear:both; - } +.yui-t1, +.yui-t2, +.yui-t3, +.yui-t4, +.yui-t5, +.yui-t6 { + margin: auto; + text-align: left; + width: 100%; +} /* - Section: Page Width Rules (#doc, #doc2, #doc3, #doc4) +Subsection: 100% (doc) */ +.yui-d0 { + /* Left and Right margins are not a structural part of Grids. Without them Grids + works fine, but content bleeds to the very edge of the document, which often + impairs readability and usability. They are + provided because they prevent the content from "bleeding" into the browser's chrome.*/ + margin: auto 10px; + width: auto; +} +.yui-d0f { + width: 100%; +} - /* - Subsection: General - */ - - #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7 { - margin:auto; - text-align:left; - width:57.69em;*width:56.25em; - min-width:750px; - } - /* - Subsection: 950 Centered (doc2) - */ - #doc2 { - width:73.076em;*width:71.25em; - } - - /* - Subsection: 100% (doc3) - */ - #doc3 { - /* Left and Right margins are not a structural part of Grids. Without them Grids - works fine, but content bleeds to the very edge of the document, which often - impairs readability and usability. They are - provided because they prevent the content from "bleeding" into the browser's chrome.*/ - margin:auto 10px; - width:auto; - } - - /* - Subsection: 974 Centered (doc4) - */ - #doc4 { - width:74.923em;*width:73.05em; - } - /* - Section: Preset Template Rules (.yui-t[1-6]) +Subsection: 950 Centered (doc2) */ - - /* - Subsection: General - */ +.yui-d2 { + width: 73.076em; + *width: 71.25em; +} +.yui-d2f { + width: 950px; +} +/* +Subsection: 974 Centered (doc3) +*/ +.yui-d3 { + width: 74.923em; + *width: 73.05em; +} +.yui-d3f { + width: 974px; +} +/* +Section: Preset Template Rules (.yui-t[1-6]) +*/ +/* +Subsection: General +*/ - /* to preserve source-order independence for Gecko */ - .yui-b{position:relative;} - .yui-b{_position:static;} - .yui-main .yui-b{position:static;} +/* to preserve source-order independence for Gecko without breaking IE */ +.yui-b { + position: relative; +} +.yui-b { + _position: static; +} +.yui-main .yui-b { + position: static; +} +.yui-main { + width: 100%; +} +.yui-t1 .yui-main, +.yui-t2 .yui-main, +.yui-t3 .yui-main { + float: right; + /* IE: preserve layout at narrow widths */ + margin-left: -25em; +} +.yui-t4 .yui-main, +.yui-t5 .yui-main, +.yui-t6 .yui-main { + float: left; + /* IE: preserve layout at narrow widths */ + margin-right: -25em; +} - .yui-main {width:100%;} - - .yui-t1 .yui-main, - .yui-t2 .yui-main, - .yui-t3 .yui-main{float:right;margin-left:-25em;/* IE: preserve layout at narrow widths */} +/* Subsection: For Specific Template Presets */ - .yui-t4 .yui-main, - .yui-t5 .yui-main, - .yui-t6 .yui-main{float:left;margin-right:-25em;/* IE: preserve layout at narrow widths */} +/** +* Nudge down to get to 13px equivalent for these form elements +*/ - /* - Subsection: For Specific Template Presets - */ +/* +TODO Create t1-6's that are based on fixed widths +*/ +/* t1 narrow block = left, equivalent of 160px */ +.yui-t1 .yui-b { + float: left; + width: 12.30769em; + *width: 12.00em; +} +.yui-t1 .yui-main .yui-b { + margin-left: 13.30769em; + *margin-left:12.975em; +} +/* t2 narrow block = left, equivalent of 180px */ +.yui-t2 .yui-b { + float: left; + width: 13.84615em; + *width: 13.50em; +} +.yui-t2 .yui-main .yui-b { + margin-left: 14.84615em; + *margin-left: 14.475em; +} +/* t3 narrow block = left, equivalent of 300px */ +.yui-t3 .yui-b { + float: left; + width: 23.0769em; + *width: 22.50em; +} +.yui-t3 .yui-main .yui-b { + margin-left: 24.0769em; + *margin-left: 23.475em; +} +/* t4 narrow block = right, equivalent of 180px */ +.yui-t4 .yui-b { + float: right; + width: 13.8456em; + *width: 13.50em; +} +.yui-t4 .yui-main .yui-b { + margin-right: 14.8456em; + *margin-right: 14.475em; +} +/* t5 narrow block = right, equivalent of 240px */ +.yui-t5 .yui-b { + float: right; + width: 18.4615em; + *width: 18.00em; +} +.yui-t5 .yui-main .yui-b { + margin-right: 19.4615em; + *margin-right: 18.975em; +} +/* t6 narrow block = equivalent of 300px */ +.yui-t6 .yui-b { + float: right; + width: 23.0769em; + *width: 22.50em; +} +.yui-t6 .yui-main .yui-b { + margin-right: 24.0769em; + *margin-right: 23.475em; +} - .yui-t1 .yui-b {float:left;width:12.30769em;*width:12.00em;} - .yui-t1 .yui-main .yui-b{margin-left:13.30769em;*margin-left:13.05em;} +.yui-main .yui-b { + float: none; + width: auto; +} - .yui-t2 .yui-b {float:left;width:13.8461em;*width:13.50em;} - .yui-t2 .yui-main .yui-b {margin-left:14.8461em;*margin-left:14.55em;} +/* +Section: Grids and Nesting Grids +*/ - .yui-t3 .yui-b {float:left;width:23.0769em;*width:22.50em;} - .yui-t3 .yui-main .yui-b {margin-left:24.0769em;*margin-left:23.62em;} - - .yui-t4 .yui-b {float:right;width:13.8456em;*width:13.50em;} - .yui-t4 .yui-main .yui-b {margin-right:14.8456em;*margin-right:14.55em;} - - .yui-t5 .yui-b {float:right;width:18.4615em;*width:18.00em;} - .yui-t5 .yui-main .yui-b {margin-right:19.4615em;*margin-right:19.125em;} - - .yui-t6 .yui-b {float:right;width:23.0769em;*width:22.50em;} - .yui-t6 .yui-main .yui-b {margin-right:24.0769em;*margin-right:23.62em;} - - .yui-t7 .yui-main .yui-b { - display:block;margin:0 0 1em 0; - } - .yui-main .yui-b {float:none;width:auto;} - /* - Section: Grids and Nesting Grids +Subsection: Children generally take half the available space */ - /* - Subsection: Children generally take half the available space - */ +.yui-gb .yui-u, +.yui-g .yui-gb .yui-u, +.yui-gb .yui-g, +.yui-gb .yui-gb, +.yui-gb .yui-gc, +.yui-gb .yui-gd, +.yui-gb .yui-ge, +.yui-gb .yui-gf, +.yui-gc .yui-u, +.yui-gc .yui-g, +.yui-gd .yui-u { + float: left; +} - .yui-gb .yui-u, - .yui-g .yui-gb .yui-u, - .yui-gb .yui-g, - .yui-gb .yui-gb, - .yui-gb .yui-gc, - .yui-gb .yui-gd, - .yui-gb .yui-ge, - .yui-gb .yui-gf, - .yui-gc .yui-u, - .yui-gc .yui-g, - .yui-gd .yui-u {float:left;} +/*Float units (and sub grids) to the right */ +.yui-g .yui-u, +.yui-g .yui-g, +.yui-g .yui-gb, +.yui-g .yui-gc, +.yui-g .yui-gd, +.yui-g .yui-ge, +.yui-g .yui-gf, +.yui-gc .yui-u, +.yui-gd .yui-g, +.yui-g .yui-gc .yui-u, +.yui-ge .yui-u, +.yui-ge .yui-g, +.yui-gf .yui-g, +.yui-gf .yui-u { + float: right; +} - /*Float units (and sub grids) to the right */ - .yui-g .yui-u, - .yui-g .yui-g, - .yui-g .yui-gb, - .yui-g .yui-gc, - .yui-g .yui-gd, - .yui-g .yui-ge, - .yui-g .yui-gf, - .yui-gc .yui-u, - .yui-gd .yui-g, - .yui-g .yui-gc .yui-u, - .yui-ge .yui-u, - .yui-ge .yui-g, - .yui-gf .yui-g, - .yui-gf .yui-u{float:right;} +/*Float units (and sub grids) to the left */ +.yui-g div.first, +.yui-gb div.first, +.yui-gc div.first, +.yui-gd div.first, +.yui-ge div.first, +.yui-gf div.first, +.yui-g .yui-gc div.first, +.yui-g .yui-ge div.first, +.yui-gc div.first div.first { + float: left; +} - /*Float units (and sub grids) to the left */ - .yui-g div.first, - .yui-gb div.first, - .yui-gc div.first, - .yui-gd div.first, - .yui-ge div.first, - .yui-gf div.first, - .yui-g .yui-gc div.first, - .yui-g .yui-ge div.first, - .yui-gc div.first div.first {float:left;} +.yui-g .yui-u, +.yui-g .yui-g, +.yui-g .yui-gb, +.yui-g .yui-gc, +.yui-g .yui-gd, +.yui-g .yui-ge, +.yui-g .yui-gf { + width: 49.1%; +} - .yui-g .yui-u, - .yui-g .yui-g, - .yui-g .yui-gb, - .yui-g .yui-gc, - .yui-g .yui-gd, - .yui-g .yui-ge, - .yui-g .yui-gf {width:49.1%;} +.yui-gb .yui-u, +.yui-g .yui-gb .yui-u, +.yui-gb .yui-g, +.yui-gb .yui-gb, +.yui-gb .yui-gc, +.yui-gb .yui-gd, +.yui-gb .yui-ge, +.yui-gb .yui-gf, +.yui-gc .yui-u, +.yui-gc .yui-g, +.yui-gd .yui-u { + width: 32%; + margin-left: 2.0%; +} - .yui-gb .yui-u, - .yui-g .yui-gb .yui-u, - .yui-gb .yui-g, - .yui-gb .yui-gb, - .yui-gb .yui-gc, - .yui-gb .yui-gd, - .yui-gb .yui-ge, - .yui-gb .yui-gf, - .yui-gc .yui-u, - .yui-gc .yui-g, - .yui-gd .yui-u {width:32%;margin-left:1.99%;} +/* Give IE some extra breathing room for 1/3-based rounding issues */ +.yui-gb .yui-u { + *width: 31.8%; + *margin-left: 1.9%; +} - /* Give IE some extra breathing room for 1/3-based rounding issues */ - .yui-gb .yui-u {*margin-left:1.9%;*width:31.9%;} +.yui-gc div.first, +.yui-gd .yui-u { + width: 66%; + _width: 65.7%; +} +.yui-gd div.first { + width: 32%; + _width: 31.5%; +} - .yui-gc div.first, - .yui-gd .yui-u {width:66%;} - .yui-gd div.first {width:32%;} +.yui-ge div.first, +.yui-gf .yui-u { + width: 74.2%; + _width: 74%; +} - .yui-ge div.first, - .yui-gf .yui-u{width:74.2%;} +.yui-ge .yui-u, +.yui-gf div.first { + width: 24%; + _width: 23.8%; +} - .yui-ge .yui-u, - .yui-gf div.first {width:24%;} +.yui-g .yui-gb div.first, +.yui-gb div.first, +.yui-gc div.first, +.yui-gd div.first { + margin-left: 0; +} - .yui-g .yui-gb div.first, - .yui-gb div.first, - .yui-gc div.first, - .yui-gd div.first {margin-left:0;} - - /* - Section: Deep Nesting - */ - .yui-g .yui-g .yui-u, - .yui-gb .yui-g .yui-u, - .yui-gc .yui-g .yui-u, - .yui-gd .yui-g .yui-u, - .yui-ge .yui-g .yui-u, - .yui-gf .yui-g .yui-u {width:49%;*width:48.1%;*margin-left:0;} +/* +Section: Deep Nesting +*/ +.yui-g .yui-g .yui-u, +.yui-gb .yui-g .yui-u, +.yui-gc .yui-g .yui-u, +.yui-gd .yui-g .yui-u, +.yui-ge .yui-g .yui-u, +.yui-gf .yui-g .yui-u { + width: 49%; + *width: 48.1%; + *margin-left: 0; +} - .yui-g .yui-gb div.first, - .yui-gb .yui-gb div.first {*margin-right:0;*width:32%;_width:31.7%;} +.yui-g .yui-gb div.first, +.yui-gb .yui-gb div.first { + *margin-right: 0; + *width: 32%; + _width: 31.7%; +} - .yui-g .yui-gc div.first, - .yui-gd .yui-g {width:66%;} +.yui-g .yui-gc div.first, +.yui-gd .yui-g { + width: 66%; +} - .yui-gb .yui-g div.first {*margin-right:4%;_margin-right:1.3%;} +.yui-gb .yui-g div.first { + *margin-right: 4%; + _margin-right: 1.3%; +} - .yui-gb .yui-gc div.first, - .yui-gb .yui-gd div.first {*margin-right:0;} +.yui-gb .yui-gc div.first, +.yui-gb .yui-gd div.first { + *margin-right: 0; +} - .yui-gb .yui-gb .yui-u, - .yui-gb .yui-gc .yui-u {*margin-left:1.8%;_margin-left:4%;} +.yui-gb .yui-gb .yui-u, +.yui-gb .yui-gc .yui-u { + *margin-left: 1.8%; + _margin-left: 4%; +} - .yui-g .yui-gb .yui-u {_margin-left:1.0%;} +.yui-g .yui-gb .yui-u { + _margin-left: 1.0%; +} - .yui-gb .yui-gd .yui-u {*width:66%;_width:61.2%;} - .yui-gb .yui-gd div.first {*width:31%;_width:29.5%;} +.yui-gb .yui-gd .yui-u { + *width: 66%; + _width: 61.2%; +} +.yui-gb .yui-gd div.first { + *width: 31%; + _width: 29.5%; +} - .yui-g .yui-gc .yui-u, - .yui-gb .yui-gc .yui-u {width:32%;_float:right;margin-right:0;_margin-left:0;} - .yui-gb .yui-gc div.first {width:66%;*float:left;*margin-left:0;} +.yui-g .yui-gc .yui-u, +.yui-gb .yui-gc .yui-u { + width: 32%; + _float: right; + margin-right: 0; + _margin-left: 0; +} +.yui-gb .yui-gc div.first { + width: 66%; + *float: left; + *margin-left: 0; +} - .yui-gb .yui-ge .yui-u, - .yui-gb .yui-gf .yui-u {margin:0;} +.yui-gb .yui-ge .yui-u, +.yui-gb .yui-gf .yui-u { + margin: 0; +} - .yui-gb .yui-gb .yui-u {_margin-left:.7%;} +.yui-gb .yui-gb .yui-u { + _margin-left: .7%; +} - .yui-gb .yui-g div.first, - .yui-gb .yui-gb div.first {*margin-left:0;} +.yui-gb .yui-g div.first, +.yui-gb .yui-gb div.first { + *margin-left:0; +} - .yui-gc .yui-g .yui-u, - .yui-gd .yui-g .yui-u {*width:48.1%;*margin-left:0;}s +.yui-gc .yui-g .yui-u, +.yui-gd .yui-g .yui-u { + *width: 48.1%; + *margin-left: 0; +} - .yui-gb .yui-gd div.first {width:32%;} - .yui-g .yui-gd div.first {_width:29.9%;} +.yui-gb .yui-gd div.first { + width: 32%; +} +.yui-g .yui-gd div.first { + _width: 29.9%; +} - .yui-ge .yui-g {width:24%;} - .yui-gf .yui-g {width:74.2%;} +.yui-ge .yui-g { + width: 24%; +} +.yui-gf .yui-g { + width: 74.2%; +} - .yui-gb .yui-ge div.yui-u, - .yui-gb .yui-gf div.yui-u {float:right;} - .yui-gb .yui-ge div.first, - .yui-gb .yui-gf div.first {float:left;} +.yui-gb .yui-ge div.yui-u, +.yui-gb .yui-gf div.yui-u { + float: right; +} +.yui-gb .yui-ge div.first, +.yui-gb .yui-gf div.first { + float: left; +} - /* Width Accommodation for Nested Contexts */ - .yui-gb .yui-ge .yui-u, - .yui-gb .yui-gf div.first {*width:24%;_width:20%;} +/* Width Accommodation for Nested Contexts */ +.yui-gb .yui-ge .yui-u, +.yui-gb .yui-gf div.first { + *width: 24%; + _width: 20%; +} - /* Width Accommodation for Nested Contexts */ - .yui-gb .yui-ge div.first, - .yui-gb .yui-gf .yui-u{*width:73.5%;_width:65.5%;} +/* Width Accommodation for Nested Contexts */ +.yui-gb .yui-ge div.first, +.yui-gb .yui-gf .yui-u { + *width: 73.5%; + _width: 65.5%; +} - /* Patch for GD within GE */ - .yui-ge div.first .yui-gd .yui-u {width:65%;} - .yui-ge div.first .yui-gd div.first {width:32%;} +/* Patch for GD within GE */ +.yui-ge div.first .yui-gd .yui-u { + width: 65%; +} +.yui-ge div.first .yui-gd div.first { + width: 32%; +} /* - Section: Clearing +Section: Clearing. zoom for IE, :after for others */ #bd:after, -.yui-g:after, -.yui-gb:after, -.yui-gc:after, -.yui-gd:after, -.yui-ge:after, -.yui-gf:after{content:".";display:block;height:0;clear:both;visibility:hidden;} +.yui-g:after, +.yui-gb:after, +.yui-gc:after, +.yui-gd:after, +.yui-ge:after, +.yui-gf:after, +.yui-t1:after, +.yui-t2:after, +.yui-t3:after, +.yui-t4:after, +.yui-t5:after, +.yui-t6:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} #bd, -.yui-g, -.yui-gb, -.yui-gc, -.yui-gd, -.yui-ge, -.yui-gf{zoom:1;} +.yui-g, +.yui-gb, +.yui-gc, +.yui-gd, +.yui-ge, +.yui-gf, +.yui-t1, +.yui-t2, +.yui-t3, +.yui-t4, +.yui-t5, +.yui-t6 { + zoom: 1; +} \ No newline at end of file Added: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset-context.css =================================================================== --- trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset-context.css (rev 0) +++ trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset-context.css 2009-03-06 19:36:15 UTC (rev 12881) @@ -0,0 +1,125 @@ +/* +Copyright (c) 2008, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 3.0.0pr2 +*/ +/*e + TODO will need to remove settings on HTML since we can't namespace it. + TODO with the prefix, should I group by selector or property for weight savings? +*/ +.yui-cssreset html{ + color:#000; + background:#FFF; +} +/* + TODO remove settings on BODY since we can't namespace it. +*/ +/* + TODO test putting a class on HEAD. + - Fails on FF. +*/ +.yui-cssreset body, +.yui-cssreset div, +.yui-cssreset dl, +.yui-cssreset dt, +.yui-cssreset dd, +.yui-cssreset ul, +.yui-cssreset ol, +.yui-cssreset li, +.yui-cssreset h1, +.yui-cssreset h2, +.yui-cssreset h3, +.yui-cssreset h4, +.yui-cssreset h5, +.yui-cssreset h6, +.yui-cssreset pre, +.yui-cssreset code, +.yui-cssreset form, +.yui-cssreset fieldset, +.yui-cssreset legend, +.yui-cssreset input, +.yui-cssreset textarea, +.yui-cssreset p, +.yui-cssreset blockquote, +.yui-cssreset th, +.yui-cssreset td { + margin:0; + padding:0; +} +.yui-cssreset table { + border-collapse:collapse; + border-spacing:0; +} +.yui-cssreset fieldset, +.yui-cssreset img { + border:0; +} +/* + TODO think about hanlding inheritence differently, maybe letting IE6 fail a bit... +*/ +.yui-cssreset address, +.yui-cssreset caption, +.yui-cssreset cite, +.yui-cssreset code, +.yui-cssreset dfn, +.yui-cssreset em, +.yui-cssreset strong, +.yui-cssreset th, +.yui-cssreset var { + font-style:normal; + font-weight:normal; +} +/* + TODO Figure out where this list-style rule is best set. Hedger has a request to investigate. +*/ +.yui-cssreset li { + list-style:none; +} + +.yui-cssreset caption, +.yui-cssreset th { + text-align:left; +} +.yui-cssreset h1, +.yui-cssreset h2, +.yui-cssreset h3, +.yui-cssreset h4, +.yui-cssreset h5, +.yui-cssreset h6 { + font-size:100%; + font-weight:normal; +} +.yui-cssreset q:before, +.yui-cssreset q:after { + content:''; +} +.yui-cssreset abbr, +.yui-cssreset acronym { + border:0; + font-variant:normal; +} +/* to preserve line-height and selector appearance */ +.yui-cssreset sup { + vertical-align:text-top; +} +.yui-cssreset sub { + vertical-align:text-bottom; +} +.yui-cssreset input, +.yui-cssreset textarea, +.yui-cssreset select { + font-family:inherit; + font-size:inherit; + font-weight:inherit; +} +/*to enable resizing for IE*/ +.yui-cssreset input, +.yui-cssreset textarea, +.yui-cssreset select { + *font-size:100%; +} +/*because legend doesn't inherit in IE */ +.yui-cssreset legend { + color:#000; +} \ No newline at end of file Property changes on: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset-context.css ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset.css =================================================================== --- trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset.css 2009-03-06 18:51:47 UTC (rev 12880) +++ trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset.css 2009-03-06 19:36:15 UTC (rev 12881) @@ -2,76 +2,124 @@ Copyright (c) 2008, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.txt -version: 2.5.2 +version: 3.0.0pr2 */ -html { - color: #000; - background: #FFF; +/* + TODO will need to remove settings on HTML since we can't namespace it. + TODO with the prefix, should I group by selector or property for weight savings? +*/ +html{ + color:#000; + background:#FFF; } - -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td - { - margin: 0; - padding: 0; +/* + TODO remove settings on BODY since we can't namespace it. +*/ +/* + TODO test putting a class on HEAD. + - Fails on FF. +*/ +body, +div, +dl, +dt, +dd, +ul, +ol, +li, +h1, +h2, +h3, +h4, +h5, +h6, +pre, +code, +form, +fieldset, +legend, +input, +textarea, +p, +blockquote, +th, +td { + margin:0; + padding:0; } - table { - border-collapse: collapse; - border-spacing: 0; + border-collapse:collapse; + border-spacing:0; } - -fieldset,img { - border: 0; +fieldset, +img { + border:0; } - -address,caption,cite,code,dfn,em,strong,th,var { - font-style: normal; - font-weight: normal; +/* + TODO think about hanlding inheritence differently, maybe letting IE6 fail a bit... +*/ +address, +caption, +cite, +code, +dfn, +em, +strong, +th, +var { + font-style:normal; + font-weight:normal; } - +/* + TODO Figure out where this list-style rule is best set. Hedger has a request to investigate. +*/ li { - list-style: none; + list-style:none; } -caption,th { - text-align: left; +caption, +th { + text-align:left; } - -h1,h2,h3,h4,h5,h6 { - font-size: 100%; - font-weight: normal; +h1, +h2, +h3, +h4, +h5, +h6 { + font-size:100%; + font-weight:normal; } - -q:before,q:after { - content: ''; +q:before, +q:after { + content:''; } - -abbr,acronym { - border: 0; - font-variant: normal; +abbr, +acronym { + border:0; + font-variant:normal; } - /* to preserve line-height and selector appearance */ sup { - vertical-align: text-top; + vertical-align:text-top; } - sub { - vertical-align: text-bottom; + vertical-align:text-bottom; } - -input,textarea,select { - font-family: inherit; - font-size: inherit; - font-weight: inherit; +input, +textarea, +select { + font-family:inherit; + font-size:inherit; + font-weight:inherit; } - /*to enable resizing for IE*/ -input,textarea,select { * - font-size: 100%; +input, +textarea, +select { + *font-size:100%; } - /*because legend doesn't inherit in IE */ legend { - color: #000; + color:#000; } \ No newline at end of file Modified: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss =================================================================== --- trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss 2009-03-06 18:51:47 UTC (rev 12880) +++ trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss 2009-03-06 19:36:15 UTC (rev 12881) @@ -7,11 +7,12 @@ <u:selector name="body"> <u:style name="font-family" skin="generalFamilyFont" /> <u:style name="margin" value="0" /> + <u:style name="padding" value="0" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.images.PageBackgroundGradient"/> </u:style> - <u:style name="background-color" value="#FFFFFF"/> - <u:style name="background-repeat" value="repeat-x"/> + <u:style name="background-color" skin="additionalBackgroundColor"/> + <u:style name="background-repeat" value="repeat-x"/> </u:selector> <u:selector name=".rich-page"> @@ -35,7 +36,7 @@ <f:resource f:key="org.richfaces.renderkit.html.images.PageContentGradient"/> </u:style> <u:style name="min-height" value="200px" /> - <u:style name="background-color" value="#FFFFFF"/> + <u:style name="background-color" skin="generalBackgroundColor"/> <u:style name="background-repeat" value="repeat-x"/> </u:selector> @@ -49,15 +50,33 @@ <u:selector name=".rich-page-footer"> <u:style name="text-align" value="center" /> <u:style name="padding" value="20px 0" /> - <u:style name="background-color" value="#333"/> + <u:style name="background-color" skin="tableFooterBackgroundColor"/> <u:style name="color" skin="trimColor" /> - <u:style name="font-size" value="0.8em" /> + <u:style name="font-size" skin="headerSizeFont" /> </u:selector> <u:selector name=".rich-page-sidebar"> - <u:style name="padding" value="0 20px 0 20px" /> + <!--u:style name="padding" value="0 20px 0 20px" /--> </u:selector> + <u:selector name="h1,h2,h3"> + <u:style name="font-family" skin="headerFamilyFont" /> + <u:style name="margin" value="0" /> + <u:style name="color" skin="headTextColor" /> + </u:selector> + <u:selector name="h1"> + <u:style name="font-size" value="333.4%" /> + </u:selector> + <u:selector name="h2"> + <u:style name="font-size" value="197%" /> + </u:selector> + <u:selector name="p,ul,ol"> + <u:style name="font-family" skin="generalFamilyFont" /> + <u:style name="margin-top" value="0" /> + <u:style name="line-height" value="240%"/> + <u:style name="color" skin="controlTextColor" /> + </u:selector> + <u:selector name="a:hover"> <u:style name="color" skin="hoverLinkColor" /> </u:selector>