com web/php: Reimplemented basic search. Adjusted some margins and paddings.: include/header.inc styles/bootstrap.css styles/doc.css styles/theme.css

Commit: 15b4d11318b6fd318a44506c80c46a8a523cf169 Author: Levi Morrison <levim@php.net> Wed, 10 Jul 2013 09:00:26 -0600 Parents: dbffb163d5b2f13532d3e13bc5ba7e79b889bd36 Branches: responsive Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=15b4d11318b6fd318a44506c80c46a8a523cf169 Log: Reimplemented basic search. Adjusted some margins and paddings. Changed paths: M include/header.inc M styles/bootstrap.css M styles/doc.css M styles/theme.css Diff: diff --git a/include/header.inc b/include/header.inc index 9e19504..0fbeb5d 100644 --- a/include/header.inc +++ b/include/header.inc @@ -96,14 +96,15 @@ if (isset($shortname) && $shortname) { <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> - </div> + <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> + <form class="navbar-search" id="topsearch" action="/search.php"> + <input type="search" name="pattern" class="search-query" placeholder="Search"/> + </form> </div> </div> </nav> diff --git a/styles/bootstrap.css b/styles/bootstrap.css index bc6d995..1ec6a33 100644 --- a/styles/bootstrap.css +++ b/styles/bootstrap.css @@ -622,19 +622,16 @@ textarea { .navbar-search { position: relative; float: left; - margin-top: 5px; + margin-top: .625em; margin-bottom: 0; } .navbar-search .search-query { margin-bottom: 0; - padding: 4px 14px; + padding: .5em .75em; 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; @@ -913,37 +910,27 @@ textarea { 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; + background-color: #fff; + color: #333; + text-shadow: 0 1px 0 #ffffff; + border:0; + border-radius:2px; + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.2), 0 1px 0 rgba(255,255,255,.15); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.2), 0 1px 0 rgba(255,255,255,.15); + box-shadow: inset 0 1px 2px rgba(0,0,0,.2), 0 1px 0 rgba(255,255,255,.15); +} +.navbar-inverse .navbar-search .search-query:focus { + box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 0 .75em #669; + outline:0; } .navbar-inverse .navbar-search .search-query:-moz-placeholder { - color: #cccccc; + color: #999; } .navbar-inverse .navbar-search .search-query:-ms-input-placeholder { - color: #cccccc; + color: #999; } .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; + color: #999; } .navbar-inverse .btn-navbar { color: #ffffff; diff --git a/styles/doc.css b/styles/doc.css index bd8d516..c3bfada 100755 --- a/styles/doc.css +++ b/styles/doc.css @@ -179,6 +179,13 @@ aside#quicktoc { } /* {{{ Examples (highlighting is in theme.css) */ + +.docs .example-contents { + margin-bottom:.75em; +} +.docs .example-contents pre { + margin:0; +} .docs .example-contents .phpcode code, .docs .example-contents.screen { background-color: #fff; @@ -187,9 +194,9 @@ aside#quicktoc { } .docs .refsect1 .dc-description { background-color: #fff; - padding: .75em .625em; + padding: .625em .75em; box-shadow:inset 0 1px 2px 0 rgba(0,0,0,.25); - + margin-bottom: .75em; } .docs .example-contents .phpcode code { padding: .75em 1em; @@ -271,10 +278,15 @@ ul.chunklist_children { } .docs .refnamediv p.verinfo { - margin:1em 0; font-size: .75em; line-height:2; } +.docs .refnamediv p { + margin:0; +} +.docs .refsect1 p { + margin-top:0; +} .docs h1.refname, .docs p.refpurpose { @@ -287,7 +299,7 @@ ul.chunklist_children { .docs div.refsect1 h3.title { color: #444; position: absolute; - top:-2.1em; + top:-2em; left: 0; } diff --git a/styles/theme.css b/styles/theme.css index f538b0b..e3bd30c 100755 --- a/styles/theme.css +++ b/styles/theme.css @@ -24,10 +24,6 @@ body, input, textarea { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } -input { - font-size:100%; -} - body { font-size: 1em; line-height: 1.5; @@ -37,6 +33,26 @@ body { padding-bottom:0; margin:0; } + +button, +input, +select, +textarea { + font-family: inherit; + font-size: 100%; + margin: 0; +} +button, +input { + line-height: normal; +} +input[type="search"] { + -webkit-appearance: textfield; + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; + box-sizing: content-box; +} + h1 { font-size: 1.5em; line-height: 1; @@ -241,6 +257,7 @@ hr { */ #usernotes { position: relative; + margin-top:1.5em; } #usernotes h3.title { @@ -327,7 +344,8 @@ hr { #usernotes .note .text { background-color: #eee; border-top: 0.125em solid #ccc; - padding: .375em .75em .75em; + padding: .375em .625em .75em; + margin-top:.25em; -moz-border-radius:0 0 2px 2px; border-radius:0 0 2px 2px; } @@ -547,7 +565,7 @@ aside.tips div.inner { .layout-menu { float: left; - padding:.75em; + padding:.5em .75em 1.5em; background-color:#eeeef6; border-radius:2px; } @@ -936,6 +954,9 @@ fieldset { .navbar a { display:inline-block; } +#topsearch { + float:right; +} @media (min-width:1200px) { body.docs .row-fluid .layout-menu..span3 { width:18%;