From 05d332dbd30372255383881e63bdd6e58a338273 Mon Sep 17 00:00:00 2001 From: Jeremy Grelle Date: Fri, 4 Apr 2008 22:06:04 +0000 Subject: [PATCH] Updating to version 1.1 of css-framework --- .../META-INF/css-framework/css/forms.css | 220 ++++++----- .../css-framework/css/layout-1col.css | 27 +- .../css-framework/css/layout-navleft-1col.css | 27 +- .../css-framework/css/layout-navleft-2col.css | 27 +- .../css-framework/css/layout-navtop-1col.css | 27 +- .../css-framework/css/layout-navtop-3col.css | 27 +- .../css/layout-navtop-localleft.css | 27 +- .../css/layout-navtop-subright.css | 27 +- .../META-INF/css-framework/css/layout.css | 43 ++- .../css-framework/css/nav-horizontal.css | 39 +- .../css-framework/css/nav-vertical.css | 39 +- .../META-INF/css-framework/css/tools.css | 112 +++--- .../META-INF/css-framework/css/typo.css | 355 ++++++++++-------- 13 files changed, 665 insertions(+), 332 deletions(-) diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/forms.css b/spring-faces/src/main/resources/META-INF/css-framework/css/forms.css index f92b8058..3b3e47ef 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/forms.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/forms.css @@ -1,100 +1,134 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ /* FORM ELEMENTS */ - form { - margin:0; - padding:0; - } - form div, - form p { - font-size: 1em; - margin: 0 0 1em 0; - padding: 0; - } - label { - font-weight: bold; - } - fieldset { - border: 1px solid #eee; - padding: 5px 10px; - margin: 0 0 1.5em 0; - } - fieldset legend { - color: #666; - font-size: 1.1em; - font-weight: bold; - margin: 0 0 0 0px; - padding: 0; - background-color: white; - } - * html fieldset legend { - margin: 0 0 10px -10px; - } - fieldset ul { - list-style: none; - margin: 0 0 1.5em 0; - padding: 0; - } - fieldset ul li { - list-style: none; - margin: 0 0 0.5em 0; - padding: 0; - } - - - input, select, textarea { - font-size:1em; - font-family: arial, helvetica, verdana, sans-serif; + form { + margin:0; + padding:0; + } + form div, + form p { + margin: 0 0 1em 0; + padding: 0; + + font-size: 1em; + } + label { + font-weight: bold; + } + fieldset { + padding: 5px 10px; + margin: 0 0 1.5em 0; + + border: 1px solid #eee; + } + fieldset legend { + margin: 0 0 0 0px; + padding: 0; + + font-size: 1.1em; + font-weight: bold; + + color: #666; + background-color: white; + } + * html fieldset legend { + margin: 0 0 10px -10px; + } + fieldset ul { + margin: 0 0 1.5em 0; + padding: 0; + + list-style: none; + } + fieldset ul li { + margin: 0 0 0.5em 0; + padding: 0; + + list-style: none; + } + input, select, textarea { + margin: 0; + padding: 2px; + + font-size: 1em; + font-family: arial, helvetica, verdana, sans-serif; + } + + input, select { + vertical-align: middle; + } + textarea { + width: 200px; + height: 8em; + } + + input.check { + width: auto; + height: auto; margin: 0; - padding: 2px; - } - - input, select { - vertical-align:middle; - } - textarea { - width: 200px; - height: 8em; - } - - input.check { - border: none; - width: auto; - height: auto; - margin: 0; - } - input.radio { - border: none; - width: auto; - height: auto; - margin: 0; - } - input.file { - height: auto; - width: 250px; - } - input.readonly { - background-color: transparent; - border: none; - } - input.button { - width: 10em; - border:1px solid black; - background-color: #ddd; - } - input.image { - border: none; - width: auto; - height: auto; - } - + + border: none; + } + input.radio { + width: auto; + + height: auto; + margin: 0; + + border: none; + } + input.file { + width: 250px; + height: auto; + } + input.readonly { + background-color: transparent; + border: none; + } + input.button { + width: 10em; + + background-color: #ddd; + border: 1px solid black; + } + input.image { + width: auto; + height: auto; + + border: none; + } + form div.submit { - margin: 1em 0; - } + margin: 1em 0; + } form div.submit input { - height: 2em; width: 15em; - } -/* END FORM ELEMENTS */ - \ No newline at end of file + height: 2em; + } +/* END FORM ELEMENTS */ \ No newline at end of file diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-1col.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-1col.css index 0215f837..7f3de7b4 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-1col.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-1col.css @@ -1,4 +1,29 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ @import url("nav-horizontal.css"); diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navleft-1col.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navleft-1col.css index 1d596bf8..9840d71c 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navleft-1col.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navleft-1col.css @@ -1,4 +1,29 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ @import url("nav-vertical.css"); diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navleft-2col.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navleft-2col.css index 5cba5628..a2fa6061 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navleft-2col.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navleft-2col.css @@ -1,4 +1,29 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ @import url("nav-vertical.css"); diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-1col.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-1col.css index ef413731..635494b7 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-1col.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-1col.css @@ -1,4 +1,29 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ @import url("nav-horizontal.css"); diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-3col.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-3col.css index 352af577..599fa997 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-3col.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-3col.css @@ -1,4 +1,29 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ @import url("nav-horizontal.css"); diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-localleft.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-localleft.css index a63a7c01..1cf0c61d 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-localleft.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-localleft.css @@ -1,4 +1,29 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ @import url("nav-horizontal.css"); diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-subright.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-subright.css index 7f219a4b..47384ca1 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-subright.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-subright.css @@ -1,4 +1,29 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ @import url("nav-horizontal.css"); diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/layout.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout.css index 57958b5d..b6f3cfe0 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/layout.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/layout.css @@ -1,13 +1,38 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ /* SITE SPECIFIC LAYOUT */ body { margin: 0; padding: 0; - - background: white; text-align: center; + + background: white; } div#page { width: 780px; @@ -15,8 +40,9 @@ margin: 0 auto; padding: 0; - background: white; text-align: center; + + background: white; } /* HEADER */ @@ -76,17 +102,15 @@ background-color: black; } div#footer p { - font-size: 0.8em; - margin: 0; padding: 15px; + + font-size: 0.8em; } /* END FOOTER */ /* END LAYOUT */ - - /* UL.SUBNAV */ ul.subnav { margin: 0; @@ -98,6 +122,7 @@ ul.subnav li { margin: 0 0 1em 0; padding: 0; + list-style: none; } ul.subnav li a, @@ -106,6 +131,7 @@ ul.subnav li a:active { text-decoration: none; font-weight: bold; + color: black; } ul.subnav li a:hover { @@ -113,6 +139,7 @@ } ul.subnav li strong { padding: 0 0 0 12px; + background: url("../i/subnav-highlight.gif") left top no-repeat transparent; } ul.subnav li strong a, diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/nav-horizontal.css b/spring-faces/src/main/resources/META-INF/css-framework/css/nav-horizontal.css index 8a8e3196..2af4f2bc 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/nav-horizontal.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/nav-horizontal.css @@ -1,7 +1,32 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ /* NAV */ - div#nav { + div#nav { font-size: 0.8em; } * html div#nav { @@ -16,7 +41,6 @@ width: 100%; } div#nav ul { - width: auto; width: 100%; margin: 0; @@ -28,12 +52,12 @@ div#nav li { float: left; display: inline; - - list-style: none; margin: 0; padding: 0; + list-style: none; + line-height: 1em; border-right: 1px solid #aaa; } @@ -48,12 +72,13 @@ /* hide from ie/mac \*/ display: block; /* end hide */ - font-weight: bold; - text-decoration: none; margin: 0; padding: 5px 38px 5px 38px; + font-weight: bold; + text-decoration: none; + color: black; background: #ddd; } diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/nav-vertical.css b/spring-faces/src/main/resources/META-INF/css-framework/css/nav-vertical.css index 1f57bd25..56d8f5dc 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/nav-vertical.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/nav-vertical.css @@ -1,7 +1,32 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ /* NAV */ - div#nav { + div#nav { font-size: 0.8em; } * html div#nav { @@ -15,7 +40,6 @@ background: #ddd; } div#nav ul { - width: auto; width: 100%; margin: 0; @@ -26,12 +50,12 @@ } div#nav li { display: block; - - list-style: none; margin: 0; padding: 0; + list-style: none; + line-height: 1em; } * html div#nav li { @@ -57,10 +81,11 @@ color: black; background: white; } - div#nav a:hover { + div#nav a:hover { + text-decoration: underline; + color: white; background: black; - text-decoration: underline; } div#nav strong { display: block; diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/tools.css b/spring-faces/src/main/resources/META-INF/css-framework/css/tools.css index 3219ebd8..0555cb08 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/tools.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/tools.css @@ -1,68 +1,64 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ /* clearing */ - .stretch, - .clear { - clear:both; - height:1px; - margin:0; - padding:0; - font-size: 15px; - line-height: 1px; - } - .clearfix:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; - } - * html>body .clearfix { - display: inline-block; - width: 100%; - } - - * html .clearfix { - /* Hides from IE-mac \*/ - height: 1%; - /* End hide from IE-mac */ - } + .stretch, + .clear { + clear: both; + height: 1px; + + margin: 0; + padding: 0; + + font-size: 15px; + line-height: 1px; + } + .clearfix:after { + clear: both; + height: 0; + + display: block; + visibility: hidden; + + content: "."; + } + .clearfix {display:inline-block;} + /* Hide from IE Mac \*/ + .clearfix {display:block;} + /* End hide from IE Mac */ /* end clearing */ - -/* replace */ - .replace { - display:block; - - background-repeat: no-repeat; - background-position: left top; - background-color:transparent; - } - /* tidy these up */ - .replace * { - text-indent: -10000px; - display:block; - - background-repeat: no-repeat; - background-position: left top; - background-color:transparent; - } - .replace a { - text-indent:0; - } - .replace a span { - text-indent:-10000px; - } -/* end replace */ - - /* accessibility */ span.accesskey { - text-decoration:none; + text-decoration: none; } .accessibility { - position: absolute; - top: -999em; - left: -999em; + position: absolute; + top: -999em; + left: -999em; } /* end accessibility */ \ No newline at end of file diff --git a/spring-faces/src/main/resources/META-INF/css-framework/css/typo.css b/spring-faces/src/main/resources/META-INF/css-framework/css/typo.css index b159e6dc..9f54ab95 100644 --- a/spring-faces/src/main/resources/META-INF/css-framework/css/typo.css +++ b/spring-faces/src/main/resources/META-INF/css-framework/css/typo.css @@ -1,177 +1,228 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ +/* +A CSS Framework by Mike Stenhouse of Content with Style +------------------------------------------------------- + +Copyright (c) 2005, Mike Stenhouse of Content with Style + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of CSS Framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ /* TYPOGRAPHY */ - body { - text-align: left; - font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; - font-size: 76%; + body { + text-align: left; + font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size: 76%; line-height: 1em; - color: #333; - } - div { - font-size: 1em; - } - img { - border: 0; - } - + + color: #333; + } + div { + font-size: 1em; + } + img { + border: 0; + } + /* LINKS */ - a, - a:link - a:active { - color: blue; - background-color: white; - text-decoration: underline; - } - a:visited { - color: purple; - background-color: transparent; - } - a:hover { + a, + a:link, + a:active { + text-decoration: underline; + + color: blue; + background-color: white; + } + a:visited { + color: purple; + background-color: transparent; + } + a:hover { + text-decoration: none; + color: white; background-color: black; - text-decoration: none; - } + } /* END LINKS */ - + /* HEADINGS */ - h1 { - font-size: 2em; - line-height: 1.5em; - margin: 0 0 0.5em 0; - padding: 0; - color: black; - } - h2 { - font-size: 1.5em; + h1 { + margin: 0 0 0.5em 0; + padding: 0; + + font-size: 2em; line-height: 1.5em; - margin: 0 0 0.5em 0; - padding: 0; + color: black; - } - h3 { - font-size: 1.3em; - line-height: 1.3em; - margin: 0 0 0.5em 0; - padding:0; + } + h2 { + margin: 0 0 0.5em 0; + padding: 0; + + font-size: 1.5em; + line-height: 1.5em; + color: black; - } - h4 { - font-size: 1.2em; - line-height: 1.3em; - margin: 0 0 0.25em 0; - padding: 0; + } + h3 { + margin: 0 0 0.5em 0; + padding:0; + + font-size: 1.3em; + line-height: 1.3em; + color: black; - } - h5 { - font-size: 1.1em; - line-height: 1.3em; - margin: 0 0 0.25em 0; - padding: 0; + } + h4 { + margin: 0 0 0.25em 0; + padding: 0; + + font-size: 1.2em; + line-height: 1.3em; + color: black; - } - h6 { - font-size: 1em; - line-height: 1.3em; - margin: 0 0 0.25em 0; - padding: 0; + } + h5 { + margin: 0 0 0.25em 0; + padding: 0; + + font-size: 1.1em; + line-height: 1.3em; + color: black; - } + } + h6 { + margin: 0 0 0.25em 0; + padding: 0; + + font-size: 1em; + line-height: 1.3em; + + color: black; + } /* END HEADINGS */ /* TEXT */ - p { - font-size: 1em; - margin: 0 0 1.5em 0; - padding: 0; - line-height:1.4em; - } - blockquote { - border-left:10px solid #ddd; - margin-left:10px; - } - pre { - font-family: monospace; - font-size: 1.0em; - } - strong, b { - font-weight: bold; - } - em, i { - font-style:italic; - } + p { + margin: 0 0 1.5em 0; + padding: 0; + + font-size: 1em; + line-height:1.4em; + } + blockquote { + margin-left: 10px; + + border-left: 10px solid #ddd; + } + pre { + font-family: monospace; + font-size: 1.0em; + } + strong, b { + font-weight: bold; + } + em, i { + font-style:italic; + } code { font-family: "Courier New", Courier, monospace; font-size: 1em; white-space: pre; } /* END TEXT */ - + /* LISTS */ - ul { - line-height:1.4em; - margin: 0 0 1.5em 0; - padding: 0; - } - ul li { - margin: 0 0 0.25em 30px; - padding: 0; - } - ol { - font-size: 1.0em; - line-height: 1.4em; - margin: 0 0 1.5em 0; - padding: 0; - } - ol li { - font-size: 1.0em; - margin: 0 0 0.25em 30px; - padding: 0; - } - dl { - margin: 0 0 1.5em 0; - padding: 0; - line-height: 1.4em; - } - dl dt { - font-weight: bold; - margin: 0.25em 0 0.25em 0; - padding: 0; - } - dl dd { - margin: 0 0 0 30px; - padding: 0; - } -/* END LISTS */ - - -/* TABLE */ - table { - font-size: 1em; - margin: 0 0 1.5em 0; + ul { + margin: 0 0 1.5em 0; padding: 0; - } - table caption { - font-weight: bold; - margin: 0 0 0 0; - padding: 0 0 1.5em 0; - } - th { - font-weight: bold; - text-align: left; - } - td { - font-size: 1em; - } -/* END TABLE */ - - hr { - display: none; - } - div.hr { - height: 1px; - margin: 1.5em 10px; - border-bottom: 1px dotted black; - } - -/* END TYPOGRAPHY */ \ No newline at end of file + + line-height:1.4em; + } + ul li { + margin: 0 0 0.25em 30px; + padding: 0; + } + ol { + margin: 0 0 1.5em 0; + padding: 0; + + font-size: 1.0em; + line-height: 1.4em; + } + ol li { + margin: 0 0 0.25em 30px; + padding: 0; + + font-size: 1.0em; + } + dl { + margin: 0 0 1.5em 0; + padding: 0; + + line-height: 1.4em; + } + dl dt { + margin: 0.25em 0 0.25em 0; + padding: 0; + + font-weight: bold; + } + dl dd { + margin: 0 0 0 30px; + padding: 0; + } +/* END LISTS */ + + +/* TABLE */ + table { + margin: 0 0 1.5em 0; + padding: 0; + + font-size: 1em; + } + table caption { + margin: 0; + padding: 0 0 1.5em 0; + + font-weight: bold; + } + th { + font-weight: bold; + text-align: left; + } + td { + font-size: 1em; + } +/* END TABLE */ + + hr { + display: none; + } + div.hr { + height: 1px; + + margin: 1.5em 10px; + + border-bottom: 1px dotted black; + } + +/* END TYPOGRAPHY */ \ No newline at end of file