com web/php: Fixed navigation rendering issue and cleaned up unused navigation styles.: include/header.inc styles/theme-base.css

Commit: ea3a70e9d9ce14482a73d023a0e80fcd05311c84 Author: Levi Morrison <levim@php.net> Sun, 15 Dec 2013 12:53:46 -0700 Parents: 62574d0c4a1df55b57cb812f8166a269821ce6a4 Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=ea3a70e9d9ce14482a73d023a0e80fcd05311c84 Log: Fixed navigation rendering issue and cleaned up unused navigation styles. Changed paths: M include/header.inc M styles/theme-base.css Diff: diff --git a/include/header.inc b/include/header.inc index 6d56564..8820337 100755 --- a/include/header.inc +++ b/include/header.inc @@ -65,26 +65,23 @@ if (isset($shortname) && $shortname) { </head> <body class="<?php print $curr; ?> <?php echo $classes; ?>"> -<nav id="head-nav" class="navbar navbar-fixed-top clearfix"> - <div class="navbar-inner"> - <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"> - <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" 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> +<nav id="head-nav" class="navbar navbar-fixed-top"> + <div class="navbar-inner clearfix"> + <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" /> + <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" 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 id="flash-message"> -</div> + <div id="flash-message"></div> </nav> <?php if (!empty($config['breadcrumbs'])): ?> diff --git a/styles/theme-base.css b/styles/theme-base.css index 0b48579..13e6149 100755 --- a/styles/theme-base.css +++ b/styles/theme-base.css @@ -294,28 +294,9 @@ textarea { box-sizing:border-box; width:100%; } -.navbar-static-top { - position: static; - margin-bottom: 0; -} -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { +.navbar-fixed-top .navbar-inner { margin:0 auto; } -.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; @@ -428,19 +409,6 @@ textarea { 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 #fff; - 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;