Commit:    a934174f4d43c72e652bdb593b67a261f6875d83
Author:    Levi Morrison <[email protected]>         Sun, 15 Dec 2013 11:27:28 -0700
Parents:   f57ce47b09e816f1f848f10b9eb5d5c6813ef871
Branches:  master

Link:       
http://git.php.net/?p=web/php.git;a=commitdiff;h=a934174f4d43c72e652bdb593b67a261f6875d83

Log:
Fixed merge conflict.

Changed paths:
  M  build-setup.php
  M  docs.php
  M  downloads.php
  M  get-involved.php
  M  include/footer.inc
  M  include/header.inc
  M  index.php
  M  releases/index.php
  M  styles/home.css
  M  styles/theme-base.css
  M  styles/theme-medium.css
  M  support.php

diff --git a/build-setup.php b/build-setup.php
index 90757c8..b59f33c 100644
--- a/build-setup.php
+++ b/build-setup.php
@@ -4,10 +4,14 @@ $_SERVER['BASE_PAGE'] = 'get-involved.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
 
 $SIDEBAR_DATA ='
+<div class="panel">
+  <div class="body">
     <p>
       This page is intended to help setup a development environment for PHP, 
if mistakes are found
       please <a href="http://bugs.php.net";>report</a> them.
     </p>
+  </div>
+</div>
 ';
 
 site_header("Get Involved", array("current" => "community"));
diff --git a/docs.php b/docs.php
index 678855f..d2c39fb 100644
--- a/docs.php
+++ b/docs.php
@@ -7,7 +7,7 @@ site_header("Documentation", array("current" => "docs"));
 
 ?>
 
-<h1 class="content-header">Documentation</h1>
+<h1>Documentation</h1>
 <div class="content-box">
 
 <p>
diff --git a/downloads.php b/downloads.php
index 1d2ca80..7acc73f 100644
--- a/downloads.php
+++ b/downloads.php
@@ -51,24 +51,26 @@ $SIDEBAR_DATA = '
 <p class="panel"><a href="/git.php">Development sources (git)</a></p>
 <p class="panel"><a href="/releases/">Old archives</a></p>
 
-<div class="otherbins">
-<p class="announcements">
- We do not distribute UNIX/Linux binaries. Most Linux
- distributions come with PHP these days, so if you do
- not want to compile your own, go to your distribution\'s
- download site. Binaries available on external servers:
-</p>
-<p class="panel"><a href="http://windows.php.net";>Windows Binaries</a></p>
-<ul class="toc">
- <li class="panel"><a href="http://www.ampps.com/";>Mac OS X (AMPPS)</a></li>
- <li class="panel"><a href="http://www.mamp.info/";>Mac OS X (MAMP)</a></li>
- <li class="panel"><a href="http://bitnami.com/stack/mamp";>Mac OS X 
(BitNami)</a></li>
- <li class="panel"><a href="http://bitnami.com/stack/wamp";>Windows 
(BitNami)</a></li>
- <li class="panel"><a href="http://bitnami.com/stack/lamp";>Linux 
(BitNami)</a></li>
- <li class="panel"><a href="http://www.opencsw.org/packages/php5";>Solaris 
OpenCSW packages</a></li>
- <li class="panel"><a href="http://iuscommunity.org/";>Redhat/CentOS Binaries 
(IUS)</a></li>
- <li class="panel"><a 
href="http://rpms.famillecollet.com/";>Fedora/Redhat/CentOS Binaries 
(Remi)</a></li>
-</ul>
+<div class="panel">
+  <p class="headline">Binaries</p>
+  <div class="body">
+    <p>
+     We do not distribute UNIX/Linux binaries. Most Linux
+     distributions come with PHP these days, so if you do
+     not want to compile your own, go to your distribution\'s
+     download site. Binaries available on external servers:
+    </p>
+    <ul>
+      <li><a href="http://www.ampps.com/";>Mac OS X (AMPPS)</a></li>
+      <li><a href="http://www.mamp.info/";>Mac OS X (MAMP)</a></li>
+      <li><a href="http://bitnami.com/stack/mamp";>Mac OS X (BitNami)</a></li>
+      <li><a href="http://bitnami.com/stack/wamp";>Windows (BitNami)</a></li>
+      <li><a href="http://bitnami.com/stack/lamp";>Linux (BitNami)</a></li>
+      <li><a href="http://www.opencsw.org/packages/php5";>Solaris OpenCSW 
packages</a></li>
+      <li><a href="http://iuscommunity.org/";>Redhat/CentOS Binaries 
(IUS)</a></li>
+      <li><a href="http://rpms.famillecollet.com/";>Fedora/Redhat/CentOS 
Binaries (Remi)</a></li>
+    </ul>
+  </div>
 </div>
 
 
diff --git a/get-involved.php b/get-involved.php
index 452493a..c3abcf4 100644
--- a/get-involved.php
+++ b/get-involved.php
@@ -55,16 +55,20 @@ site_header("Get Involved", array("current" => 
"community"));
 
 <?php
 $SIDEBAR_DATA ='
-    <p class="panel"><a href="build-setup.php">Developer Setup Help</a></p>
-<h3 class="announcements">Useful links for developers:</h3>
-  <ul class="content-box">
-   <li><a href="http://lxr.php.net";>lxr</a> - an online interface to the
+<div class="panel"><a href="build-setup.php">Developer Setup Help</a></div>
+<div class="panel">
+  <div class="headline">Useful links for developers:</div>
+  <div class="body">
+    <ul>
+     <li><a href="http://lxr.php.net";>lxr</a> - an online interface to the
        PHP source, providing search facilities useful for programmers and 
researchers</li>
-   <li><a href="https://wiki.php.net/rfc/howto";>The RFC process</a> - the 
process
+     <li><a href="https://wiki.php.net/rfc/howto";>The RFC process</a> - the 
process
        by which developers can suggest and discuss new ideas with the 
community</li>
-   <li><a href="/build-setup.php">Developer Setup Help</a> - some helpful 
information
+     <li><a href="/build-setup.php">Developer Setup Help</a> - some helpful 
information
        regarding setting up a development environment for PHP</li>
-  </ul>
+    </ul>
+  </div>
+</div>
 ';
 
 site_footer(array('sidebar'=>$SIDEBAR_DATA));
diff --git a/include/footer.inc b/include/footer.inc
index 078a695..b3f2e1b 100644
--- a/include/footer.inc
+++ b/include/footer.inc
@@ -17,7 +17,6 @@
 <?php endif; ?>
 
   </div><!-- layout -->
-  </div>
          
   <footer>
     <div class="container footer-content">
