Split "content" div into three sections: About, Current Release and Next Release. Notes on changes to CSS: - "content" given negative top margin to make room for rest of content - h3 given negative top margin to achieve close proximity to h2 - Current Release div is float within wide margin of Next Release div - "float_blocker_bar" stops Current Release div disappearing under footer when columns are very narrow - "screenshot" banner changed to overflow:hidden to stop "content" div dropping down in IE for narrower windows --- index.html | 30 +++++++++++++++++------------- static/css/fedora.css | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index cbb99c7..6fdb5cc 100644 --- a/index.html +++ b/index.html @@ -106,19 +106,23 @@ </div> </div> - <div id="content"> - <h2>Fedora 12: Unite.</h2><div id="screenshot-banner"> - <a href="https://fedoraproject.org/wiki/Fedora_12_tour"><img src="static/images/f12launch.png" alt="Fedora 12"></a> - </div><p> - <a href="http://docs.fedoraproject.org/release-notes/f12/">What... new in Fedora 12? Read the release notes. &gt;&gt;</a> - </p><p> - Fedora is a Linux-based operating system that showcases the latest in free and open source software. Fedora is <strong>always free for anyone to use, modify, and distribute.</strong> It is built by people across the globe who work together as a community: the Fedora Project. The Fedora Project is open and anyone is welcome to join. - </p><p> - The Fedora Project is out front for you, <strong>leading the advancement of free, open software and content</strong>. - </p><p> - <a href="http://fedoraproject.org/wiki/Overview">Learn more. &gt;&gt;</a> - </p> - </div> +<div id="content"> +<h2>About the Fedora Project</h2> +<p>Fedora is a Linux-based operating system that showcases the latest in free and open source software. Fedora is <strong>always free for anyone to use, modify, and distribute.</strong> It is built by people across the globe who work together as a community: the Fedora Project. The Fedora Project is open and anyone is welcome to join.</p> +<p>The Fedora Project is out front for you, <strong>leading the advancement of free, open software and content</strong>.</p> +<p><a href="http://fedoraproject.org/wiki/Overview">Learn more. &gt;&gt;</a></p> + +<div id="screenshot-banner"><a href="https://fedoraproject.org/wiki/Fedora_12_tour"><img src="static/images/f12launch.png" alt="Fedora 12"></a></div> + +<div id="current_release"> +<h2 class="off_left">Current Release</h2> +</div> + +<div id="next_release"> +<h2 class="off_left">Next Release</h2> +</div> +<div class="float_blocker_bar"></div> + </div> </div> <div id="bottom"> diff --git a/static/css/fedora.css b/static/css/fedora.css index 0ff9ac7..4888ed5 100644 --- a/static/css/fedora.css +++ b/static/css/fedora.css @@ -114,11 +114,55 @@ pre display: block; } +/* Customisations for Home Page */ .home #nav-home a, .get #nav-get a, .join #nav-join a, .help #nav-help a { color: #777777; text-decoration: none; } +.home #sidebar { padding-bottom: 0; + margin-bottom: 1em; + } +.home #content { + margin-top: -7em; + position: relative; + text-align: justify; + } +.home #current_release { + float: left; + width: 45%; + padding-right: 0.4em; + border-right: 1px dotted #AAAAAA; + } +.home #next_release { + margin-left: 47%; + padding-left: 0.6em; + } +.home #content h2 { + line-height: 1em; + color: #ccc; + font-style: italic; + } +.home .off_left { + margin-left: -0.75em; + /* Make IE display content in negative margin */ + position: relative; + width: 100%; + } +.home #content h3 { margin: -0.25em 0 0 0; + position: relative; + width: 100%; + color: #0548a0; + font-size: 1.7em; + } +.home #content p { margin: 0 1em 1.2em 0; } +/* Keeps footer from covering a floated div when narrow page width */ +.home .float_blocker_bar { + width: 100%; + clear: left; + height: 1px; + } +/* End Home Page customisations */ #content { @@ -293,6 +337,8 @@ pre #screenshot-banner { text-align: left; + width: 100%; + overflow: hidden; } input, textarea, select -- 1.6.6.1

