com web/php: Apply the extra width mode on large displays across all pages, not just docs.: include/header.inc styles/theme-base.css

Commit: d95d69eb18488dbc0552f0cceaa20f61824f563d Author: Adam Harvey <aharvey@php.net> Wed, 20 Nov 2013 14:47:35 -0800 Parents: cc06da845f1a87a52c1af2027a85719968d08e77 Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=d95d69eb18488dbc0552f0cceaa20f61824f563d Log: Apply the extra width mode on large displays across all pages, not just docs. Fixes bug #66129 (Documentation does not follow the same layout pattern as other pages). Bugs: https://bugs.php.net/66129 Changed paths: M include/header.inc M styles/theme-base.css Diff: diff --git a/include/header.inc b/include/header.inc index b04b3df..b0eb50c 100755 --- a/include/header.inc +++ b/include/header.inc @@ -74,18 +74,20 @@ if (isset($shortname) && $shortname) { <nav id="head-nav" class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a href="/" class="brand"><img src="/images/logos/php-logo@2x.png" width="48" height="24" alt="php"/></a> - <div id="mainmenu-toggle-overlay"></div> - <input type="checkbox" id="mainmenu-toggle"></input> - <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="/docs.php">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> - <form class="navbar-search span3" id="topsearch" action="/search.php"> - <input type="search" name="pattern" class="search-query" placeholder="Search"/> - </form> + <div class="row-fluid"> + <a href="/" class="brand"><img src="/images/logos/php-logo@2x.png" width="48" height="24" alt="php"/></a> + <div id="mainmenu-toggle-overlay"></div> + <input type="checkbox" id="mainmenu-toggle"></input> + <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="/docs.php">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> + <form class="navbar-search span3" id="topsearch" action="/search.php"> + <input type="search" name="pattern" class="search-query" placeholder="Search"/> + </form> + </div> </div> </div> </nav> diff --git a/styles/theme-base.css b/styles/theme-base.css index 8e76bf8..3309427 100755 --- a/styles/theme-base.css +++ b/styles/theme-base.css @@ -1999,15 +1999,18 @@ textarea { } } @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 { + .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 {