diff --git a/include/header.inc b/include/header.inc
index 1f07257..1391d04 100755
--- a/include/header.inc
+++ b/include/header.inc
@@ -67,8 +67,7 @@ if (isset($shortname) && $shortname) {
 
 <nav id="head-nav" class="navbar navbar-inverse navbar-fixed-top">
   <div class="navbar-inner">
-    <div class="container">
-      <div class="row-fluid">
+      <div class="row">
         <a href="/" class="brand"><img src="/images/logo.php" width="48" 
height="24" alt="php"></a>
         <div id="mainmenu-toggle-overlay"></div>
         <input type="checkbox" id="mainmenu-toggle">
@@ -78,19 +77,18 @@ if (isset($shortname) && $shortname) {
           <li class="<?php echo $curr == "community" ? "active" : ""?>"><a 
href="/get-involved" >Get Involved</a></li>
           <li class="<?php echo $curr == "help" ? "active" : ""?>"><a 
href="/support">Help</a></li>
         </ul>
-        <form class="navbar-search span3" id="topsearch" action="/search.php">
+        <form class="navbar-search" id="topsearch" action="/search.php">
             <input type="hidden" name="show" value="quickref">
             <input type="search" name="pattern" class="search-query" 
placeholder="Search" accesskey="s">
         </form>
       </div>
-    </div>
   </div>
 <div id="flash-message">
 </div>
 </nav>
 
 <?php if (!empty($config['breadcrumbs'])): ?>
-  <div id="breadcrumbs" class="container">
+  <div id="breadcrumbs">
     <?php if (isset($config['prev'])): ?>
       <div class="prev">
         <a href="<?php echo $config['prev'][0]; ?>">
@@ -120,20 +118,19 @@ if (isset($shortname) && $shortname) {
 <?php endif; ?>
 
 
-
 <?php if (!empty($config['intro'])):?>
-<div id="intro">
+<div id="intro" class="clearfix">
   <div class="container">
     <?php echo $config['intro'];?>
   </div>
 </div>
 <?php endif;?>
 
-<div id="layout" class="container">
 
-  <div class="row-fluid">
+<div id="layout">
+
 <?php if (!empty($config["leftmenu"])): ?>
-    <aside class='layout-menu span3'>
+    <aside class='layout-menu'>
         
         <ul class='parent-menu-list'>
             <?php foreach($config['leftmenu'] as $section): ?>
@@ -161,4 +158,4 @@ if (isset($shortname) && $shortname) {
     </aside>
 <?php endif; ?>
 
-<section id="layout-content" class="<?php echo $curr ?> span<?php echo 
$config['layout_span']; ?>">
+<section id="layout-content">
diff --git a/index.php b/index.php
index 6add41c..9091332 100644
--- a/index.php
+++ b/index.php
@@ -77,13 +77,13 @@ $content .= '<p class="archive"><a href="/archive/">Older 
News Entries</a></p>';
 $content .= "</div>";
 
 $intro = <<<EOF
-  <div class="row-fluid">
-    <div class="span9 blurb">
+  <div class="row clearfix">
+    <div class="blurb">
       <p>PHP is a popular general-purpose scripting language that is 
especially suited to web development.</p>
       <p>Fast, flexible and pragmatic, PHP powers everything from your blog to 
the most popular websites in the world.</p>
     </div>
-    <div class="background span3"></div>
-    <div class="span3">
+    <div class="background"></div>
+    <div class="download">
       <div class="download-php">
         <h2>Download PHP</h2>
 
@@ -155,14 +155,15 @@ if (is_array($CONF_TEASER)) {
     );
     $announcements = "";
     foreach($CONF_TEASER as $category => $entries) {
-        if ($entries) {
-            $announcements .= '<div class="panel headline">';
-            $announcements .= '<a href="/conferences" class="headline">' . 
$conftype[$category] .'</a><ul class="announcements">';
+               if ($entries) {
+            $announcements .= '<div class="panel">';
+            $announcements .= '  <a href="/conferences" class="headline">' . 
$conftype[$category] .'</a>';
+            $announcements .= '<div class="body"><ul>';
             foreach (array_slice($entries, 0, 4) as $url => $title) {
                 $title = preg_replace("'([A-Za-z0-9])([\s\:\-\,]*?)call 
for(.*?)$'i", "$1", $title);
                 $announcements .= "<li><a href='$url'>$title</a></li>";
             }
-            $announcements .= '</ul>';
+            $announcements .= '</ul></div>';
             $announcements .= '</div>';
         }
     }
diff --git a/releases/index.php b/releases/index.php
index 091cd92..a1a7c81 100644
--- a/releases/index.php
+++ b/releases/index.php
@@ -73,17 +73,15 @@ $eol = implode('', array_slice($eol, 0, 2));
 
 $SIDEBAR_DATA = '
 
-<div class="announcements">
-<h3>End of Life Dates</h3>
- The most recent branches to reach end of life status are:
-
-<ul>'.$eol.'</ul>
+<div class="panel">
+  <a class="headline" href="/eol.php">End of Life Dates</a>
+  <div class="body">
+    <p>The most recent branches to reach end of life status are:</p>
+    <ul>'.$eol.'</ul>
+  </div>
 </div>
 
 <p class="panel">
- <a href="/eol.php">End Of Life dates</a>
-</p>
-<p class="panel">
  <a href="/ChangeLog-5.php">PHP 5 ChangeLog</a>
 </p>
 <p class="panel">
@@ -94,11 +92,13 @@ $SIDEBAR_DATA = '
  <a href="http://museum.php.net/";>PHP Museum</a>
 </div>
 
-<div class="announcements">
- <strong>Want a PHP serialize()d list of the PHP releases?</strong><br />
- <p>Add <a href="?serialize=1">?serialize=1</a> to the url</p>
- <p>Only want PHP 5 releases? <a 
href="?serialize=1&version=5">&version=5</a></p>
- <p>The last 3? <a href="?serialize=1&version=5&max=3">&max=3</a></p>
+<div class="panel">
+  <div class="headline">Want a PHP serialize()d list of the PHP releases?</div>
+  <div class="body">
+    <p>Add <a href="?serialize=1">?serialize=1</a> to the url</p>
+    <p>Only want PHP 5 releases? <a 
href="?serialize=1&version=5">&version=5</a></p>
+    <p>The last 3? <a href="?serialize=1&version=5&max=3">&max=3</a></p>
+  </div>
 </div>
 ';
 
diff --git a/styles/home.css b/styles/home.css
index f3b3dbc..b991297 100644
--- a/styles/home.css
+++ b/styles/home.css
@@ -15,6 +15,13 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82   
 CCDA99
     line-height:1.2;
     margin-bottom:1.2em;
 }   
+#intro .row > div {
+  display:table-cell;
+  float:none;
+}
+#intro .blurb {
+  vertical-align: middle;
+}
 #intro .blurb p {
     line-height:1.8;
 } 
@@ -30,12 +37,19 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82  
  CCDA99
     letter-spacing:3px;
     word-spacing:6px;
 }
-#intro .row-fluid {
-    position:relative;
+#intro .row {
+  position:relative;
+  display:table-row;
 }
+
 #intro .background {
   display:none;
 }
+@media (min-width: 758px) {
+  #intro .background {
+    display:block;
+  }
+}
 #intro .download-php {
     text-align:left;
     margin:0 1.5em;
@@ -64,25 +78,11 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82  
  CCDA99
 
 
 .newsentry {
-    margin: 1em 0;
+    margin: 0 0 2.25em;
     position: relative;
 }