--- index.html | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/index.html b/index.html index ecb6771..9fed174 100644 --- a/index.html +++ b/index.html @@ -115,6 +115,8 @@ <div id="current_release"> <h2 class="off_left">Current Release</h2> +<h3>Fedora 12 - 'Constantine'</h3> +<p>Take the <a href="https://fedoraproject.org/wiki/Fedora_12_tour">Fedora 12 Tour</a> and for more details read the <a href="http://docs.fedoraproject.org/release-notes/f12/en-US/html/&qu... notes</a>. Try it before you install with Live Media (<a href="http://fedoraproject.org/en/get-fedora-all#live_media">...;, <a href="https://fedoraproject.org/wiki/How_to_create_and_use_Live_USB&...>). Then <a href="http://fedoraproject.org/en/get-fedora">download it</a> and install.</p> </div> <div id="next_release"> -- 1.6.6.1

--- index.html | 7 +++++++ static/css/fedora.css | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/index.html b/index.html index 31060cb..0575c6f 100644 --- a/index.html +++ b/index.html @@ -58,6 +58,13 @@ <li><a href="http://fedoraproject.org/wiki/Communicate">Communicate... Speak with Fedora.</li> <li><a href="http://fedoraproject.org/wiki/FedoraEvents">Events<... Meet the Fedora community.</li> </ul> + <div id="p-search"> + <h2><label for="searchInput">Search</label></h2> + <form action="https://fedoraproject.org/wiki/Special:Search" id="searchform"> + <input id="searchInput" name="search" type="text" title="Search FedoraProject [f]" accesskey="f" value="" /> + <input type='submit' name="go" class="searchButton" id="searchGoButton" value="Go" /> + </form> + </div> <h2>Website Language</h2> <form action="index.html" method="GET"> <div> diff --git a/static/css/fedora.css b/static/css/fedora.css index 4888ed5..92b64ba 100644 --- a/static/css/fedora.css +++ b/static/css/fedora.css @@ -162,6 +162,10 @@ pre clear: left; height: 1px; } +.home #searchInput { + width: 10em; + margin: 0 0 0.3em 0; + } /* End Home Page customisations */ #content -- 1.6.6.1

--- index.html | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/index.html b/index.html index ecd5e15..a96e811 100644 --- a/index.html +++ b/index.html @@ -125,6 +125,8 @@ <h3>Fedora 12 - 'Constantine'</h3> <p>Take the <a href="https://fedoraproject.org/wiki/Fedora_12_tour">Fedora 12 Tour</a> and for more details read the <a href="http://docs.fedoraproject.org/release-notes/f12/en-US/html/&qu... notes</a>. Try it before you install with Live Media (<a href="http://fedoraproject.org/en/get-fedora-all#live_media">...;, <a href="https://fedoraproject.org/wiki/How_to_create_and_use_Live_USB&...>). Then <a href="http://fedoraproject.org/en/get-fedora">download it</a> and install.</p> <p>People customise Fedora to showcase a collection of software, from games to designing electronics take a look at <a href="http://spins.fedoraproject.org/">Fedora "spins"</a>.</p> +<h4>Get Involved</h4> +<p>Follow the thoughts of other Fedora users at <a href="http://planet.fedoraproject.org/">Planet Fedora</a>. To start to become involved <a href="https://bugzilla.redhat.com/">report a bug</a> or become a <a href="http://fedoraproject.org/wiki/Bugs">bug zapper</a> or many <a href="http://fedoraproject.org/join-fedora">more roles</a>.</p> </div> <div id="next_release"> -- 1.6.6.1

--- index.html | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/index.html b/index.html index 8c1199b..4f746e9 100644 --- a/index.html +++ b/index.html @@ -135,6 +135,9 @@ <h3>Fedora 13 - 'Goddard'</h3> <p>Fedora follows a <a href="https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle"... cycle</a> of every six months or so. Expect test releases and the final release to be on <a href="https://fedoraproject.org/wiki/Releases/13/Schedule">t... dates</a>.</p> <p>These are the <a href="https://fedoraproject.org/wiki/Releases/13/FeatureList"&g... features</a>. You can <a href="https://fedoraproject.org/wiki/Features/Policy">add a new feature</a>, but please also use <a href="https://fedoraproject.org/wiki/BugsAndFeatureRequests#Enhancem... requests</a> and check the <a href="https://fedoraproject.org/wiki/Package_maintainers_wishlist&qu... maintainers wishlist</a>.</p> +<h4>Follow Development</h4> +<p>Current test release: <a href="http://fedoraproject.org/get-prerelease">Beta release</a></p> +<p>Keep up to date with <a href="http://fedoraproject.org/wiki/FWN/LatestIssue">Fedora Weekly News</a> and the <a href="https://admin.fedoraproject.org/updates/">Fedora Update System</a>, for software packages.</p> </div> <div class="float_blocker_bar"></div> </div> -- 1.6.6.1