del web/php: View/HomepageNewsView.php downloads.php get-involved.php include/footer.inc include/header.inc include/layout.inc
include/shared-manual.inc index-beta.php js/common.js styles/bootstrap.css styles/doc.css styles/home.css styles/theme.css views/homepage/sidebar.php

Branch: master Deleted commits count: 2 User: Levi Morrison <levim@php.net> Tue, 09 Jul 2013 03:58:22 +0000 Changed paths: M View/HomepageNewsView.php M downloads.php M get-involved.php M include/footer.inc M include/header.inc M include/layout.inc M include/shared-manual.inc M index-beta.php M js/common.js D styles/bootstrap.css M styles/doc.css M styles/home.css M styles/theme.css M views/homepage/sidebar.php

diff --git b/View/HomepageNewsView.php a/View/HomepageNewsView.php index 0f1d564..f851ab9 100644 --- b/View/HomepageNewsView.php +++ a/View/HomepageNewsView.php @@ -51,9 +51,9 @@ class HomepageNewsView { if ($article->hasCategory('conferences') || $article->hasCategory('cfp')) { $event = " vevent"; } - echo "<div class='newsItem hentry{$event}'> + echo "<div class='newsItem hentry{$event}''> <div class='newsImage'>{$image}</div> - <h2 class='summary entry-title' id='$id'><a name='{$id}' href='{$permanentLink}' rel='bookmark' class='bookmark'>{$title}</a></h2> + <h2 class='summary entry-title'><a name='{$id}' id='{$id}' href='{$permanentLink}' rel='bookmark' class='bookmark'>{$title}</a></h2> <div class='entry-content description'> <abbr class='published newsdate' title='{$publishedDate}''>{$newsDate}</abbr> {$content} diff --git b/downloads.php a/downloads.php index 4b5b531..4d3d91c 100644 --- b/downloads.php +++ a/downloads.php @@ -158,5 +158,5 @@ uid Johannes Schlüter &lt;johannes@schlueters.de&gt; uid Johannes Schlüter &lt;johannes@php.net&gt; </pre> <?php -site_footer(array('sidebar' => $SIDEBAR_DATA)); +site_footer(); diff --git b/get-involved.php a/get-involved.php index 1de2e43..072e43b 100644 --- b/get-involved.php +++ a/get-involved.php @@ -3,19 +3,19 @@ $_SERVER['BASE_PAGE'] = 'get-involved.php'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; -$SIDEBAR_DATA =' - <p> - Ever wondered how the PHP.net project actually works and what it has to offer? - Who is in charge and how decisions are made? The PHP.net project has a lot of - things in the works and is always looking for new talent to join the project, - share new ideas, discuss improvements, fix broken features, look after the - websites, documentation, and so on and on... - </p> -'; - site_header("Get Involved", array("current" => "community")); - ?> + +<aside class="tips"> +<p style="margin: 5px; padding: 5px;"> + Ever wondered how the PHP.net project actually works and what it has to offer? + Who is in charge and how decisions are made? The PHP.net project has a lot of + things in the works and is always looking for new talent to join the project, + share new ideas, discuss improvements, fix broken features, look after the + websites, documentation, and so on and on... +</p> +</aside> + <h2>Improving PHP</h2> <p> This particular article assumes you are running <i>Ubuntu Linux</i>. @@ -153,7 +153,7 @@ directory if you want to learn more about the testing mechanism. <hr /> <h2>Contributing</h2> -<p> +<p style="margin: 5px; padding: 5px;"> The PHP project is so much more than just the scripting language on which it is focused. It is a vibrant community of developers scratching related itches, hoping their work will benefit others. PHP.net hosts a set of projects @@ -163,7 +163,7 @@ directory if you want to learn more about the testing mechanism. </p> -<p> +<p style="margin: 5px; padding: 5px;"> The PHP community is without a doubt, in my opinion, one of the greatest communities in the world. It has a lot to offer besides good friends and a fun working environment. It is a community where things can happen very fast, with @@ -175,7 +175,7 @@ directory if you want to learn more about the testing mechanism. </p> -<p> +<p style="margin: 5px; padding: 5px;"> There are a lot of ways in which you can contribute to and influence the project; participating on mailing lists, filing bug reports, and adding helpful notes to the manual are all examples of valuable contributions. You don't have to @@ -187,14 +187,14 @@ directory if you want to learn more about the testing mechanism. </p> -<p> +<p style="margin: 5px; padding: 5px;"> Before we go deeper into ways you can contribute and how to do so, let's take a step back and look at who actually leads the development and how things are done within PHP.net. </p> -<p> +<p style="margin: 5px; padding: 5px;"> One of things I love most about working with Open Source Software like PHP is the freedom. If I have an itch, I scratch it! If I want to work on new features or document all the kinks and quirks of PHP, I can. We have the @@ -210,7 +210,7 @@ directory if you want to learn more about the testing mechanism. </p> -<p> +<p style="margin: 5px; padding: 5px;"> To gain karma you basically need to prove to the community that you aren't just a nut-job and show that you can be trusted to think not only about today, but tomorrow as well. Being active on the developers' mailing lists, @@ -220,7 +220,7 @@ directory if you want to learn more about the testing mechanism. </p> -<p> +<p style="margin: 5px; padding: 5px;"> All of the PHP.net projects (from PEAR, to PECL, to websites and documentation, to the PHP language itself) have long-time members which could be considered the "leaders" of the respective @@ -233,7 +233,7 @@ directory if you want to learn more about the testing mechanism. </p> -<p> +<p style="margin: 5px; padding: 5px;"> The PHP.net project has mailing lists for most aspects of the project where all important decisions are made. For example discussions and decisions about the language happen on the internals@lists.php.net mailing list @@ -248,7 +248,7 @@ directory if you want to learn more about the testing mechanism. </p> -<p> +<p style="margin: 5px; padding: 5px;"> Although most of the PHP internals contributors make their living writing PHP applications, feedback from other users is crucial to the development of the language; your voice does matter. Keep in mind, however, that flaming @@ -259,7 +259,7 @@ directory if you want to learn more about the testing mechanism. </p> -<p> +<p style="margin: 5px; padding: 5px;"> Even though most of the mailing lists are very active, not everything that is contributed to PHP needs to be approved there first. For example, minor features are often simply committed directly to Git without asking or telling @@ -276,7 +276,7 @@ directory if you want to learn more about the testing mechanism. </p> -<p> +<p style="margin: 5px; padding: 5px;"> To help streamline part of the decision process and keep track of ideas, proposals, and TODO lists, PHP has a wiki located at <a href="http://wiki.php.net">wiki.php.net</a>. This has proven to be a valuable resource when @@ -296,7 +296,7 @@ directory if you want to learn more about the testing mechanism. <h3>So, how to get involved?</h3> -<p> +<p style="margin: 5px; padding: 5px;"> There are a lot of ways you can contribute to the project, it simply depends on what you fancy. </p> <ul> @@ -322,7 +322,8 @@ directory if you want to learn more about the testing mechanism. </li> </ul> -<p> + +<p style="margin: 5px; padding: 5px;"> Getting involved is a lot easier than most people think - and chances are that you are already involved in one way or another. You don't need an Git account and commit access to get started - Git accounts need to be earned. Registering @@ -347,7 +348,7 @@ directory if you want to learn more about the testing mechanism. <ul> <li> <h4>Mailing Lists</h4> - <p> + <p style="margin: 5px; padding: 5px;"> To register with any PHP mailing list, just send a blank email to &lt;listname&gt;-subscribe@lists.php.net. For example if you want to register for the PHP internals developers discussion list, send an email to @@ -361,7 +362,7 @@ directory if you want to learn more about the testing mechanism. </li> <li> <h4>The Bug Tracker</h4> - <p> + <p style="margin: 5px; padding: 5px;"> Filing a bug report is an art. It isn't very complicated, but you do have to think about what you are reporting. Quickly looking through the existing reports to see if your issue has already been reported @@ -383,7 +384,7 @@ directory if you want to learn more about the testing mechanism. </li> <li> <h4>Getting Started With Contributing</h4> - <p> + <p style="margin: 5px; padding: 5px;"> Unsure which task to tackle first? Stuck on a problem? Need a quick brainstorming session? IRC is a very convenient way to get help quickly for smaller things, such as "where was the Git module @@ -400,7 +401,7 @@ directory if you want to learn more about the testing mechanism. </li> <li> <h4>Less Is More</h4> - <p> + <p style="margin: 5px; padding: 5px;"> When you are ready to contribute to the project please don't try to tackle the biggest issues and expect to fix them right away. Start with smaller tasks and learn the ways of the project and @@ -429,7 +430,7 @@ directory if you want to learn more about the testing mechanism. <li>Etc., etc., (etc.)</li> </ul> -<p> +<p style="margin: 5px; padding: 5px;"> If you can't find something on which to work within PHP.net, you will have a hard time finding it elsewhere. Introducing every project is beyond the scope of this article, but we'll cover some of the projects that don't have entry @@ -439,7 +440,7 @@ directory if you want to learn more about the testing mechanism. <h3>The Documentation Project</h3> -<p> +<p style="margin: 5px; padding: 5px;"> The main focus of the documentation project (phpdoc) is to document the PHP language (and PECL extensions) with usage examples, FAQs, and tracking changes in behaviour. The documentation is written in XML using the Docbook format @@ -457,7 +458,7 @@ directory if you want to learn more about the testing mechanism. the French translation list. </p> -<p> +<p style="margin: 5px; padding: 5px;"> A web application, called "PhD Online Editor" (PhD O.E), which aims to help documentation editors focus on the content itself, rather than Docbook and XML logistics, is under development at <a href="https://edit.php.net">edit.php.net</a>. It is getting @@ -475,7 +476,7 @@ directory if you want to learn more about the testing mechanism. functions, and check the translation status of an entry (among other things). </p> -<p> +<p style="margin: 5px; padding: 5px;"> The team is also developing a Docbook rendering engine, called "PHP-based Docbook Rendering" (PhD), to transform the Docbook XML into various different formats, such as HTML, CHM, PDF, Unix manual pages, and the online format you @@ -488,13 +489,13 @@ directory if you want to learn more about the testing mechanism. </p> -<p> +<p style="margin: 5px; padding: 5px;"> Last, but not least: the team also maintains a website on <a href="http://doc.php.net">doc.php.net</a> which aggregates translation statistics, tutorials, and the documentation HOWTO. </p> -<p> +<p style="margin: 5px; padding: 5px;"> The project offers much more than just documentation, and is probably the project to which it is easiest to start contributing. If you enjoy working with XML, PHP, JS, documentation, writing articles, or simply want to dig @@ -503,7 +504,7 @@ directory if you want to learn more about the testing mechanism. <h3>The Websites</h3> -<p> +<p style="margin: 5px; padding: 5px;"> No surprise there, the webmaster team maintains several websites, and is responsible for maintaining the mirroring infrastructure and related tasks. The websites contain a lot of information; everything from user group meet-ups @@ -512,14 +513,14 @@ directory if you want to learn more about the testing mechanism. information, as well as the general entry point for people looking into PHP. </p> -<p> +<p style="margin: 5px; padding: 5px;"> To get up and running is very simple: just follow the points on <a href="http://wiki.php.net/web/mirror">wiki.php.net/web/mirror</a> and you are all set. Once you have poked around a little you can look into the other websites, like qa.php.net, master.php.net and pecl.php.net. </p> -<p> +<p style="margin: 5px; padding: 5px;"> Recently, work on redesigning the main website from the ground-up was started. Unfortunately, this effort has stalled a bit over the past several months due to a lack of contributors interested in being actively involved. @@ -527,7 +528,7 @@ directory if you want to learn more about the testing mechanism. content to make it more accessible. </p> -<p> +<p style="margin: 5px; padding: 5px;"> Joining the redesign effort is a great entry point for those interested in markup, CSS, and general website development. Check out <a href="http://wiki.php.net/web/redesign">wiki.php.net/web/redesign</a> @@ -538,7 +539,7 @@ directory if you want to learn more about the testing mechanism. <h3>Conclusion</h3> -<p> +<p style="margin: 5px; padding: 5px;"> PHP.net has a lot of areas to which you can contribute: everything from hardcore development to managing user-contributed notes in the manual; from debugging issues in bug reports to writing articles about new features @@ -554,7 +555,7 @@ directory if you want to learn more about the testing mechanism. <?php -site_footer(array('sidebar'=>$SIDEBAR_DATA)); +site_footer(); /* vim: set et ts=4 sw=4 ft=php: : */ diff --git b/include/footer.inc a/include/footer.inc index 9258d2c..0dded3f 100644 --- b/include/footer.inc +++ a/include/footer.inc @@ -7,30 +7,20 @@ } ?> -<?php if (!empty($config['sidebar'])): ?> - <aside class="tips span3"> - <div class="border first"></div> - <div class="border second"></div> - <div class="border third"></div> - <div class="inner"><?php echo $config['sidebar']; ?></div> - </aside> -<?php endif; ?> - </div><!-- layout --> - </div> <footer> - <div class="container footer-content"> - <div class="row-fluid"> - <ul class="footmenu"> + <div class="footer-content"> + <ul class="footmenu copyright"> <li><a href="/copyright.php">Copyright &copy; 2001-<?php echo date('Y'); ?> The PHP Group</a></li> + </ul> + <ul class="footmenu"> <li><a href="/my.php">My PHP.net</a></li> <li><a href="/contact.php">Contact</a></li> <li><a href="/sites.php">Other PHP.net sites</a></li> <li><a href="/mirrors.php">Mirror sites</a></li> <li><a href="/privacy.php">Privacy policy</a></li> </ul> - </div> </div> </footer> @@ -42,7 +32,6 @@ } ?> - <script type="text/javascript" src="/js/jquery.scrollto.min.js"></script> </body> diff --git b/include/header.inc a/include/header.inc index 9e19504..4b9297b 100644 --- b/include/header.inc +++ a/include/header.inc @@ -38,8 +38,7 @@ if (isset($shortname) && $shortname) { <link rel="<?php echo $rel ?>" href="<?php echo $MYSITE ?><?php echo $page ?>" /> <?php endforeach ?> - <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/bootstrap.css<?php echo $v?>" media="all" /> - <!--<link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/reset.css<?php echo $v?>" media="all" />--> + <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/reset.css<?php echo $v?>" media="all" /> <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/theme.css<?php echo $v?>" media="screen" /> <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/doc.css<?php echo $v?>" media="screen" /> <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/home.css<?php echo $v?>" media="screen" /> @@ -92,20 +91,166 @@ if (isset($shortname) && $shortname) { </p> </div> -<nav id="headnav" class="navbar navbar-inverse navbar-fixed-top"> - <div class="navbar-inner"> - <div class="container"> - <a href="/" class="brand">php.net</a> - <div clas="nav-collapse collapse"> - <ul class="nav"> - <li class="<?php echo $curr == "downloads" ? "active" : ""?>"><a href="/downloads">Downloads</a></li> - <li class="<?php echo $curr == "docs" ? "active" : ""?>"><a href="/manual/">Documentation</a></li> - <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> +<nav id="headnav"> + + <ul id="headmenu"> + <li id="headsearch"> + <form method="post" action="/search.php" id="topsearch"> + <fieldset> + <input type="search" id="headsearch-keywords" name="pattern" placeholder="Search..." size="30" accesskey="s" /> + <input type="submit" + value="Go" + id="headsearch-submit" + class="submit" /> + </fieldset> + </form> + </li> + <li id="headhome" class="parent <?php echo $curr == "home" ? "current" : ""?>"> + <a href="/" rel="home" class="menu-link">Home</a> + <div class="children downloads"><div class="children-1"><div class="children-2"> + <div class="download"> + <h2>Download PHP</h2> +<?php if(!empty($RELEASES[5])): ?> + <ul class="download-list"> +<?php + foreach ($RELEASES[5] as $version => $release): + $windowsVersionLink = substr($version, 0, strrpos($version, '.')); +?> + <li rel="/downloads.php#v<?php echo $version ?>"> + <a href="/downloads.php#v<?php echo $version ?>" class="version" title="Download PHP">PHP <?php echo $version ?></a> + <a href="/ChangeLog-5.php#<?php echo $version ?>" title="Release Notes for <?php echo $version ?>">Release Notes</a> + <!-- (size) should go here, but it's not in version.inc at present --> + </li> + <?php endforeach; ?> + </ul> +<?php endif; ?> + </div> + <div class="children-left"> + <div class="what-is-php-container"> + <div class="what-is-php downloads-<?php count($RELEASES[5]); ?>"> + <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 largest social networking site in the world. + </p> + <p class="tutorial"><a href="/tut.php">Begin Tutorial &raquo;</a></p> + </div> + </div> + </div> + <br style="clear: both;" /> + </div></div></div> + </li> + <li class="parent <?php echo $curr == "downloads" ? "current" : ""?>"> + <a href="#downloads" class="menu-link">Downloads</a> + <div class="children" id="downloads"> + <div class="children-1"> + <div class="children-2"> + + <dl> + <dt><a href="/downloads.php" title="Current Releases">Current Releases</a></dt> + <dd><a href="http://php.net/downloads.php#5.5" title="PHP 5.5">PHP 5.5</a></dd> + <dd><a href="http://php.net/downloads.php#5.4" title="PHP 5.4">PHP 5.4</a></dd> + <dd><a href="http://php.net/downloads.php#5.3" title="PHP 5.3">PHP 5.3</a></dd> + </dl> + + <dl> + <dt>Development Releases</dt> + <dd><a href="http://www.php.net/git.php" title="Git">Git</a></dd> + <dd><a href="https://github.com/php/php-src/" title="Github">Github</a></dd> + <dd><a href="http://snaps.php.net/" title="Snaps">Snaps</a></dd> + </dl> + + <dl> + <dt>Other Downloads</dt> + <dd><a href="http://www.php.net/releases/" title="Archived Versions">Archived Versions</a></dd> + <dd><a href="http://pecl.php.net/packages.php" title="PECL">PECL</a></dd> + <dd><a href="http://pear.php.net/packages.php" title="PEAR">PEAR</a></dd> + <dd><a href="http://php.net/downloads.php" title="Non-core systems">Non-core systems</a></dd> + </dl> + <br style="clear: both;" /> + + </div> </div> </div> - </div> + </li> + <li class="parent <?php echo $curr == "docs" ? "current" : ""?>"> + <a href="#docs" class="menu-link">Documentation</a> + <div class="children" id="docs"><div class="children-1"><div class="children-2"> + <?php doc_toc($lang); ?> + <br style="clear: both;" /> + </div></div></div> + </li> + <li class="parent <?php echo $curr == "community" ? "current" : ""?>"> + <a href="#community" class="menu-link">Community</a> + <div class="children" id="community"><div class="children-1"><div class="children-2"> + <dl> + <?php news_toc(array('news')) ?> + <dt><a href="/cal.php">Calendar of Events</a></dt> + </dl> + <dl> + <?php news_toc(array('conferences', 'papers')) ?> + </dl> + <dl> + <dt><a href="https://wiki.php.net/">PHP Wiki</a></dt> + <dd><a href="https://wiki.php.net/rfc">Write an RFC</a></dd> + <dt><a href="/get-involved.php">Get Involved</a></dt> + <dd><a href="https://bugs.php.net/how-to-report.php">Report bugs</a></dd> + <dd><a href="https://github.com/php/php-src/blob/master/README.SUBMITTING_PATCH" target="_blank">Contribute code</a></dd> +<!-- <dd><a href="#">Organize an event</a></dd>--> + <dd><a href="https://wiki.php.net/doc/howto">Write documentation</a></dd> + <dd><a href="http://qa.php.net">Test PHP</a></dd> + <dd></dd> + </dl> + <dl> + <dt><a href="/mailing-lists.php">Mailing lists</a></dt> + <dd><a href="/unsub.php">Unsubscribe from mailing list</a></dd> + <dt><a href="#">About PHP.net</a></dt> + <dd><a href="/sites.php">Other PHP.net sites</a></dd> + <dd><a href="/my.php">My PHP.net</a></dd> + <dd><a href="/credits.php">Who's behind this?</a></dd> + <dd><a href="http://people.php.net/">Developers profiles</a></dd> + <dd><a href="/contact.php">Contact us</a></dd> + <dd><a href="/thanks.php">Thanks</a></dd> + </dl> + <br style="clear: both;" /> + </div></div></div> + </li> + <li class="parent <?php echo $curr == "help" ? "current" : ""?>"> + <a href="#support" class="menu-link">Help</a> + <div class="children" id="support"><div class="children-1"><div class="children-2"> + <dl> + <dt><a href="#">Navigation tips</a></dt> + <dd><a href="/sidebars.php">Search sidebars</a></dd> + <dd><a href="/urlhowto.php">URL Howto</a></dd> + <dd><a href="/tips.php">Quick Reference tips</a></dd> + <dd><a href="/sites.php">Other PHP sites</a></dd> + </dl> + <dl> + <dt><a href="#">Support</a></dt> + <dd><a href="/mailing-lists.php">Mailing lists</a></dd> + <dd><a href="/support.php">General resources</a></dd> + <dd><a href="/ChangeLog-5.php">Changelog (PHP 5)</a></dd> + <dd><a href="/git.php">Git (PHP Source)</a></dd> + </dl> + <dl> + <dt><a href="https://bugs.php.net/">Bugs</a></dt> + <dd><a href="https://bugs.php.net/report.php">Report a bug</a></dd> + <dd><a href="https://bugs.php.net/how-to-report.php">How to file a bug report</a></dd> + <dd><a href="https://bugs.php.net/search.php">Search reported bugs</a></dd> + </dl> + <dl> + <dt><a href="/license/index.php">License information</a></dt> + <dd><a href="/license/contrib-guidelines-code.php">Contributor Guidelines</a></dd> + <dd><a href="/license/distrib-guidelines-code.php">Distribution Guidelines</a></dd> + <dd><a href="/software.php">Software covered by the PHP license</a></dd> + </dl> + <br style="clear: both;" /> + </div></div></div> + </li> + + </ul> +<br style="clear: both;" /> </nav> <div id='mega-drop-down'> @@ -113,27 +258,18 @@ if (isset($shortname) && $shortname) { </div> </div> -<?php include 'uservoice.inc' ?> - -<div id="layout" class="container"> -<?php if (!empty($config['breadcrumbs'])): ?> - <div id="breadcrumbs" class="row-fluid"> - <ul> - <?php - $breadcrumbs = $config['breadcrumbs']; - $last = array_pop($breadcrumbs); - foreach ($breadcrumbs as $crumb) { - echo " <li><a href='{$crumb['link']}'>{$crumb['title']}</a> <span class='divider'>/</span></li>"; - } - echo " <li><a href='{$last['link']}'>{$last['title']}</a></li>"; - ?> - </ul> - </div> +<div id="layout"> +<?php if (!empty($SIDEBAR_DATA)): ?> + <aside class="tips"> + <div class="border first"></div> + <div class="border second"></div> + <div class="border third"></div> + <div class="inner"><?php echo $SIDEBAR_DATA; ?></div> + </aside> <?php endif; ?> - - <div class="row-fluid"> + <?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,5 +297,8 @@ if (isset($shortname) && $shortname) { </aside> <?php endif; ?> -<section id="layout-content" class="<?php echo $curr ?> span9"> - +<?php include 'uservoice.inc' ?> + + +<section class="layout-content <?php echo $curr ?>"> + diff --git b/include/layout.inc a/include/layout.inc index e4a9f50..d580c4c 100644 --- b/include/layout.inc +++ a/include/layout.inc @@ -730,7 +730,9 @@ function print_view($templateName, array $params = array()) { $path = $_SERVER['DOCUMENT_ROOT'] . '/views/' . $templateName; if(file_exists($path)) { if(!empty($params)) { - extract($params); + foreach($params as $key => $param) { + $$key = $param; + } } include_once $path; } diff --git b/include/shared-manual.inc a/include/shared-manual.inc index 719c346..a564a1d 100644 --- b/include/shared-manual.inc +++ a/include/shared-manual.inc @@ -554,7 +554,7 @@ VOTEDIV; echo <<<USER_NOTE_TEXT - <div class="note" id="$id">{$votediv}{$name}{$admin}<div class="date" title="$fdatestr"><strong>{$datestr}</strong></div> + <a name="$id"></a><div class="note">{$votediv}{$name}{$admin}<div class="date" title="$fdatestr"><strong>{$datestr}</strong></div> <div class="text" id="Hcom{$id}"> {$text} </div> @@ -592,25 +592,24 @@ function manual_setup_beta($setup) { $menu[] = array( "title" => $parent[1], "link" => $parent[0], + "children" => array(), ); } // The index manual page has no parent.. if ($setup["up"][0]) { - $last_item = array( + $menu[] = array( "title" => $setup["up"][1], "link" => $setup["up"][0], + "children" => $siblings, ); - $siblings = array(array_merge($last_item, array("children" => $siblings))); - $menu[] = $last_item; } $_SERVER["BASE_PAGE"] = "/manual/" . $setup["head"][1] . "/" . $setup["this"][0]; $config = array( "current" => "docs", - "leftmenu" => $siblings, - "breadcrumbs" => $menu, + "leftmenu" => $menu, "meta-navigation" => array( "contents" => $setup["home"][0], "index" => $setup["up"][0], @@ -654,9 +653,9 @@ function manual_language_chooser($currentlang, $currentpage) { function manual_header_beta(){} function manual_footer_beta() { + echo "</section>"; manual_notes(); - echo "</section>"; site_footer(array('elephpants' => true)); } diff --git b/index-beta.php a/index-beta.php index f865675..5f05607 100644 --- b/index-beta.php +++ a/index-beta.php @@ -130,20 +130,16 @@ site_header("Hypertext Preprocessor", ); // Print body of home page. -print $content; - -ob_start(); print_view('homepage/sidebar.php', array( 'announcements' => $announcements )); -$sidebar = ob_get_clean(); +print $content; // Print the common footer. site_footer( array( "atom" => "/feed.atom", // Add a link to the feed at the bottom 'elephpants' => true, - 'spanning-content' => $thanksTo, - 'sidebar' => $sidebar + 'spanning-content' => $thanksTo ) ); diff --git b/js/common.js a/js/common.js index 02723e7..0531cf8 100644 --- b/js/common.js +++ a/js/common.js @@ -189,15 +189,13 @@ $(document).ready(function() { $docsDivWithId.children("h1, h2, h3, h4").each(function(){ $(this).append("<a class='genanchor' href='#" + $(this).parent().attr("id") + "'> ¶</a>"); }); - var scrollHeightOfHeadnav = - document.getElementById('headnav').scrollHeight; - scrollHeightOfHeadnav -= 12; //some margin $docs.find(".methodparam .parameter").each(function () { var $node = $(this); $(".parameters .term .parameter").each(function (idx, param) { var $param = $(param); if ($param.text() == $node.text().substring(1)) { $node.click(function() { - $.scrollTo($param, 600, {'offset':{'top':scrollHeightOfHeadnav}}); + $.scrollTo($param, 800); }); } }); @@ -208,10 +206,6 @@ $(document).ready(function() { var $this = $(this); $this.after("<a class='genanchor' href='#" + $this.attr('id') + "'> ¶</a>") }); - $('h1[id], h2[id], h3[id], h4[id]').each(function() { - var $this = $(this); - $this.append("<a class='genanchor' href='#" + $this.attr('id') + "'> ¶</a>"); - }); var $elephpants = $(".elephpants"); var $elephpantsImages = $elephpants.find('.images'); diff --git b/styles/bootstrap.css a/styles/bootstrap.css deleted file mode 100644 index 9833c8c..0000000 --- b/styles/bootstrap.css +++ /dev/null @@ -1,2054 +0,0 @@ -/*! - * Bootstrap v2.3.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ -.clearfix { - *zoom: 1; -} -.clearfix:before, -.clearfix:after { - display: table; - content: ""; - line-height: 0; -} -.clearfix:after { - clear: both; -} -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} -audio:not([controls]) { - display: none; -} -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -a:hover, -a:active { - outline: 0; -} -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} -sup { - top: -0.5em; -} -sub { - bottom: -0.25em; -} -img { - /* Responsive images (ensure images don't scale beyond their parents) */ - - max-width: 100%; - /* Part 1: Set a maxium relative to the parent */ - - width: auto\9; - /* IE7-8 need help adjusting responsive images */ - - height: auto; - /* Part 2: Scale the height according to the width, otherwise you get stretching */ - - vertical-align: middle; - border: 0; - -ms-interpolation-mode: bicubic; -} -#map_canvas img, -.google-maps img { - max-width: none; -} -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} -button, -input { - *overflow: visible; - line-height: normal; -} -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; -} -button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; - cursor: pointer; -} -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; -} -input[type="search"] { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: textfield; -} -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} -textarea { - overflow: auto; - vertical-align: top; -} -@media print { - * { - text-shadow: none !important; - color: #000 !important; - background: transparent !important; - box-shadow: none !important; - } - a, - a:visited { - text-decoration: underline; - } - a[href]:after { - content: " (" attr(href) ")"; - } - abbr[title]:after { - content: " (" attr(title) ")"; - } - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - thead { - display: table-header-group; - } - tr, - img { - page-break-inside: avoid; - } - img { - max-width: 100% !important; - } - @page { - margin: 0.5cm; - } - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - h2, - h3 { - 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; - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - *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; -} -.navbar .brand { - float: left; - display: block; - padding: .75em; - color: #fff; - text-shadow: 0 1px 0 #ffffff; -} -.navbar .brand:hover, -.navbar .brand:focus { - text-decoration: none; -} -.navbar-text { - margin-bottom: 0; - line-height: 40px; - color: #777777; -} -.navbar-link { - color: #777777; -} -.navbar-link:hover, -.navbar-link:focus { - color: #333333; -} -.navbar .divider-vertical { - height: 40px; - margin: 0 9px; - border-left: 1px solid #f2f2f2; - border-right: 1px solid #ffffff; -} -.navbar .btn, -.navbar .btn-group { - margin-top: 5px; -} -.navbar .btn-group .btn, -.navbar .input-prepend .btn, -.navbar .input-append .btn, -.navbar .input-prepend .btn-group, -.navbar .input-append .btn-group { - margin-top: 0; -} -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} -.navbar-form:before, -.navbar-form:after { - display: table; - content: ""; - line-height: 0; -} -.navbar-form:after { - clear: both; -} -.navbar-form input, -.navbar-form select, -.navbar-form .radio, -.navbar-form .checkbox { - margin-top: 5px; -} -.navbar-form input, -.navbar-form select, -.navbar-form .btn { - display: inline-block; - margin-bottom: 0; -} -.navbar-form input[type="image"], -.navbar-form input[type="checkbox"], -.navbar-form input[type="radio"] { - margin-top: 3px; -} -.navbar-form .input-append, -.navbar-form .input-prepend { - margin-top: 5px; - white-space: nowrap; -} -.navbar-form .input-append input, -.navbar-form .input-prepend input { - margin-top: 0; -} -.navbar-search { - position: relative; - float: left; - margin-top: 5px; - margin-bottom: 0; -} -.navbar-search .search-query { - margin-bottom: 0; - padding: 4px 14px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} -.navbar-static-top { - 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; - right: 0; - left: 0; - z-index: 1030; - margin-bottom: 0; -} -.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; -} -.navbar-fixed-top { - top: 0; -} -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); - box-shadow: 0 1px 10px rgba(0,0,0,.1); -} -.navbar-fixed-bottom { - bottom: 0; -} -.navbar-fixed-bottom .navbar-inner { - -webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1); - -moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1); - box-shadow: 0 -1px 10px rgba(0,0,0,.1); -} -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .nav.pull-right { - float: right; - margin-right: 0; -} -.navbar .nav > li { - float: left; -} -.navbar .nav > li > a { - float: none; - padding: .75em; - color: #777777; - text-decoration: none; - text-shadow: 0 1px 0 #ffffff; -} -.navbar .nav .dropdown-toggle .caret { - margin-top: 8px; -} -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - background-color: transparent; - color: #333333; - text-decoration: none; -} -.navbar .nav > .active > a, -.navbar .nav > .active > a:hover, -.navbar .nav > .active > a:focus { - color: #555555; - text-decoration: none; - background-color: #e5e5e5; - -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); -} -.navbar .btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-left: 5px; - margin-right: 5px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ededed; - background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); - background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); - border-color: #e5e5e5 #e5e5e5 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #e5e5e5; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); - -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); - box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); -} -.navbar .btn-navbar:hover, -.navbar .btn-navbar:focus, -.navbar .btn-navbar:active, -.navbar .btn-navbar.active, -.navbar .btn-navbar.disabled, -.navbar .btn-navbar[disabled] { - color: #ffffff; - background-color: #e5e5e5; - *background-color: #d9d9d9; -} -.navbar .btn-navbar:active, -.navbar .btn-navbar.active { - background-color: #cccccc \9; -} -.navbar .btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} -.navbar .nav > li > .dropdown-menu:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); - position: absolute; - top: -7px; - left: 9px; -} -.navbar .nav > li > .dropdown-menu:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - position: absolute; - top: -6px; - left: 10px; -} -.navbar-fixed-bottom .nav > li > .dropdown-menu:before { - border-top: 7px solid #ccc; - border-top-color: rgba(0, 0, 0, 0.2); - border-bottom: 0; - bottom: -7px; - top: auto; -} -.navbar-fixed-bottom .nav > li > .dropdown-menu:after { - border-top: 6px solid #ffffff; - border-bottom: 0; - bottom: -6px; - top: auto; -} -.navbar .nav li.dropdown > a:hover .caret, -.navbar .nav li.dropdown > a:focus .caret { - border-top-color: #333333; - border-bottom-color: #333333; -} -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle, -.navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: #e5e5e5; - color: #555555; -} -.navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} -.navbar .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} -.navbar .pull-right > li > .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right { - left: auto; - right: 0; -} -.navbar .pull-right > li > .dropdown-menu:before, -.navbar .nav > li > .dropdown-menu.pull-right:before { - left: auto; - right: 12px; -} -.navbar .pull-right > li > .dropdown-menu:after, -.navbar .nav > li > .dropdown-menu.pull-right:after { - left: auto; - right: 13px; -} -.navbar .pull-right > li > .dropdown-menu .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { - left: auto; - right: 100%; - margin-left: 0; - margin-right: -1px; -} -.navbar-inverse .navbar-inner { - background-color: #333; - border-color: #333; -} -.navbar-inverse .brand, -.navbar-inverse .nav > li > a { - color: #999999; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar-inverse .brand:hover, -.navbar-inverse .nav > li > a:hover, -.navbar-inverse .brand:focus, -.navbar-inverse .nav > li > a:focus { - color: #ffffff; -} -.navbar-inverse .brand { - color: #999999; -} -.navbar-inverse .navbar-text { - color: #999999; -} -.navbar-inverse .nav > li > a:focus, -.navbar-inverse .nav > li > a:hover { - background-color: transparent; - color: #ffffff; -} -.navbar-inverse .nav .active > a, -.navbar-inverse .nav .active > a:hover, -.navbar-inverse .nav .active > a:focus { - color: #ffffff; - background-color: #111111; -} -.navbar-inverse .navbar-link { - color: #999999; -} -.navbar-inverse .navbar-link:hover, -.navbar-inverse .navbar-link:focus { - color: #ffffff; -} -.navbar-inverse .divider-vertical { - border-left-color: #111111; - border-right-color: #222222; -} -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { - background-color: #111111; - color: #ffffff; -} -.navbar-inverse .nav li.dropdown > a:hover .caret, -.navbar-inverse .nav li.dropdown > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #999999; - border-bottom-color: #999999; -} -.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; -} -.navbar-inverse .navbar-search .search-query { - color: #ffffff; - background-color: #515151; - border-color: #111111; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); - box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; -} -.navbar-inverse .navbar-search .search-query:-moz-placeholder { - color: #cccccc; -} -.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { - color: #cccccc; -} -.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; -} -.navbar-inverse .navbar-search .search-query:focus, -.navbar-inverse .navbar-search .search-query.focused { - padding: 5px 15px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; -} -.navbar-inverse .btn-navbar { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e0e0e; - background-image: -moz-linear-gradient(top, #151515, #040404); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); - background-image: -webkit-linear-gradient(top, #151515, #040404); - background-image: -o-linear-gradient(top, #151515, #040404); - 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: 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 */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.navbar-inverse .btn-navbar:hover, -.navbar-inverse .btn-navbar:focus, -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active, -.navbar-inverse .btn-navbar.disabled, -.navbar-inverse .btn-navbar[disabled] { - color: #ffffff; - background-color: #040404; - *background-color: #000000; -} -.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; - } - .navbar-fixed-top, - .navbar-fixed-bottom, - .navbar-static-top { - margin-left: -20px; - margin-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; - } - .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; - } -} -@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; - } -} -@media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top, - .navbar-fixed-bottom { - position: static; - } - .navbar-fixed-top { - margin-bottom: 20px; - } - .navbar-fixed-bottom { - margin-top: 20px; - } - .navbar-fixed-top .navbar-inner, - .navbar-fixed-bottom .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-left: 10px; - padding-right: 10px; - margin: 0 0 0 -5px; - } - .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; - } - .nav-collapse .dropdown-menu .divider { - display: none; - } - .nav-collapse .nav > li > .dropdown-menu:before, - .nav-collapse .nav > li > .dropdown-menu:after { - display: none; - } - .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); - } - .navbar-inverse .nav-collapse .navbar-form, - .navbar-inverse .nav-collapse .navbar-search { - border-top-color: #111111; - border-bottom-color: #111111; - } - .navbar .nav-collapse .nav.pull-right { - float: none; - margin-left: 0; - } - .nav-collapse, - .nav-collapse.collapse { - overflow: hidden; - height: 0; - } - .navbar .btn-navbar { - display: block; - } - .navbar-static .navbar-inner { - padding-left: 10px; - padding-right: 10px; - } -} -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } - body { - padding-top:3.25em; - } -} -@media (min-width: 1500px) { - body.docs .container, - body.docs .navbar-static-top .container, - body.docs .navbar-fixed-top .container, - body.docs .navbar-fixed-bottom .container { - width: auto; - padding-left:.75em; - } -} diff --git b/styles/doc.css a/styles/doc.css index 47a9d16..9968f37 100755 --- b/styles/doc.css +++ a/styles/doc.css @@ -1,5 +1,6 @@ /* vim: set et ts=4 sw=4 fdm=marker: : */ + /* {{{ The Quick TOC reference top on man pages */ aside#quicktoc { display: block; @@ -88,7 +89,7 @@ aside#quicktoc { .docs div.caution, .docs blockquote.note { padding: .75em 1em; - margin: .75em 0; + margin: 1.5em 0; } .docs .refsect1 div.caution, @@ -129,8 +130,8 @@ aside#quicktoc { .docs div.tip { background:#eeeef6; border-top: 0.1875em solid #99c; - margin:.75em 0; - padding:0.5625em .75em .75em; + margin:1.5em 0; + padding:0.5625em 1.5em .75em; } .docs .refsect1.notes div.tip { background:#e8e8e8; @@ -143,8 +144,8 @@ aside#quicktoc { .docs div.warning { background: #f2e5f4; - margin: .75em 0; - padding: .75em; + margin: 1.5em 0; + padding: 1.5em; } /* }}} */ @@ -163,7 +164,7 @@ aside#quicktoc { } .docs dl dd + dt { - margin-top:.75em; + margin-top:1.5em; } .docs .refentry .parameters dl dt code.parameter { @@ -173,7 +174,7 @@ aside#quicktoc { /* }}} */ .docs .example { - margin: .75em 0; + margin: 1.5em 0; } /* {{{ Examples (highlighting is in theme.css) */ @@ -222,7 +223,7 @@ aside#quicktoc { .docs .doctable { border: 1px solid #ccc; width: 100%; - margin:.75em 0; + margin:1.5em 0; } .docs .doctable thead tr { @@ -265,10 +266,9 @@ ul.chunklist_children { position: relative; } -.docs .refnamediv p.verinfo { - margin:1em 0; - font-size: .75em; - line-height:2; +.docs p.verinfo { + float:right; + margin:0 0 0 1.5em; } .docs h1.refname, @@ -278,7 +278,6 @@ ul.chunklist_children { .docs .refnamediv { position:relative; } - .docs div.refsect1 h3.title { color: #444; position: absolute; @@ -343,7 +342,7 @@ ul.chunklist_children { /* - Side Menu - */ .docs .layout-menu { - background-color:#eee; + width: 16.25em; } .docs .layout-menu ul.parent-menu-list { @@ -353,55 +352,72 @@ ul.chunklist_children { } .docs .layout-menu ul.parent-menu-list li { - margin: .75em 0; + margin: 1.5em 0; } -.docs .layout-menu ul.parent-menu-list > li { +.docs .layout-menu ul.parent-menu-list > li:first-child { margin-top:0; - margin-bottom:0; - -} -.docs .layout-menu ul.parent-menu-list > li > a { - color:#000; - border:0; } .docs .layout-menu ul.parent-menu-list a { color: #444; + margin: 0; + padding:0 0 0 .5em; + border: 0; + border-left: .25em solid #7F7FB2; } -.docs .layout-menu ul.parent-menu-list a:hover { +.docs .layout-menu ul.parent-menu-list a:hover, +.docs .layout-menu ul.parent-menu-list li:last-child a { color: #000; - border-color: #669; + border-left: .25em solid #666699; } .docs .layout-menu ul.child-menu-list { margin: 0; - padding:0 0 0 .25em; + padding:0 0 1.5em .25em; + border: 0; } .docs .layout-menu ul.child-menu-list li { list-style-type: none; - margin: 0 0 -1px; + margin: 0 0 -1px .5em; + padding:0; + border: 0; + border-bottom: 1px dotted #aaa; } .docs .layout-menu ul.child-menu-list a { font-size: .75em; line-height: 2; - border-bottom: 1px dotted #aaa; - display:block; - padding-left:.5em; + color: black; + overflow: visible; } -.docs .layout-menu ul.child-menu-list .current { - font-weight:700; -} -.docs .layout-menu ul.child-menu-list .current a { - color:#000; -} .docs .layout-menu ul.child-menu-list .current a:before { content:"\bb \20"; } +body.docs #layout { + min-width:45em; + width:auto; + padding:0 3em 0 0; +} + +.docs .layout-menu ul.child-menu-list a:hover, +.docs .layout-menu ul.parent-menu-list li:last-child ul.child-menu-list a { + border-left: 0; +} + +/* #layout needed, see http://news.php.net/php.webmaster/11884 */ +.docs #layout .layout-content, +.docs #layout #usernotes { + margin-left: 19em; +} + +.docs #usernotes { + margin-top:1.5em; +} + #changelang-langs { width:12em; font-size:.75em; @@ -438,26 +454,3 @@ div.soft-deprecation-notice blockquote.sidebar { border: 0px solid #666600; color: #660000; } - - -#breadcrumbs { - background:#f3f3f3; - padding:.5em .75em; - margin:0 0 .75em; -} -#breadcrumbs ul { - padding:0; - margin:0; -} -#breadcrumbs li { - display:inline-block; -} -#breadcrumbs .divider { - padding:0 .25em; -} -#breadcrumbs a { - border:0; -} -#breadcrumbs li:last-child a { - color:#222; -} diff --git b/styles/home.css a/styles/home.css index a757423..b246bd5 100644 --- b/styles/home.css +++ a/styles/home.css @@ -208,20 +208,12 @@ section.layout-content.home { margin: 0 auto; } +div.home-content { + width: 648px; +} + /* Announcement Area */ -.home aside.tips { - background:transparent; - padding:0; - border:0; -} -.home aside.tips .border { - border:0; -} -.home aside.tips div.inner { - margin:0; - clear:none; -} .home .announcements { display: block; background-color: #cce; @@ -240,44 +232,107 @@ section.layout-content.home { text-align: left; } +/* 2x2 Featured Content Grid */ +div.featured-content div.top-left, +div.featured-content div.top-right { + margin-top:-1.5em; +} +div.featured-content div.feature { + float: left; + width: 270px; + padding:0 20px; + text-align: center; +} +div.featured-content div.bottom-left, +div.featured-content div.bottom-right { + padding-top:1.5em; +} + +div.featured-content span.graphic { + display: block; + width: 128px; + height: 128px; + margin:0 auto; + padding:8px 0; + background-image: url('../images/home-sprites.png'); +} + +div.featured-content div.top-left span.graphic { + background-position: 0 8px; +} + +div.featured-content div.top-right span.graphic { + background-position: 0px -121px; +} + +div.featured-content div.bottom-left span.graphic { + background-position: 0px -258px; +} + +div.featured-content div.bottom-right span.graphic { + background-position: 0px -399px; +} + +.featured-content .feature h3 { + text-align: center; + color:#000; + font-weight:bold; +} +.featured-content .feature p { + margin:1.5em 0 0; + color:#333; +} /* Right-hand sidebar */ -.home aside h3 { +div.home-sidebar { + float: right; + width: 264px; + padding: 0 0 1.5em; + margin: 0 0 0 20px; +} + +div.home-sidebar h3 { border-bottom: .25em solid #99c; margin: 1.2em 0 .95em; padding:0; } -.home aside.tips h3.panel { +div.home-sidebar h3.panel { line-height: 1.2em; border:0; margin:1.2em 0; } -.home aside.tips h3:first-child { +div.home-sidebar h3:first-child { margin-top: 0; } -.home aside.tips h3.panel a { +div.home-sidebar h3.panel a { background:#ddd; color:#333; border:0; display: block; padding:.6em 1em; } -.home aside.tips h3.panel a::after { +div.home-sidebar h3.panel a::after { float:right; content:"»"; } -.home aside.tips h3.panel a:hover, -.home aside.tips h3.panel a:focus { +div.home-sidebar h3.panel a:hover, +div.home-sidebar h3.panel a:focus { background:#eee; } -.home aside.tips a:link, -.home aside.tips a:visited { +div.home-sidebar ul { + margin: 0 0 0 0; + list-style-type: none; + padding: 0; +} + +div.home-sidebar a:link, +div.home-sidebar a:visited { border-bottom-color: transparent; } -.home aside.tips a:hover, -.home aside.tips a:focus { +div.home-sidebar a:hover, +div.home-sidebar a:focus { border-bottom-color: #3F438D; } @@ -374,10 +429,6 @@ section.layout-content.home { .home .newsItem { border-bottom: 0; } -.home .newsItem + .newsItem { - border-top: 1px dotted #999; - padding-top:.75em; -} .newsItem h2 a { border-bottom-width:0; } diff --git b/styles/theme.css a/styles/theme.css index 09b8b23..61dce66 100755 --- b/styles/theme.css +++ a/styles/theme.css @@ -31,33 +31,28 @@ input { body { font-size: 1em; line-height: 1.5; - background:#fff; - padding-left:0; - padding-right:0; - padding-bottom:0; - margin:0; + background: url('/images/sprites.png') repeat-x 0px -990px #fff; } h1 { font-size: 1.5em; line-height: 1; - margin:0 0 .5em; + margin:0 0 1em; } h2 { font-size: 1.25em; line-height: 1.2; - margin:0 0 0.6em; + margin:0 0 1.2em; } h3 { font-size: 1.125em; line-height: 1.333333333; - margin:0 0 0.66666666666667em; + margin:0 0 1.333333333em; } p { - margin: .75em 0; + margin: 1.5em 0; } -ul, ol { - margin:.75em 1.5em; - padding:0; +ul { + margin:1.5em 0; } p:empty { margin:0; @@ -73,9 +68,7 @@ abbr { border-bottom:1px dotted #999; cursor: help; } -a { - text-decoration:none; -} + h1, h1 a, h1 a:visited, h1 a:link { color: #222; border-color:#222; @@ -104,7 +97,6 @@ h1, h2, h3, h4, h5, h6 { h4, h5, h6 { font-size:1.125em; line-height: 1.333333333; - margin:0.666666667em 0; } a:link, @@ -121,10 +113,12 @@ a:focus { ul { list-style-type: disc; + margin: 1.5em; } ol { list-style-type: decimal; + margin: 1.5em; } hr { @@ -134,12 +128,102 @@ hr { border-top:.25em solid #99c; } -.navbar a { - border:0; +#headnav { + height: 70px; + line-height: 1; + background: url('/images/sprites.png') repeat-x 0px -100px; + min-width:960px; +} + +#headnav .myphp { + float: left; + position: absolute; + right: 20px; + top: 30px; +} + +#headmenu { + width: 960px; + margin: 0 auto; } -.navbar { - border-bottom:.25em solid #99c; +#headnav h6, +#headmenu li, +#headsearch { + display: block; + float: left; + margin: 0; + list-style: none; + padding: 18px 0 0 0; +} + +#headnav #headhome a.menu-link { + background: url(/images/sprites.png) 0 0; + width: 120px; + height: 16px; + text-indent: -2000em; +} + +#headnav li.parent a.menu-link { + padding-right: 25px; + background: url(/images/sprites.png) no-repeat 100% 11px; +} + +#headnav li.parent .children { + display: none; +} + +#headnav li.parent.current a.menu-link { + background-position: 100% -19px; +} + +#headnav a.menu-link { + display: block; + padding: 12px 15px 16px 15px; + margin: 0; + border-bottom: .5em solid; + color: #444; + border-color: #7F7FB2; + font-weight: bold; +} +#headsearch { + width:258px; +} +#headnav li#headsearch { + margin: 22px 0 0 20px; + padding: 2px; + float: right; + border: 1px solid #7F7FB2; +} + +#headsearch-keywords { + border: 0; + padding: 2px; + width: 210px; + height:26px; + float: left; + -webkit-appearance: none; +} + +#headsearch-keywords, +#headsearch-keywords:focus { + color: #000; +} + +#headsearch-submit { + float:right; +} +#headsearch-submit +{ + border: 0; + margin: 1px; + padding: 2px 5px; + font-weight: bold; + border-color: #7F7FB2; + border: 1px solid #666699; + background: #666699; + color: #fff; + cursor: pointer; } .change-language { @@ -154,6 +238,27 @@ hr { border-radius: 0; } +#headnav li dl { + line-height: 1; +} + +#headnav li dl dd:hover, +#headnav li dl dt:hover { + background: #eeeef6; +} + +#headnav li.current a.menu-link, +#headnav li a.menu-link:hover, +#headnav li a.menu-link:focus, +#headnav li#headhome.current { + border-color: #666699; +} + +#headnav li.current a.menu-link { + color: #000; +} + + /** * Auto-complete */ @@ -240,6 +345,7 @@ hr { * User notes */ #usernotes { + margin: 0 0 1.5em 216px; position: relative; } @@ -264,7 +370,7 @@ hr { /* Add a note buttons. */ #usernotes .action { display: block; - top: 5em; + top: 1em; right: 0; position: absolute; text-align: right; @@ -277,7 +383,7 @@ hr { /* Notes themselves. */ #usernotes .note { - margin: .75em 0; + margin: 1.5em 0; position: relative; } @@ -324,7 +430,7 @@ hr { #usernotes .note .text { background-color: #eee; border-top: 0.125em solid #ccc; - padding: .375em .75em .75em; + padding: 1.375em .75em 1.5em; } /* Vote arrow styles. */ @@ -383,7 +489,7 @@ dl dd p { margin:0; } dl dd p + p { - margin-top: .75em; + margin-top: 1.5em; } @@ -406,7 +512,7 @@ div.phpcode span.comment { } div.classsynopsisinfo_comment { font-weight: bold; - margin-top:.75em; + margin-top:1.5em; } div.phpcode span.default { color: #0000BB; @@ -511,13 +617,16 @@ a.genanchor:focus { aside.tips { background-color: #f9f9f9; - border-bottom: .25em solid #9999CC; + border-bottom: .5em solid #9999CC; + float: right; + margin:0 0 1em 1.5em; + width: 288px; } aside.tips div.border { float: left; - width: 33.33333333%; - border-top: .25em solid #9999CC; + width: 96px; + border-top: .5em solid #9999CC; } aside.tips div.border.second { @@ -530,28 +639,47 @@ aside.tips div.border.third { aside.tips div.inner { clear: both; - margin: .75em; + margin: 1.5em 1.5em; } #layout { - margin: .75em auto; - padding-right:3em; + width: 960px; + margin: .75em auto 1.5em; clear:both; } .layout-menu { float: left; padding:.75em; + margin-top:-.75em; background-color:#eeeef6; } +.layout-menu li a { + display: block; + border-top-width: 3px; + border-top-style: solid; + padding: 4px 0; + margin-top: 1em; + font-weight: bold; +} -#layout *[id]:before { - display:block; - content:" "; - margin-top:-4em; - height:4em; +.layout-menu li li a { + overflow: hidden; + border: none; + font-size: 11px; + padding: 1px 0 1px 20px; + margin: 0; + font-weight: normal; +} +.layout-menu li.current a { + font-weight: bold; +} + +.layout-content { + display: block; + margin: 0 auto; } #search-results { @@ -588,15 +716,26 @@ footer { clear: both; overflow: auto; background-color: #333; - border-top: .25em solid #9999CC; - padding: .75em 0; + border-top: .5em solid #9999CC; + padding: 1.5em 0; + min-width:960px; } -footer ul { - margin:0; - padding:0; +footer .footer-content { + width: 960px; + margin: 0 auto; } +footer .footmenu { + float: right; + margin: 0; +} +footer .footmenu.pagetools { + clear: right; +} +footer .footmenu.copyright { + float: left; +} footer .footmenu li { display: inline; } @@ -624,6 +763,7 @@ footer a:focus { div.elephpants { margin: auto; overflow: hidden; + min-width:960px; } div.elephpants div.images { @@ -663,11 +803,6 @@ div.elephpants img:focus { /* Standard Tables */ -table { - border-collapse: collapse; - border-spacing: 0; -} - table.standard { border-collapse: collapse; border-style: hidden; @@ -713,10 +848,10 @@ table.standard th.subr { /* News styles. */ .newsImage img { margin-left: 1.5em; - margin-bottom: .75em; + margin-bottom: 1.5em; } .newsItem { - margin:.75em 0; + margin:1.5em 0; border-bottom: solid 0.25em #99c; } .newsItem:last-child { @@ -878,7 +1013,7 @@ table.standard th.subr { } div.informalexample { - margin-bottom: .75em; + margin-bottom: 1.5em; } .count strong { @@ -918,23 +1053,3 @@ em, strong { #toTop:active,#toTop:focus { outline:none; } -fieldset { - margin:0; - padding:0; - border:0; -} -.navbar ul { - list-style:none; -} -.navbar a { - display:inline-block; -} -@media (min-width:1200px) { - body.docs .row-fluid .layout-menu.span3 { - width:18%; - } - body.docs .row-fluid #layout-content { - width:81%; - margin-left:1%; - } -} diff --git b/views/homepage/sidebar.php a/views/homepage/sidebar.php index 12318f5..3c0fdd8 100644 --- b/views/homepage/sidebar.php +++ a/views/homepage/sidebar.php @@ -1,3 +1,4 @@ +<div class='home-sidebar'> <?php if (!empty($announcements)): echo $announcements; @@ -9,3 +10,4 @@ <h3 class='panel events'><a href='/cal.php'>User Group Events</a></h3> <h3 class='panel tips'><a href='/tips.php'>Tips and Tricks</a></h3> +</div>