-.newscontent {
-    padding: 0 0.75em;
-    border-top: solid 0.125em rgb(102, 102, 153);
-    border-bottom: solid 1px rgb(202, 202, 227);
-    background-color: rgb(238, 238, 246);
-    -moz-border-radius: 0 0 2px 2px;
-    border-radius: 0 0 2px 2px;
-    box-shadow: 2px 0 2px -2px rgb(212, 212, 232) inset, -2px 0 2px -2px 
rgb(212, 212, 232) inset;
-}
 .newsentry h3 {
-    color: #333;
-    font-size: 1.125em;
-    line-height: 1.33;
-    margin: 0;
-    padding: 0;
-    font-weight:normal;
+  font-weight:normal;
 }
 .newsentry h3 .release-state {
     float: right;
@@ -90,8 +90,6 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82    
CCDA99
 }
 .newsentry h3 a {
     color: #000;
-    padding: .35em 0em;
-    display: block;
     border:0;
 }
 .newsentry .newstitle a::after  {
@@ -101,6 +99,7 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82   
 CCDA99
 .newsentry .newstime {
     float:right;
     margin-top:.5em;
+    margin-right:.444444444em;
 }
 
 .newsentry .newsimage a {
diff --git a/styles/theme-base.css b/styles/theme-base.css
index 7a7e167..ff98550 100755
--- a/styles/theme-base.css
+++ b/styles/theme-base.css
@@ -191,336 +191,11 @@ textarea {
     page-break-after: avoid;
   }
 }
-.row {
-  margin-left: -20px;
-  *zoom: 1;
-}
-.row:before,
-.row:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.row:after {
-  clear: both;
-}
-[class*="span"] {
-  float: left;
-  min-height: 1px;
-  margin-left: 20px;
-}
-.container,
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
-}
-.span12 {
-  width: 940px;
-}
-.span11 {
-  width: 860px;
-}
-.span10 {
-  width: 780px;
-}
-.span9 {
-  width: 700px;
-}
-.span8 {
-  width: 620px;
-}
-.span7 {
-  width: 540px;
-}
-.span6 {
-  width: 460px;
-}
-.span5 {
-  width: 380px;
-}
-.span4 {
-  width: 300px;
-}
-.span3 {
-  width: 220px;
-}
-.span2 {
-  width: 140px;
-}
-.span1 {
-  width: 60px;
-}
-.offset12 {
-  margin-left: 980px;
-}
-.offset11 {
-  margin-left: 900px;
-}
-.offset10 {
-  margin-left: 820px;
-}
-.offset9 {
-  margin-left: 740px;
-}
-.offset8 {
-  margin-left: 660px;
-}
-.offset7 {
-  margin-left: 580px;
-}
-.offset6 {
-  margin-left: 500px;
-}
-.offset5 {
-  margin-left: 420px;
-}
-.offset4 {
-  margin-left: 340px;
-}
-.offset3 {
-  margin-left: 260px;
-}
-.offset2 {
-  margin-left: 180px;
-}
-.offset1 {
-  margin-left: 100px;
-}
-.row-fluid {
-  width: 100%;
-  *zoom: 1;
-}
-.row-fluid:before,
-.row-fluid:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.row-fluid:after {
-  clear: both;
-}
-.row-fluid [class*="span"] {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  float: left;
-  margin-left: 2.127659574468085%;
-  *margin-left: 2.074468085106383%;
-}
-.row-fluid [class*="span"]:first-child {
-  margin-left: 0;
-}
-.row-fluid .controls-row [class*="span"] + [class*="span"] {
-  margin-left: 2.127659574468085%;
-}
-.row-fluid .span12 {
-  width: 100%;
-  *width: 99.94680851063829%;
-}
-.row-fluid .span11 {
-  width: 91.48936170212765%;
-  *width: 91.43617021276594%;
-}
-.row-fluid .span10 {
-  width: 82.97872340425532%;
-  *width: 82.92553191489361%;
-}
-.row-fluid .span9 {
-  width: 74.46808510638297%;
-  *width: 74.41489361702126%;
-}
-.row-fluid .span8 {
-  width: 65.95744680851064%;
-  *width: 65.90425531914893%;
-}
-.row-fluid .span7 {
-  width: 57.44680851063829%;
-  *width: 57.39361702127659%;
-}
-.row-fluid .span6 {
-  width: 48.93617021276595%;
-  *width: 48.88297872340425%;
-}
-.row-fluid .span5 {
-  width: 40.42553191489362%;
-  *width: 40.37234042553192%;
-}
-.row-fluid .span4 {
-  width: 31.914893617021278%;
-  *width: 31.861702127659576%;
-}
-.row-fluid .span3 {
-  width: 23.404255319148934%;
-  *width: 23.351063829787233%;
-}
-.row-fluid .span2 {
-  width: 14.893617021276595%;
-  *width: 14.840425531914894%;
-}
-.row-fluid .span1 {
-  width: 6.382978723404255%;
-  *width: 6.329787234042553%;
-}
-.row-fluid .offset12 {
-  margin-left: 104.25531914893617%;
-  *margin-left: 104.14893617021275%;
-}
-.row-fluid .offset12:first-child {
-  margin-left: 102.12765957446808%;
-  *margin-left: 102.02127659574467%;
-}
-.row-fluid .offset11 {
-  margin-left: 95.74468085106382%;
-  *margin-left: 95.6382978723404%;
-}
-.row-fluid .offset11:first-child {
-  margin-left: 93.61702127659574%;
-  *margin-left: 93.51063829787232%;
-}
-.row-fluid .offset10 {
-  margin-left: 87.23404255319149%;
-  *margin-left: 87.12765957446807%;
-}
-.row-fluid .offset10:first-child {
-  margin-left: 85.1063829787234%;
-  *margin-left: 84.99999999999999%;
-}
-.row-fluid .offset9 {
-  margin-left: 78.72340425531914%;
-  *margin-left: 78.61702127659572%;
-}
-.row-fluid .offset9:first-child {
-  margin-left: 76.59574468085106%;
-  *margin-left: 76.48936170212764%;
-}
-.row-fluid .offset8 {
-  margin-left: 70.2127659574468%;
-  *margin-left: 70.10638297872339%;
-}
-.row-fluid .offset8:first-child {
-  margin-left: 68.08510638297872%;
-  *margin-left: 67.9787234042553%;
-}
-.row-fluid .offset7 {
-  margin-left: 61.70212765957446%;
-  *margin-left: 61.59574468085106%;
-}
-.row-fluid .offset7:first-child {
-  margin-left: 59.574468085106375%;
-  *margin-left: 59.46808510638297%;
-}
-.row-fluid .offset6 {
-  margin-left: 53.191489361702125%;
-  *margin-left: 53.085106382978715%;
-}
-.row-fluid .offset6:first-child {
-  margin-left: 51.063829787234035%;
-  *margin-left: 50.95744680851063%;
-}
-.row-fluid .offset5 {
-  margin-left: 44.68085106382979%;
-  *margin-left: 44.57446808510638%;
-}
-.row-fluid .offset5:first-child {
-  margin-left: 42.5531914893617%;
-  *margin-left: 42.4468085106383%;
-}
-.row-fluid .offset4 {
-  margin-left: 36.170212765957444%;
-  *margin-left: 36.06382978723405%;
-}
-.row-fluid .offset4:first-child {
-  margin-left: 34.04255319148936%;
-  *margin-left: 33.93617021276596%;
-}
-.row-fluid .offset3 {
-  margin-left: 27.659574468085104%;
-  *margin-left: 27.5531914893617%;
-}
-.row-fluid .offset3:first-child {
-  margin-left: 25.53191489361702%;
-  *margin-left: 25.425531914893618%;
-}
-.row-fluid .offset2 {
-  margin-left: 19.148936170212764%;
-  *margin-left: 19.04255319148936%;
-}
-.row-fluid .offset2:first-child {
-  margin-left: 17.02127659574468%;
-  *margin-left: 16.914893617021278%;
-}
-.row-fluid .offset1 {
-  margin-left: 10.638297872340425%;
-  *margin-left: 10.53191489361702%;
-}
-.row-fluid .offset1:first-child {
-  margin-left: 8.51063829787234%;
-  *margin-left: 8.404255319148938%;
-}
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
-  display: none;
-}
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
-  float: right;
-}
-.container {
-  margin-right: auto;
-  margin-left: auto;
-  *zoom: 1;
-}
-.container:before,
-.container:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.container:after {
-  clear: both;
-}
-.container-fluid {
-  padding-right: 20px;
-  padding-left: 20px;
-  *zoom: 1;
-}
-.container-fluid:before,
-.container-fluid:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.container-fluid:after {
-  clear: both;
-}
 .navbar {
   overflow: visible;
-  margin-bottom: 20px;
   *position: relative;
   *z-index: 2;
 }
