Author: ricky Update of /cvs/fedora/web/static In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5302 Modified Files: get-fedora.html index.html join-fedora.html style.css Log Message: Fixed left/right border image issue. Index: get-fedora.html =================================================================== RCS file: /cvs/fedora/web/static/get-fedora.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- get-fedora.html 22 May 2007 04:17:30 -0000 1.9 +++ get-fedora.html 23 May 2007 22:43:29 -0000 1.10 @@ -65,18 +65,20 @@ When you place an order with <a href="http://fedoraproject.org/wiki/Distribution/SponsoredMedia">participating vendors</a>, you can elect to also sponsor the cost of additional media for others who cannot otherwise afford it (for example, people in developing nations.) Please consider participating in the <a href="http://fedoraproject.org/wiki/Distribution/SponsoredMedia">Fedora Sponsored Media Program</a>. </p> </div> - <div id="footer"> - <p class="copy"> - Copyright © 2007 Red Hat, Inc. and others. All Rights Reserved. - </p> - <p class="disclaimer"> - The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content. - </p> - <ul> - <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li> - <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li> - </ul> </div> + <div id="bottom"> + <div id="footer"> + <p class="copy"> + Copyright © 2007 Red Hat, Inc. and others. All Rights Reserved. + </p> + <p class="disclaimer"> + The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content. + </p> + <ul> + <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li> + <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li> + </ul> + </div> </div> </body> </html> Index: index.html =================================================================== RCS file: /cvs/fedora/web/static/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- index.html 22 May 2007 04:17:30 -0000 1.8 +++ index.html 23 May 2007 22:43:29 -0000 1.9 @@ -8,7 +8,7 @@ <style type="text/css"> #wrapper { - height: 100%; + height: 100%; } </style> <![endif]--> @@ -30,7 +30,7 @@ <li><a href="get-fedora.html#mirrors">Download Mirrors</a></li> <li><a href="get-fedora.html#media">Request Media</a></li> </ul> - </div> + </div> <div id="nav"> <h2>Navigation</h2> <ul> @@ -61,18 +61,20 @@ </p> <a href="http://fedoraproject.org/wiki/Overview">Learn more >></a> </div> - <div id="footer"> - <p class="copy"> - Copyright © 2007 Red Hat, Inc. and others. All Rights Reserved. - </p> - <p class="disclaimer"> - The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content. - </p> - <ul> - <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li> - <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li> - </ul> </div> + <div id="bottom"> + <div id="footer"> + <p class="copy"> + Copyright © 2007 Red Hat, Inc. and others. All Rights Reserved. + </p> + <p class="disclaimer"> + The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content. + </p> + <ul> + <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li> + <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li> + </ul> + </div> </div> </body> </html> Index: join-fedora.html =================================================================== RCS file: /cvs/fedora/web/static/join-fedora.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- join-fedora.html 22 May 2007 18:17:42 -0000 1.8 +++ join-fedora.html 23 May 2007 22:43:29 -0000 1.9 @@ -7,7 +7,7 @@ <style type="text/css"> #wrapper { - height: 100%; + height: 100%; } </style> <![endif]--> @@ -29,7 +29,7 @@ <li><a href="get-fedora.html#mirrors">Download Mirrors</a></li> <li><a href="get-fedora.html#media">Request Media</a></li> </ul> - </div> + </div> <div id="nav"> <h2>Navigation</h2> <ul> @@ -47,10 +47,10 @@ </div> <div id="content"> <h2>Join Fedora.</h2> -<p>If you want to take an active hand in making Fedora even better, there are many ways you can help. What role do you want to fill?</p> -<p><strong>Click on the role you'd like to fill below to learn more about how you can help the Fedora project.</strong></p> -<ul class="roles"> - <li><a href="http://fedoraproject.org/wiki/Join#ContentDeveloper"> + <p>If you want to take an active hand in making Fedora even better, there are many ways you can help. What role do you want to fill?</p> + <p><strong>Click on the role you'd like to fill below to learn more about how you can help the Fedora project.</strong></p> + <ul class="roles"> + <li><a href="http://fedoraproject.org/wiki/Join#ContentDeveloper"> <img src="images/ContentDeveloper.png" alt="Content Developer" /><br /> Content Developer<br />(writer) </a></li> @@ -76,18 +76,20 @@ </a></li> </ul> </div> - <div id="footer"> - <p class="copy"> - Copyright © 2007 Red Hat, Inc. and others. All Rights Reserved. - </p> - <p class="disclaimer"> - The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content. - </p> - <ul> - <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li> - <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li> - </ul> </div> + <div id="bottom"> + <div id="footer"> + <p class="copy"> + Copyright © 2007 Red Hat, Inc. and others. All Rights Reserved. + </p> + <p class="disclaimer"> + The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content. + </p> + <ul> + <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li> + <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li> + </ul> + </div> </div> </body> </html> Index: style.css =================================================================== RCS file: /cvs/fedora/web/static/style.css,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- style.css 22 May 2007 19:03:59 -0000 1.10 +++ style.css 23 May 2007 22:43:29 -0000 1.11 @@ -4,15 +4,16 @@ padding: 0; } -body +html, body { - font-size: 76%; - background: url(images/border-left.png) 0 0 repeat-y; + height: 100%; } -html, body +body { height: 100%; + font-size: 76%; + background: #FFFFFF url(images/border-left.png) 0 0 repeat-y; } a img @@ -22,19 +23,18 @@ #wrapper { - margin: 0 0 0 18px; + margin-left: 18px; font: normal 2.3ex/1.5 sans-serif; - background: #FFFFFF; min-height: 100%; + background: #FFFFFF url(images/border-right.png) 100% 0 repeat-y; padding-right: 18px; - background: url(images/border-right.png) 100% 0 repeat-y; } #head { border-top: 10px solid #337ACC; padding: 1ex 2ex 17px; - background: url(images/line.png) 0 100% repeat-x; + background: #FFFFFF url(images/line.png) 0 100% repeat-x; } #head h1 a @@ -52,6 +52,7 @@ float: left; width: 425px; margin: 2ex 0; + background: #FFFFFF; } #banner @@ -148,6 +149,7 @@ margin-left: 425px; padding: 1ex 1ex 120px; color: #666666; + background: #FFFFFF; } #content h2 @@ -225,7 +227,7 @@ { color: #444; font-weight: 900; - background-color: #efefef; + background: #EFEFEF; } .roles img @@ -238,11 +240,18 @@ font: normal 1.5ex/1.5 sans-serif; clear: both; text-align: center; - background: url(images/line-bottom.png) 0 0 repeat-x; + background: #FFFFFF url(images/line-bottom.png) 0 0 repeat-x; + margin: -90px 0 0; border-bottom: 10px solid #337ACC; height: 80px; color: #AAAAAA; - margin-bottom: -90px; +} + +#bottom +{ + background: #FFFFFF url(images/border-right.png) 100% 0 repeat-y; + margin-left: 18px; + padding-right: 18px; } #footer ul @@ -285,12 +294,9 @@ #screenshot-banner { list-style: none; - overflow: auto; } #screenshot-banner li { - width: 135px; - float: left; - text-align: center; + display: inline; }