-.navbar-inner {
-  min-height: 40px;
-  padding-left: 20px;
-  padding-right: 20px;
-  *zoom: 1;
-}
-.navbar-inner:before,
-.navbar-inner:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.navbar-inner:after {
-  clear: both;
-}
-.navbar .container {
-  width: auto;
-}
 .nav-collapse.collapse {
   height: auto;
   overflow: visible;
@@ -531,7 +206,7 @@ textarea {
   height: 1.5em;
   padding: .75em;
   color: #fff;
-  text-shadow: 0 1px 0 #ffffff;
+  text-shadow: 0 1px 0 #fff;
 }
 .navbar .brand:hover,
 .navbar .brand:focus {
@@ -553,7 +228,7 @@ textarea {
   height: 40px;
   margin: 0 9px;
   border-left: 1px solid #f2f2f2;
-  border-right: 1px solid #ffffff;
+  border-right: 1px solid #fff;
 }
 .navbar .btn,
 .navbar .btn-group {
@@ -624,11 +299,6 @@ textarea {
   position: static;
   margin-bottom: 0;
 }
-.navbar-static-top .navbar-inner {
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
 .navbar-fixed-top,
 .navbar-fixed-bottom {
   position: fixed;
@@ -639,13 +309,7 @@ textarea {
 }
 .navbar-fixed-top .navbar-inner,
 .navbar-fixed-bottom .navbar-inner {
-  padding-left: 0;
-  padding-right: 0;
-}
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
+  margin:0 auto;
 }
 .navbar-fixed-top {
   top: 0;
@@ -686,7 +350,7 @@ textarea {
   padding: .75em;
   color: #777777;
   text-decoration: none;
-  text-shadow: 0 1px 0 #ffffff;
+  text-shadow: 0 1px 0 #fff;
 }
 .navbar .nav .dropdown-toggle .caret {
   margin-top: 8px;
@@ -713,7 +377,7 @@ textarea {
   padding: 7px 10px;
   margin-left: 5px;
   margin-right: 5px;
-  color: #ffffff;
+  color: #fff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   background-color: #ededed;
   background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
@@ -739,7 +403,7 @@ textarea {
 .navbar .btn-navbar.active,
 .navbar .btn-navbar.disabled,
 .navbar .btn-navbar[disabled] {
-  color: #ffffff;
+  color: #fff;
   background-color: #e5e5e5;
   *background-color: #d9d9d9;
 }
@@ -775,7 +439,7 @@ textarea {
   display: inline-block;
   border-left: 6px solid transparent;
   border-right: 6px solid transparent;
-  border-bottom: 6px solid #ffffff;
+  border-bottom: 6px solid #fff;
   position: absolute;
   top: -6px;
   left: 10px;
@@ -788,7 +452,7 @@ textarea {
   top: auto;
 }
 .navbar-fixed-bottom .nav > li > .dropdown-menu:after {
-  border-top: 6px solid #ffffff;
+  border-top: 6px solid #fff;
   border-bottom: 0;
   bottom: -6px;
   top: auto;
@@ -836,7 +500,7 @@ textarea {
   margin-left: 0;
   margin-right: -1px;
 }
-.navbar-inverse .navbar-inner {
+.navbar .navbar-inner {
   background-color: #99c;
 }
 .navbar-inverse .brand,
@@ -849,7 +513,7 @@ textarea {
 .navbar-inverse .nav > li > a:hover,
 .navbar-inverse .brand:focus,
 .navbar-inverse .nav > li > a:focus {
-  color: #ffffff;
+  color: #fff;
 }
 .navbar-inverse .brand {
   color: #eef;
@@ -860,12 +524,12 @@ textarea {
 .navbar-inverse .nav > li > a:focus,
 .navbar-inverse .nav > li > a:hover {
   background-color: transparent;
-  color: #ffffff;
+  color: #fff;
 }
 .navbar-inverse .nav .active > a,
 .navbar-inverse .nav .active > a:hover,
 .navbar-inverse .nav .active > a:focus {
-  color: #ffffff;
+  color: #fff;
   background-color: #669;
 }
 .navbar-inverse .navbar-link {
@@ -873,7 +537,7 @@ textarea {
 }
 .navbar-inverse .navbar-link:hover,
 .navbar-inverse .navbar-link:focus {
-  color: #ffffff;
+  color: #fff;
 }
 .navbar-inverse .divider-vertical {
   border-left-color: #111111;
@@ -883,12 +547,12 @@ textarea {
 .navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
 .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
   background-color: #111111;
-  color: #ffffff;
+  color: #fff;
 }
 .navbar-inverse .nav li.dropdown > a:hover .caret,
 .navbar-inverse .nav li.dropdown > a:focus .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
+  border-top-color: #fff;
+  border-bottom-color: #fff;
 }
 .navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
   border-top-color: #999999;
@@ -897,13 +561,13 @@ textarea {
 .navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
 .navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
 .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
+  border-top-color: #fff;
+  border-bottom-color: #fff;
 }
 .navbar-inverse .navbar-search .search-query {
   background-color: #fff;
   color: #333;
-  text-shadow: 0 1px 0 #ffffff;
+  text-shadow: 0 1px 0 #fff;
   border:0;
   border-radius:2px;
   -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.2);
@@ -923,7 +587,7 @@ textarea {
   color: #999;
 }
 .navbar-inverse .btn-navbar {
-  color: #ffffff;
+  color: #fff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   background-color: #0e0e0e;
   background-image: -moz-linear-gradient(top, #151515, #040404);
@@ -933,7 +597,7 @@ textarea {
   background-image: linear-gradient(to bottom, #151515, #040404);
   background-repeat: repeat-x;
   filter: 
progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', 
endColorstr='#ff040404', GradientType=0);
-  border-color: #040404 #040404 #000000;
+  border-color: #040404 #040404 #000;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   *background-color: #040404;
   /* Darken IE7 buttons by default so they stand out more given they won't 
have borders */
@@ -946,1104 +610,121 @@ textarea {
 .navbar-inverse .btn-navbar.active,
 .navbar-inverse .btn-navbar.disabled,
 .navbar-inverse .btn-navbar[disabled] {
-  color: #ffffff;
+  color: #fff;
   background-color: #040404;
-  *background-color: #000000;
+  *background-color: #000;
 }
 .navbar-inverse .btn-navbar:active,
-.navbar-inverse .btn-navbar.active {
-  background-color: #000000 \9;
-}
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  font-size: 18px;
-  font-weight: 200;
-  line-height: 30px;
-  color: inherit;
-  background-color: #eeeeee;
-}
-.hero-unit h1 {
-  margin-bottom: 0;
-  font-size: 60px;
-  line-height: 1;
-  color: inherit;
-  letter-spacing: -1px;
-}
-.hero-unit li {
-  line-height: 30px;
-}
-@-ms-viewport {
-  width: device-width;
-}
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-.visible-phone {
-  display: none !important;
-}
-.visible-tablet {
-  display: none !important;
-}
-.hidden-desktop {
-  display: none !important;
-}
-.visible-desktop {
-  display: inherit !important;
-}
-@media (min-width: 768px) and (max-width: 979px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important ;
-  }
-  .visible-tablet {
-    display: inherit !important;
-  }
-  .hidden-tablet {
-    display: none !important;
-  }
-}
-@media (max-width: 767px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important;
-  }
-  .visible-phone {
-    display: inherit !important;
-  }
-  .hidden-phone {
-    display: none !important;
-  }
-}
-.visible-print {
-  display: none !important;
-}
-@media print {
-  .visible-print {
-    display: inherit !important;
-  }
-  .hidden-print {
-    display: none !important;
-  }
-}
-@media (max-width: 767px) {
-  body {
-    padding-left: 20px;
-    padding-right: 20px;
-  }
-  .container-fluid {
-    padding: 0;
-  }
-  .dl-horizontal dt {
-    float: none;
-    clear: none;
-    width: auto;
-    text-align: left;
-  }
-  .dl-horizontal dd {
-    margin-left: 0;
-  }
-  .container {
-    width: auto;
-    padding: 0px 10px 0px 10px;
-  }
-  .row-fluid {
-    width: 100%;
-  }
-  .row,
-  .thumbnails {
-    margin-left: 0;
-  }
-  .thumbnails > li {
-    float: none;
-    margin-left: 0;
-  }
-  [class*="span"],
-  .uneditable-input[class*="span"],
-  .row-fluid [class*="span"] {
-    float: none;
-    display: block;
-    width: 100%;
-    margin-left: 0;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-  }
-  .span12,
-  .row-fluid .span12 {
-    width: 100%;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-  }
-  .row-fluid [class*="offset"]:first-child {
-    margin-left: 0;
-  }
-  .input-large,
-  .input-xlarge,
-  .input-xxlarge,
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    display: block;
-    width: 100%;
-    min-height: 30px;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-  }
-  .input-prepend input,
-  .input-append input,
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    display: inline-block;
-    width: auto;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 0;
-  }
-  .modal {
-    position: fixed;
-    top: 20px;
-    left: 20px;
-    right: 20px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade {
-    top: -100px;
-  }
-  .modal.fade.in {
-    top: 20px;
-  }
-}
-@media (max-width: 480px) {
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-  .page-header h1 small {
-    display: block;
-    line-height: 20px;
-  }
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-  .form-horizontal .control-label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  .form-horizontal .control-list {
-    padding-top: 0;
-  }
-  .form-horizontal .form-actions {
-    padding-left: 10px;
-    padding-right: 10px;
-  }
-  .media .pull-left,
-  .media .pull-right {
-    float: none;
-    display: block;
-    margin-bottom: 10px;
-  }
-  .media-object {
-    margin-right: 0;
-    margin-left: 0;
-  }
-  .modal {
-    top: 10px;
-    left: 10px;
-    right: 10px;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-  .carousel-caption {
-    position: static;
-  }
-  #intro .download-php { margin: 0; }
-}
-@media (min-width: 768px) and (max-width: 979px) {
-  .row {
-    margin-left: -20px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    content: "";
-    line-height: 0;
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 20px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 724px;
-  }
-  .span12 {
-    width: 724px;
-  }
-  .span11 {
-    width: 662px;
-  }
-  .span10 {
-    width: 600px;
-  }
-  .span9 {
-    width: 538px;
-  }
-  .span8 {
-    width: 476px;
-  }
-  .span7 {
-    width: 414px;
-  }
-  .span6 {
-    width: 352px;
-  }
-  .span5 {
-    width: 290px;
-  }
-  .span4 {
-    width: 228px;
-  }
-  .span3 {
-    width: 166px;
-  }
-  .span2 {
-    width: 104px;
-  }
-  .span1 {
-    width: 42px;
-  }
-  .offset12 {
-    margin-left: 764px;
-  }
-  .offset11 {
-    margin-left: 702px;
-  }
-  .offset10 {
-    margin-left: 640px;
-  }
-  .offset9 {
-    margin-left: 578px;
-  }
-  .offset8 {
-    margin-left: 516px;
-  }
-  .offset7 {
-    margin-left: 454px;
-  }
-  .offset6 {
-    margin-left: 392px;
-  }
-  .offset5 {
-    margin-left: 330px;
-  }
-  .offset4 {
-    margin-left: 268px;
-  }
-  .offset3 {
-    margin-left: 206px;
-  }
-  .offset2 {
-    margin-left: 144px;
-  }
-  .offset1 {
-    margin-left: 82px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    content: "";
-    line-height: 0;
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    width: 100%;
-    min-height: 30px;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    float: left;
-    margin-left: 2.7624309392265194%;
-    *margin-left: 2.709239449864817%;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 2.7624309392265194%;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.43646408839778%;
-    *width: 91.38327259903608%;
-  }
-  .row-fluid .span10 {
-    width: 82.87292817679558%;
-    *width: 82.81973668743387%;
-  }
-  .row-fluid .span9 {
-    width: 74.30939226519337%;
-    *width: 74.25620077583166%;
-  }
-  .row-fluid .span8 {
-    width: 65.74585635359117%;
-    *width: 65.69266486422946%;
-  }
-  .row-fluid .span7 {
-    width: 57.18232044198895%;
-    *width: 57.12912895262725%;
-  }
-  .row-fluid .span6 {
-    width: 48.61878453038674%;
-    *width: 48.56559304102504%;
-  }
-  .row-fluid .span5 {
-    width: 40.05524861878453%;
-    *width: 40.00205712942283%;
-  }
-  .row-fluid .span4 {
-    width: 31.491712707182323%;
-    *width: 31.43852121782062%;
-  }
-  .row-fluid .span3 {
-    width: 22.92817679558011%;
-    *width: 22.87498530621841%;
-  }
-  .row-fluid .span2 {
-    width: 14.3646408839779%;
-    *width: 14.311449394616199%;
-  }
-  .row-fluid .span1 {
-    width: 5.801104972375691%;
-    *width: 5.747913483013988%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.52486187845304%;
-    *margin-left: 105.41847889972962%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.76243093922652%;
-    *margin-left: 102.6560479605031%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.96132596685082%;
-    *margin-left: 96.8549429881274%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.1988950276243%;
-    *margin-left: 94.09251204890089%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.39779005524862%;
-    *margin-left: 88.2914070765252%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.6353591160221%;
-    *margin-left: 85.52897613729868%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.8342541436464%;
-    *margin-left: 79.72787116492299%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 77.07182320441989%;
-    *margin-left: 76.96544022569647%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 71.2707182320442%;
-    *margin-left: 71.16433525332079%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.50828729281768%;
-    *margin-left: 68.40190431409427%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.70718232044199%;
-    *margin-left: 62.600799341718584%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.94475138121547%;
-    *margin-left: 59.838368402492065%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 54.14364640883978%;
-    *margin-left: 54.037263430116376%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.38121546961326%;
-    *margin-left: 51.27483249088986%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.58011049723757%;
-    *margin-left: 45.47372751851417%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.81767955801105%;
-    *margin-left: 42.71129657928765%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 37.01657458563536%;
-    *margin-left: 36.91019160691196%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.25414364640884%;
-    *margin-left: 34.14776066768544%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.45303867403315%;
-    *margin-left: 28.346655695309746%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.69060773480663%;
-    *margin-left: 25.584224756083227%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.88950276243094%;
-    *margin-left: 19.783119783707537%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.12707182320442%;
-    *margin-left: 17.02068884448102%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.32596685082873%;
-    *margin-left: 11.219583872105325%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.56353591160221%;
-    *margin-left: 8.457152932878806%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 20px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 710px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 648px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 586px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 524px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 462px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 400px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 338px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 276px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 214px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 152px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 90px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 28px;
-  }
-}
-@media (min-width: 1200px) {
-  .row {
-    margin-left: -30px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    content: "";
-    line-height: 0;
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 30px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 1170px;
-  }
-  .span12 {
-    width: 1170px;
-  }
-  .span11 {
-    width: 1070px;
-  }
-  .span10 {
-    width: 970px;
-  }
-  .span9 {
-    width: 870px;
-  }
-  .span8 {
-    width: 770px;
-  }
-  .span7 {
-    width: 670px;
-  }
-  .span6 {
-    width: 570px;
-  }
-  .span5 {
-    width: 470px;
-  }
-  .span4 {
-    width: 370px;
-  }
-  .span3 {
-    width: 270px;
-  }
-  .span2 {
-    width: 170px;
-  }
-  .span1 {
-    width: 70px;
-  }
-  .offset12 {
-    margin-left: 1230px;
-  }
-  .offset11 {
-    margin-left: 1130px;
-  }
-  .offset10 {
-    margin-left: 1030px;
-  }
-  .offset9 {
-    margin-left: 930px;
-  }
-  .offset8 {
-    margin-left: 830px;
-  }
-  .offset7 {
-    margin-left: 730px;
-  }
-  .offset6 {
-    margin-left: 630px;
-  }
-  .offset5 {
-    margin-left: 530px;
-  }
-  .offset4 {
-    margin-left: 430px;
-  }
-  .offset3 {
-    margin-left: 330px;
-  }
-  .offset2 {
-    margin-left: 230px;
-  }
-  .offset1 {
-    margin-left: 130px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    content: "";
-    line-height: 0;
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    width: 100%;
-    min-height: 30px;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    float: left;
-    margin-left: 2.564102564102564%;
-    *margin-left: 2.5109110747408616%;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 2.564102564102564%;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.45299145299145%;
-    *width: 91.39979996362975%;
-  }
-  .row-fluid .span10 {
-    width: 82.90598290598291%;
-    *width: 82.8527914166212%;
-  }
-  .row-fluid .span9 {
-    width: 74.35897435897436%;
-    *width: 74.30578286961266%;
-  }
-  .row-fluid .span8 {
-    width: 65.81196581196582%;
-    *width: 65.75877432260411%;
-  }
-  .row-fluid .span7 {
-    width: 57.26495726495726%;
-    *width: 57.21176577559556%;
-  }
-  .row-fluid .span6 {
-    width: 48.717948717948715%;
-    *width: 48.664757228587014%;
-  }
-  .row-fluid .span5 {
-    width: 40.17094017094017%;
-    *width: 40.11774868157847%;
-  }
-  .row-fluid .span4 {
-    width: 31.623931623931625%;
-    *width: 31.570740134569924%;
-  }
-  .row-fluid .span3 {
-    width: 23.076923076923077%;
-    *width: 23.023731587561375%;
-  }
-  .row-fluid .span2 {
-    width: 14.52991452991453%;
-    *width: 14.476723040552828%;
-  }
-  .row-fluid .span1 {
-    width: 5.982905982905983%;
-    *width: 5.929714493544281%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.12820512820512%;
-    *margin-left: 105.02182214948171%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.56410256410257%;
-    *margin-left: 102.45771958537915%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.58119658119658%;
-    *margin-left: 96.47481360247316%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.01709401709402%;
-    *margin-left: 93.91071103837061%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.03418803418803%;
-    *margin-left: 87.92780505546462%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.47008547008548%;
-    *margin-left: 85.36370249136206%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.48717948717949%;
-    *margin-left: 79.38079650845607%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 76.92307692307693%;
-    *margin-left: 76.81669394435352%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 70.94017094017094%;
-    *margin-left: 70.83378796144753%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.37606837606839%;
-    *margin-left: 68.26968539734497%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.393162393162385%;
-    *margin-left: 62.28677941443899%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.82905982905982%;
-    *margin-left: 59.72267685033642%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 53.84615384615384%;
-    *margin-left: 53.739770867430444%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.28205128205128%;
-    *margin-left: 51.175668303327875%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.299145299145295%;
-    *margin-left: 45.1927623204219%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.73504273504273%;
-    *margin-left: 42.62865975631933%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 36.75213675213675%;
-    *margin-left: 36.645753773413354%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.18803418803419%;
-    *margin-left: 34.081651209310785%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.205128205128204%;
-    *margin-left: 28.0987452264048%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.641025641025642%;
-    *margin-left: 25.53464266230224%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.65811965811966%;
-    *margin-left: 19.551736679396257%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.094017094017094%;
-    *margin-left: 16.98763411529369%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.11111111111111%;
-    *margin-left: 11.004728132387708%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.547008547008547%;
-    *margin-left: 8.440625568285142%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 30px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 1156px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 1056px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 956px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 856px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 756px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 656px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 556px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 456px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 356px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 256px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 156px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 56px;
-  }
-  .thumbnails {
-    margin-left: -30px;
-  }
-  .thumbnails > li {
-    margin-left: 30px;
-  }
-  .row-fluid .thumbnails {
-    margin-left: 0;
-  }
+.navbar-inverse .btn-navbar.active {
+  background-color: #000;
 }
-@media (max-width: 979px) {
-  body {
-    padding-top: 0;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: static;
-  }
-  .navbar-fixed-bottom .navbar-inner {
-    padding: 0 5px;
-  }
-  .navbar .container {
-    padding: 0;
-  }
-  .navbar .brand {
-    padding-left: 10px;
-    padding-right: 10px;
-    margin: 0 0 0 -5px;
-  }
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 30px;
+  color: inherit;
+  background-color: #eeeeee;
+}
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  color: inherit;
+  letter-spacing: -1px;
+}
+.hero-unit li {
+  line-height: 30px;
+}
+@-ms-viewport {
+  width: device-width;
+}
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+.visible-phone {
+  display: none !important;
+}
+.visible-tablet {
+  display: none !important;
+}
+.hidden-desktop {
+  display: none !important;
+}
+.visible-desktop {
+  display: inherit !important;
+}
+
+#intro .container {
+  margin:0 auto;
+}
+
+@media (max-width: 480px) {
   .nav-collapse {
-    clear: both;
-  }
-  .nav-collapse .nav {
-    float: none;
-    margin: 0 0 10px;
-  }
-  .nav-collapse .nav > li {
-    float: none;
-  }
-  .nav-collapse .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > .divider-vertical {
-    display: none;
-  }
-  .nav-collapse .nav .nav-header {
-    color: #777777;
-    text-shadow: none;
-  }
-  .nav-collapse .nav > li > a,
-  .nav-collapse .dropdown-menu a {
-    padding: 9px 15px;
-    font-weight: bold;
-    color: #777777;
-  }
-  .nav-collapse .btn {
-    padding: 4px 10px 4px;
-    font-weight: normal;
-  }
-  .nav-collapse .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > li > a:hover,
-  .nav-collapse .nav > li > a:focus,
-  .nav-collapse .dropdown-menu a:hover,
-  .nav-collapse .dropdown-menu a:focus {
-    background-color: #f2f2f2;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a,
-  .navbar-inverse .nav-collapse .dropdown-menu a {
-    color: #999999;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a:hover,
-  .navbar-inverse .nav-collapse .nav > li > a:focus,
-  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
-  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
-    background-color: #111111;
-  }
-  .nav-collapse.in .btn-group {
-    margin-top: 5px;
-    padding: 0;
-  }
-  .nav-collapse .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    float: none;
-    display: none;
-    max-width: none;
-    margin: 0 15px;
-    padding: 0;
-    background-color: transparent;
-    border: none;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
-  }
-  .nav-collapse .open > .dropdown-menu {
-    display: block;
-  }
-  .nav-collapse .dropdown-menu:before,
-  .nav-collapse .dropdown-menu:after {
-    display: none;
+    -webkit-transform: translate3d(0, 0, 0);
   }
-  .nav-collapse .dropdown-menu .divider {
-    display: none;
+  #intro .download-php { margin: 0; }
+}
+@media (min-width: 768px) and (max-width: 979px) {
+  .hidden-desktop {
+    display: inherit !important;
   }
-  .nav-collapse .nav > li > .dropdown-menu:before,
-  .nav-collapse .nav > li > .dropdown-menu:after {
-    display: none;
+  .visible-desktop {
+    display: none !important ;
   }
-  .nav-collapse .navbar-form,
-  .nav-collapse .navbar-search {
-    float: none;
-    padding: 10px 15px;
-    margin: 10px 0;
-    border-top: 1px solid #f2f2f2;
-    border-bottom: 1px solid #f2f2f2;
-    -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 
rgba(255,255,255,.1);
-    -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 
rgba(255,255,255,.1);
-    box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 
rgba(255,255,255,.1);
+  .visible-tablet {
+    display: inherit !important;
   }
-  .navbar-inverse .nav-collapse .navbar-form,
-  .navbar-inverse .nav-collapse .navbar-search {
-    border-top-color: #111111;
-    border-bottom-color: #111111;
+  .hidden-tablet {
+    display: none !important;
   }
-  .navbar .nav-collapse .nav.pull-right {
-    float: none;
-    margin-left: 0;
+}
+@media (max-width: 767px) {
+  .hidden-desktop {
+    display: inherit !important;
   }
-  .nav-collapse,
-  .nav-collapse.collapse {
-    overflow: hidden;
-    height: 0;
+  .visible-desktop {
+    display: none !important;
   }
-  .navbar .btn-navbar {
-    display: block;
+  .visible-phone {
+    display: inherit !important;
   }
-  .navbar-static .navbar-inner {
-    padding-left: 10px;
-    padding-right: 10px;
+  .hidden-phone {
+    display: none !important;
   }
 }
+@media (max-width: 767px) {
+}
+@media (min-width: 768px) and (max-width: 979px) {
+}
+@media (max-width: 979px) {
+}
 @media (min-width: 980px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-  body {
-    padding-top:3.25em;
-  }
+}
+@media (min-width: 1200px) {
 }
 @media (min-width: 1500px) {
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 1440px;
-  }
-  #topsearch.navbar-search {
-    margin-right: 0;
-  }
-  #intro .blurb {
-    width: 1170px;
-  }
 }
 
 body, input, textarea {
     font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
 }
 code,
-pre.info {
-    font: normal 14px / 1.46 "Source Code Pro", monospace; 
-}
-    
+pre.info,
 .docs .classsynopsis,
 .docs .classsynopsis code {
     font: normal 14px / 1.46 "Source Code Pro", monospace; 
 }
 
-
-
 body {
     font-size: 1em;
     line-height: 1.5;
     padding-left:0;
     padding-right:0;
     padding-bottom:0;
-    margin:0;
+    margin:3.25em 0 0;
 }
 
 button,
@@ -2198,7 +879,7 @@ hr {
 
 /* Notes themselves. */
 #usernotes .note {
-    margin: .75em 0;
+    margin: 1.5em 0;
     position: relative;
 }
 
@@ -2325,14 +1006,24 @@ pre.info {
 
 
 #layout {
-    margin: .75em auto 1.5em;
+    margin: 0 auto 1.5em;
     clear:both;
 }
 
 .layout-menu {
-    float: left;
-    padding:.5em .75em 1.5em;
+    padding:.625em .75em 1.5em;
     border: 1px solid;
+    border-top:0;
+    border-right:0;
+    -moz-box-sizing:border-box;
+    box-sizing:border-box;
+}
+#layout-content {
+  padding:1.5em;
+  border:1px solid;
+  border-top:0;
+  -moz-box-sizing:border-box;
+  box-sizing:border-box;
 }
 
 /**
@@ -2426,6 +1117,7 @@ div.elephpants img {
 table {
   border-collapse: collapse;
   border-spacing: 0;
+  margin:0 0 1.5em;
 }
 table td {
   vertical-align:top;
@@ -2434,14 +1126,16 @@ table td {
 table.standard {
     border-collapse: collapse;
     border-style: hidden;
+    border:1px solid #d9d9d9;
 }
 
-table.standard td, table.standard th {
-    border: 1px solid #ddd;
+table.standard td,
+table.standard th {
+    border: 1px solid #d9d9d9;
 }
 
 table.standard tr:nth-child(even) td {
-    background-color: #fcfcfc;
+    background-color: #f2f2f2;
 }
 
 table.standard th {
@@ -2473,12 +1167,6 @@ table.standard th.subr {
     text-align: right;
 }
 
-.spanning-content {
-    width:960px;
-    margin: 0 auto;
-    clear:both;
-}
-
 /* {{{ Search results. */
 
 /* Undo a whole bunch of default styles. */
@@ -2839,24 +1527,8 @@ fieldset {
 }
 /* }}} */
 
-.content-box {
-    margin: .25em 0 2em;
-    background-color: rgb(238, 238, 246);
-    display: block;
-    float: none;
-    border-top: solid 0.125em rgb(102, 102, 153);
-    border-bottom: solid 1px rgb(202, 202, 227);
-    -moz-border-radius: 0 0 2px 2px;
-    border-radius: 0 0 2px 2px;
-    padding: 0.75em 0.625em;
-    box-shadow: 2px 0 2px -2px rgb(212, 212, 232) inset, -2px 0 2px -2px 
rgb(212, 212, 232) inset;
-}
-.content-header {
-    color: #333;
-    font-size: 1.125em;
-    line-height: 1.33;
-    margin: 0;
-    padding: 0;
+.downloads .content-box {
+  margin:0 0 2.25em;
 }
 .content-header .release-state {
     float: right;
@@ -2865,25 +1537,6 @@ fieldset {
 .content-header .changelog {
     color:#369;
 }
-.content-box ul {
-    list-style: none;
-    display: block;
-}
-.content-box ul,
-.content-box li {
-    margin: 0;
-    padding: 0;
-}
-.listed {
-    list-style: disc;
-    display: block;
-}
-.listed li {
-    margin: 10px 30px;
-}
-.content-box li {
-    margin-bottom: 0.75em;
-}
 .content-box .md5sum {
     display: block;
     font: normal 14px / 1.46 "Source Code Pro", monospace;
@@ -2910,7 +1563,17 @@ fieldset {
     }
 }
 
-
+.home .newsentry h3,
+.downloads .content-header,
+.refsect1 h3.title {
+  padding:0.333333333em 0.444444444em;
+  border-radius:0 0 2px 2px;
+  border-top:2px solid #669;
+  border-bottom:1px solid #D2D2D9;
+  box-shadow:
+    inset 2px 0 2px -2px #D2D2D9,
+    inset -2px 0 2px -2px #D2D2D9;
+}
 .refsect1 > *:last-child {
     margin-bottom:0;
 }
@@ -3106,29 +1769,8 @@ ul.chunklist_children {
     position:relative;
 }
 
-.docs .refentry .refpurpose {
-    display:none;
-    padding: .75em .625em;
-    border-top: .125em solid;
-    border-bottom: 1px solid;
-}
-
-.refsect1 h3.title {
-    position: absolute;
-    top:-2em;
-    left: 0;
-}
-
-.docs .classsynopsis,
-.refsect1 {
-    position: relative;
-    padding: .75em .625em;
-    border-top:0.125em solid;
-    border-bottom:1px solid;
-}
-
 .refsect1 {
-    margin-top: 3em;
+    margin: 1.5em 0 2.25em;
 }
 
 .docs .classsynopsis {
@@ -3232,15 +1874,20 @@ div.soft-deprecation-notice blockquote.sidebar {
 }
 
 #breadcrumbs {
+    -moz-box-sizing:border-box;
+    box-sizing:border-box;
     border:1px solid;
     border-top:0;
     margin:0 auto;
     font-size:.875em;
     line-height:1.71428571428571;
+    display:none;
 }
 #breadcrumbs ul {
-    padding:.5em .75em;
-    margin:.5em 0;
+    margin:0;
+    padding:.5em;
+    padding-left: 1.714285714em;
+    overflow: hidden;
 }
 #breadcrumbs div {
     padding:.5em .75em;
@@ -3258,59 +1905,64 @@ div.soft-deprecation-notice blockquote.sidebar {
 }
 
 #breadcrumbs .prev {
-    float: left;
-    min-width: 23.4043%;
-    margin-right: 2.1276%;
+    -moz-box-sizing: border-box;
     box-sizing: border-box;
 }
 #breadcrumbs .next {
     float: right;
 }
-#breadcrumbs .breadcrumbs-container {
-    /* Prevent the breadcrumbs from wrapping around the previous link. */
-    overflow: hidden;
-}
 @media (max-width:767px) {
-    #breadcrumbs {
-        display: none;
-    }
+}
+@media (min-width: 768px) {
+  #breadcrumbs {
+    display:block;
+  }
+  #breadcrumbs .prev,
+  .navbar-search,
+  #intro .download,
+  #intro .background,
+  aside.tips,
+  .layout-menu {
+    width: 25%;
+    float: left;
+  }
+
+  #intro .blurb,
+  #layout-content {
+    float:left;
+    width:75%;
+  }
 }
 @media (min-width: 768px) and (max-width: 979px) {
-    #breadcrumbs .prev {
-        min-width: 22.9282%;
-        margin-right: 2.7624%;
-    }
 }
 @media (min-width: 1200px) {
-    #breadcrumbs .prev {
-        min-width: 18%;
-        margin-right: 1%;
-    }
-}
+  #intro .container,
+  .navbar-inner,
+  #breadcrumbs,
+  #layout {
+    width:1170px;
+  }
+  #breadcrumbs .prev,
+  .navbar-search,
+  #intro .download,
+  #intro .background,
+  aside.tips,
+  .layout-menu {
+    width: 20%;
+  }
 
-/* Re-layout the breadcrumbs using flexbox if it's available. */
-.flexbox #breadcrumbs .breadcrumbs-container,
-.flexboxlegacy #breadcrumbs .breadcrumbs-container {
-    display: -webkit-box;
-    display: -moz-box;
-    display: -ms-flexbox;
-    display: -webkit-flex;
-    display: flex;
-    padding: 0 0.625em 0 0;
-}
-.flexbox #breadcrumbs .breadcrumbs-container li:last-child,
-.flexboxlegacy #breadcrumbs .breadcrumbs-container li:last-child {
-    -moz-box-flex: 1 0 auto;
-    -webkit-box-flex: 1 0 auto;
-    -webkit-flex: 1 0 auto;
-    -ms-flex: 1 0 auto;
-    flex: 1 0 auto;
-}
-.flexbox #breadcrumbs .breadcrumbs-container li,
-.flexboxlegacy #breadcrumbs .breadcrumbs-container li {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+  #intro .blurb,
+  #layout-content {
+    width:80%;
+  }
+}
+@media (min-width: 1500px) {
+  #intro .container,
+  .navbar-inner,
+  #breadcrumbs,
+  #layout {
+    width:1440px;
+  }
 }
 
 #mainmenu-toggle-overlay, #mainmenu-toggle {
@@ -3434,52 +2086,23 @@ div.soft-deprecation-notice blockquote.sidebar {
   .navbar-search .search-query {
     width:100%;
   }
-  #intro .container > .row-fluid:before,
-  #intro .container > .row-fluid:after {
-     display:none;
-     content:none;
-  }
   #intro .container {
     position:relative;
   }
-  #intro .container > .row-fluid {
-    display:table-row;
-  }
-  #intro .container > .row-fluid > div[class*=span] {
-    display:table-cell;
-    float:none;
-  }
-  #intro .container > .row-fluid > .span9 {
-    vertical-align:middle;
-  }
 }
 
 @media (max-width: 979px) and (min-width: 768px) {
-  #intro .download-php .row-fluid .span6 {
-    width:100%;
-    margin:0;
-  }
   #intro .download-php a.btn-pop {
     padding-right:.375em;
   }
 }
 @media (min-width:980px) {
-  #intro .download-php .row-fluid {
-    margin-bottom:1em;
-  }
 }
 @media (min-width:1200px) {
   #intro p {
     line-height:1.2;
     margin:0 0 1.2em;
   }
-  body.docs .row-fluid .layout-menu.span3 {
-    width:18%;
-  }
-  body.docs .row-fluid #layout-content.span9 {
-    width:81%;
-    margin-left:1%;
-  }
 }
 @media (min-width:1548px) {
   #layout {
@@ -3488,80 +2111,51 @@ div.soft-deprecation-notice blockquote.sidebar {
 }
 
 /* {{{ Right-hand sidebar */
-aside.tips ul {
-    list-style:none;
-    margin: 0;
+aside.tips {
+  -moz-box-sizing:border-box;
+  box-sizing:border-box;
+}
+aside.tips p {
+  margin-top:0;
 }
 aside.tips .panel {
     margin:0.66666666666667em 0;
     background:#f0f0f0;
-    border:1px solid #e3e3e3;
-    border-bottom-color:#d6d6d6;
+    border:1px solid #d9d9d9;
+    border-bottom-color:#d0d0d0;
     border-radius:2px;
 }
 
-aside.tips .panel a {
+aside.tips .panel > a {
     color:#333;
+    border-bottom:0;
     display: block;
-    padding: .75em 1em;
-}
-aside.tips .panel span {
-    display: block;
-    padding: .75em 1em;
-}
-aside.tips .panel .announcements a {
-  padding: 0;
-  border: 0;
-  margin: 0;
-  line-height: 1;
 }
-aside.tips .panel a:hover,
-aside.tips .panel a:focus {
+aside.tips .panel > a:hover,
+aside.tips .panel > a:focus {
     color:#369;
-    background:#ebebf4;
-    border-color:#dbdbeb;
-    border-bottom-color:#cacae2;
-}
-aside.tips div.headline a.headline,
-aside.tips div.headline a.headline:hover {
-  background-color: #f0f0f0;
-  line-height: 1;
-  border: 0px;
+    background:#f9f9f9;
 }
-
-aside.tips a {
-    border-bottom:0;
+aside.tips .panel .headline,
+.panel .body,
+aside.tips .panel > a {
+    padding:.75em 1em;
+    margin:0;
 }
 /* Announcement Area */
 
-aside.tips {
-    background:transparent;
-    padding:0;
-    border:0;
-}
 aside.tips div.inner {
-    padding:0;
+    padding:0 0 0 .75em;
     clear:none;
     border:0;
     background:inherit;
 }
-.announcements {
-    display: block;
-    background-color: #ebebf4;
-    border-top:1px solid #dbdbeb;
-    border-bottom-color:#cacae2;
-    border-radius: 0 0 2px 2px;
-    padding: 1em;
-    margin: 0;
-    list-style: none;
-}
-.announcements li + li {
-    margin-top:.75em;
+.panel .body {
+  background-color: #f9f9f9;
+  border-top:1px solid #d9d9d9;
 }
-.announcements ul, .announcements ul li {
-    list-style: none;
-    margin: 0;
-    padding: 0;
+.panel .body:first-child {
+  border-top:0;
 }
 
 /* }}} */
diff --git a/styles/theme-medium.css b/styles/theme-medium.css
index fcbf44b..bfa8912 100755
--- a/styles/theme-medium.css
+++ b/styles/theme-medium.css
@@ -2,7 +2,7 @@
  *
  *  COLORS:       | HEX     |
  * ---------------+---------+
- *  light-purple  | #eeeef6 |
+ *  light-purple  | #ebebf2 |
  * ---------------+---------+
  *  medium-purple | #9999cc |
  * ---------------+---------+
@@ -17,9 +17,12 @@ html {
 }
 
 body {
+  background:#ebebf2;
+  color: #262626;
+}
+#layout-content {
   background:#fff;
-  color: black;
-  overflow-x: hidden;
+  border-color:#ccc;
 }
 
 abbr {
@@ -81,28 +84,6 @@ h1.refname {
   color: #669;
 }
 
-.refentry .refpurpose {
-  background-color:#F0F0F0;
-  border-top-color: #737373;
-  border-bottom:1px solid #D6D6D6;
-  border-radius:0 0 2px 2px;
-  box-shadow:
-    inset 2px 0 2px -2px #D6D6D6,
-    inset -2px 0 2px -2px #D6D6D6;
-}
-
-.classsynopsis,
-.refsect1 {
-  background-color: #eeeef6;
-  color: #262626;
-  border-top-color: #669;
-  border-bottom-color: #cacae3;
-  -moz-border-radius:0 0 2px 2px;
-  border-radius:0 0 2px 2px;
-  box-shadow:
-    inset 2px 0 2px -2px #d4d4e8,
-    inset -2px 0 2px -2px #d4d4e8;
-}
 
 .interfacename a,
 .fieldsynopsis .type,
@@ -125,8 +106,12 @@ h1.refname {
   color:#f80;
 }
 
+.home .newsentry h3,
+.home .newsentry h3 a,
+.downloads .content-header,
 .refsect1 h3.title {
-  color: #262626;
+  color: #446;
+  background: #ebebf2;
 }
 
 .methodname b,
@@ -201,6 +186,7 @@ div.warning:before {
 /* {{{ Navbar */
 .navbar {
   border-color:#669;
+  background:#99c;
   box-shadow: 0 .25em .25em  rgba(0,0,0,.1);
 }
 /* }}} */
@@ -231,8 +217,8 @@ div.warning:before {
   border-top-color: #d9d9d9;
   border-bottom-color: #d9d9d9;
   box-shadow:
-    inset 2px 0 2px -2px #e0e0e0,
-    inset -2px 0 2px -2px #e0e0e0;
+    inset 2px 0 2px -2px #d9d9d9,
+    inset -2px 0 2px -2px #d9d9d9;
 }
 #usernotes .note .votes .tally {
   color: #262626;
@@ -265,7 +251,7 @@ div.warning:before {
   background-color: #ffffff;
 }
 .doctable tbody tr:nth-child(even) {
-  background-color: #eeeef6;
+  background-color: #ebebf2;
 }
 /* }}} */
 
@@ -274,7 +260,7 @@ div.warning:before {
 .example-contents > [class$="code"],
 .example-contents.screen {
   background-color: #f2f2f2;
-  border-color: #d6d6d6 !important;
+  border-color: #d0d0d0 !important;
   border-top-color: #cdcdcd !important;
 }
 .refsect1 .example-contents > [class$="code"],
@@ -284,7 +270,7 @@ div.warning:before {
 .refsect1 .dc-description,
 .docs .sect1 .dc-description {
     background:#fff;
-    border-color: #e0e0e0;
+    border-color: #d9d9d9;
     border-top-color:#d9d9d9;
 }
 .phpcode span.html {
@@ -381,10 +367,8 @@ aside.tips div.border {
 /* {{{ Breadcrumbs */
 #breadcrumbs {
     color: #737373;
-    background-color: #eeeef6;
-    border-color: #d4d4e8;
-    border-bottom-color: #cacae3;
-    border-radius:0 0 2px 2px;
+    background-color: #f2f2f2;
+    border-color: #ccc;
 }
 #breadcrumbs li:last-child a {
     color:#262626;
@@ -395,9 +379,8 @@ aside.tips div.border {
 /* {{{ Layout menu Left-hand sidebar */
 .layout-menu {
   background-color:#f2f2f2;
-  border-color: #e0e0e0;
-  border-bottom-color:#d9d9d9;
-  border-radius:2px;
+  border-color: #ccc;
+  border-bottom-color:#bfbfbf;
 }
 .layout-menu ul.parent-menu-list a {
   color: #262626;
@@ -411,7 +394,7 @@ aside.tips div.border {
   color:#000;
 }
 .layout-menu ul.child-menu-list a {
-  border-bottom-color: #BDBDBD;
+  border-bottom-color: #808080;
 }
 .layout-menu ul.child-menu-list .current a {
   color:#669;
diff --git a/support.php b/support.php
index f848217..6b05f51 100644
--- a/support.php
+++ b/support.php
@@ -2,16 +2,34 @@
 // $Id$
 $_SERVER['BASE_PAGE'] = 'support.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+
+$SIDEBAR_DATA ='
+<div class="panel" style="position:fixed">
+  <div class="headline">Table of Contents</div>
+  <div class="body">
+    <ul>
+      <li><a href="#documentation">Documentation</a></li>
+      <li><a href="#books">Books</a></li>
+      <li><a href="#mailing-lists">Mailing Lists</a></li>
+      <li><a href="#newsgroups">Newsgroups</a></li>
+      <li><a href="#user-groups">User Groups</a></li>
+      <li><a href="#events-training">Events &amp; Training</a></li>
+      <li><a href="#irc">IRC</a></li>
+      <!-- Purposefully no link to the webmasters -->
+    </ul>
+  </div>
+</div>
+';
+
 site_header(
     'Getting Help',
     array(
         'current' => 'help',
-        'layout_span' => 12,
     )
 );
 ?>
 
-<h1>Documentation</h1>
+<h2 id="documentation">Documentation</h2>
 
 <p>
  A good place to start is by skimming through the ever-growing list of <a
@@ -20,7 +38,7 @@ site_header(
  href="/docs.php">documentation</a> section.
 </p>
 
-<h1>Books</h1>
+<h2 id="books">Books</h2>
 <p>
  Books are convenient resources to begin exploring or extend your
  PHP knowledge. There are literally thousands of books available in
@@ -33,7 +51,7 @@ site_header(
  and search there.
 </p>
 
-<h1>Mailing Lists</h1>
+<h2 id="mailing-lists">Mailing Lists</h2>
 
 <p>
  There are a number of mailing lists devoted to talking about PHP and related
@@ -42,7 +60,7 @@ site_header(
  subscribe to the lists.
 </p>
 
-<h1>Newsgroups</h1>
+<h2 id="newsgroups">Newsgroups</h2>
 
 <p>
  The PHP language newsgroup is <tt>comp.lang.php</tt>, available on any
@@ -59,7 +77,7 @@ site_header(
  that these newsgroups are only available on this server.
 </p>
 
-<h1>User Groups</h1>
+<h2 id="user-groups">User Groups</h2>
 
 <p>
  Christopher R. Moewes-Bystrom is running a PHP user group registry at <a
@@ -71,7 +89,7 @@ site_header(
  opportunity to get together.
 </p>
 
-<h1>Events &amp; Training</h1>
+<h2 id="events-training">Events &amp; Training</h2>
 
 <p>
  A list of upcoming events (such as user group meetings and PHP training
@@ -81,7 +99,7 @@ site_header(
  href="/submit-event.php">on this page</a>.
 </p>
 
-<h1>Instant Resource Center</h1>
+<h2 id="irc">Instant Resource Center</h2>
 
 <p>
  Otherwise known as IRC or Internet Relay Chat. Here you can usually find
@@ -96,7 +114,7 @@ site_header(
  <a href="http://www.freenode.net/";>freenode</a>).
 </p>
 
-<h1>PHP.net webmasters</h1>
+<h2 id="webmasters">PHP.net webmasters</h2>
 
 <p>
  If you have a problem or suggestion <em>in connection with the PHP.net
@@ -107,4 +125,4 @@ site_header(
  questions.
 </p>
 
-<?php site_footer(); ?>
+<?php site_footer(array('sidebar' => $SIDEBAR_DATA)); ?>
-- 
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to