From eb5dbfb0bccea4e9fb60eba1ca3510e20618d5ce Mon Sep 17 00:00:00 2001
From: Levi Morrison <levim@php.net>
Date: Thu, 11 Jul 2013 16:03:32 -0600
Subject: [PATCH] Updated beta-warning to actually work with the new
 fixed-header. A lot of header love in general, such as a cleaned-up logo and
 a better searchbox.

---
 images/logos/php-logo.png | Bin 968 -> 983 bytes
 include/header.inc        |  10 ++--
 js/common.js              |   6 +--
 styles/bootstrap.css      |  15 +++---
 styles/doc.css            |  10 ++--
 styles/home.css           |  94 +++-----------------------------------
 styles/theme.css          |  20 ++++----
 7 files changed, 37 insertions(+), 118 deletions(-)

diff --git a/images/logos/php-logo.png b/images/logos/php-logo.png
index f4c44512546abdfc03a15ae3a06f5a34c3b7b5ff..decb0f5d7bd58ba43ddf1ea41e7d25d04ca144d7 100644
GIT binary patch
delta 921
zcmV;K17`fl2iFH7iBL{Q4GJ0x0000DNk~Le0000q0000Q2nGNE0Qla2t&t&3e^g0C
zK~z|U<(N5WRzVQQf15;&0gVSDCQ-o)4^Z(yM8(G2La<RAgO&<59teVxMzFB3v=HpH
z6HyB#iG>KFCK~S>V!Xv11f%8}i`^IZo4oxF^PY_Z%lBq>X8t?7JM-p!Mnp)Oj4_*l
zS)S;eh<r{QC=NTNfbIhe94o*$e-UX<94HPu>41zer9dZ8;zX}RWM-luS*R!lpY!<>
z48WZfFoKjuK#LWBHwBC!m1u!6W=t0S9ufJT!{-vkzwmtaiAZNQ;~e<iBGQ!=T|@>3
zP=!t6Y~uq^3mgK9eS7EQeh&Li;1O^Ns8Y5w^1y!wTm$yuYCwh$<#0<Le-8a|1E}!q
zOM#vO?0*2$J^O71;$H>E`!VPo()T|XtpsX3egQGpI17~m$A^Hw4mgq_Q73eT%pKSY
z%mh|ocW*y%Tj_M+b_v*{=1u|&-B=1703IrxTONL$n%nH~R{=YmeWTLp07i$d+$T@5
z8yFFjBjvzb<#fH9JEP=le`4%+DV^(1Zh$tmQ6(|<<A9IK$Lc{>&KOe(O!N-#v55TA
zXDlKe*uvnGaliV?G-!LEHNZ~;{0i43BE2#At$=Q$BK(XT8p``aT!%2vlf4m<wiw;X
ziocfxe)LdqK*pHiz-%Rc!r+1sT9AHEMW>iAei=5eA`;+P#P|V)e}FWt#pY2&O(N0~
zv!IZDNH1UfjX;^l-}XEC&<S+|4+0LW6@MwmLI=q0?i^3lA|hYh^CC~)1w0Ml?+oBu
za+RZ!%&O54Q(cOI(@O6>_R|2M$&>d3V`6+PSN0d2e7cg~jIkXCoK<?wK)J6M-Fdyc
z#m1PU*aV&eOm)v?e@bt+h_t$bFxQj634H&A@<hvr8)J?+%&Be-lYx<*jsVrJ>UvTe
zeT|AdpK;9Fy=7|dyxw7_cUI|baPkucV)p}wV=<h=%LO=V0k*4!?o~Pm0|DtSVS<y_
z7J%OjY>o3Dx^lhP7AT^h*v_CCcnQ?UyzqK~iymL6<}t<;ZvoGN*G|+fB46FJUl4v^
zyJ??~@Lym%i$3k&rwTH6pfMDE8Ux!Q`1tih@mECt?~k-7QT+cRpnv)wK+^aI+c{5i
vd=D@xuFFn~j4|J^p9EmPZN`dAuD_w*t@kjcYQKHq00000NkvXXu0mjfxeTe$

delta 906
zcmV;519kk@2gnB@iBL{Q4GJ0x0000DNk~Le0000s0000Q2nGNE0Q@VjkdYxxe?>_|
zK~z|U#h6P-R#6bgf9Fe0ArmU7ML`b)1JeqkMG#TZDzGquAR($v5CqY-T`LKKpvY)p
zwF_EQ(5iyyfs)V9ECZtlp`l?uD$EDd;@n&3JKtPCziU_ja29uF?*Gi3Gc)Jhi-?fK
z08Rtr-q@GaeEujPIcx(Kd$O(sf9K0UDnafo-t&Nn^d~r91`-L(7*h;v^u!%W%oT;C
zcB~4r(tKV6%b464QwUrKOpf<Pu#UEgNT;Ir(-2^%F{aUZ7T^QW2D}uJA<vge;9L$r
z1n39afo2i;{7;kF$*Ke6e8vM{wa3$tC&w^w!s9rTC&v^}50r>VR$#|se*`8#A5iA-
zyo$+F<8U;_<anqBb~z@Q09ON!0_>R;hvT{9OL`8z9QFfy<{69vo1L)-xB&DjWCH<5
zm7=?;@Z3`DIs%SjVA9h)@i-0wSFma9^W1TRGQgN;&=hg2SQW7=%h1!gPT{Cf?4Aa?
zZHlfw!j}VzZQ5=3<-ig$fAIzdBJve@uc%6at%|%&ku6nZ;e1+GeXIEbywLn`1JfK*
z12e`f0@iurArbkcIQ0wYQD~|aS@#USL<Lr^$lBe&@>!({pv0548Dmn|{CCkQBGU@T
zOo8R&i)P!JD=>A(uyy341wEa$G=%I00O$^~VUs8C7m*R)I9SL!e}$*jEy8bP7T{07
zD8;%Pdl<U5)4+D%2-$^vT;VX-j_cYD2D(ax<8egeIIr0D0i^{&<ZFQCUesTJYGX|3
zNCmJzaNfUiT@;aKV@$2Odf8ZyZ8R=sY8>B<G2spu1vYiS4#oDQh>V4i*AV|OOany$
z&m&Ja4iqXYU90efe+T@fIr!2L&Jos_wo0=>6HqH66A?UJA~LDGmv7^k4Q>Nx|2_q)
zbdUU2W*9gHq?}z?tJqzOsEzxI?JjJJYd49RMlY~8>eqmOZuDVq?Jj-*@33t*Eh3|y
zz7%_Pa&Z?O-N2A1OJi%V%#*i}U8jTCv#|%86%!~}LG~)#V3@C;F5XTaQhYfYhbx7C
z%FpZ9u7m&POA5VM7b-B{m*42uv7FEX3tRX?!1v{~h)l&HDgZWM|6zpqs5FMeVT@Uc
g{SI?|X^PAD2MnjlQ=ApYo&W#<07*qoM6N<$f>|7*>;M1&

diff --git a/include/header.inc b/include/header.inc
index e5599b21b..9187b7fad 100644
--- a/include/header.inc
+++ b/include/header.inc
@@ -38,8 +38,8 @@ if (isset($shortname) && $shortname) {
  <link rel="<?php echo $rel ?>" href="<?php echo $MYSITE ?><?php echo $page ?>" />
 <?php endforeach ?>
 
+ <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,400italic,600italic|Source+Code+Pro&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
  <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/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" />
@@ -85,24 +85,26 @@ if (isset($shortname) && $shortname) {
 </head>
 <body class="<?php print $curr; ?> <?php echo $classes; ?>">
 
+<?php if (!isset($_COOKIE['BetaWarning']) || filter_var($_COOKIE['BetaWarning'],FILTER_VALIDATE_BOOLEAN) == TRUE): ?>
 <div id="head-beta-warning">
   <p id="beta-warning">
     <span class="blurb">Welcome to the php.net beta site. If you want to revert back, <a href="?setbeta=0">click here</a></span>
     <a href="#" id="beta-warning-close">X</a>
   </p>
 </div>
+<?php endif;?>
 
-<nav id="headnav" class="navbar navbar-inverse navbar-fixed-top">
+<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.png" width="54" height="26" alt="php"/></a>
+      <a href="/" class="brand"><img src="/images/logos/php-logo.png" width="52" height="26" alt="php"/></a>
       <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">
+      <form class="navbar-search span3" id="topsearch" action="/search.php">
           <input type="search" name="pattern" class="search-query" placeholder="Search"/>
       </form>
     </div>
diff --git a/js/common.js b/js/common.js
index 02723e7c1..805999ee7 100644
--- a/js/common.js
+++ b/js/common.js
@@ -17,7 +17,7 @@ $(document).ready(function() {
     $("#beta-warning-close").click(function(event) {
         event.preventDefault();
         $('body').css('margin-top', 0);
-        $headBetaWarning.slideUp("fast");
+        $headBetaWarning.slideUp("fast", function(){$(this).remove()});
 
         // Hide it for a month by default.
         var expiry = new Date();
@@ -38,8 +38,8 @@ $(document).ready(function() {
 
     if (showBetaWarning) {
         $headBetaWarning.show();
-        $('body').css('margin-top', '25px');
-        $('#beta-warning').slideDown(300, function() {
+        $('body').css('margin-top', $headBetaWarning.outerHeight()+12);
+        $headBetaWarning.slideDown(300, function() {
            $(this).find('.blurb').fadeIn('slow');
         });
     }
diff --git a/styles/bootstrap.css b/styles/bootstrap.css
index fac672779..4097f2c88 100644
--- a/styles/bootstrap.css
+++ b/styles/bootstrap.css
@@ -519,9 +519,6 @@ textarea {
   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,
@@ -627,11 +624,12 @@ textarea {
 }
 .navbar-search .search-query {
   margin-bottom: 0;
-  padding: .5em .75em;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  font-weight: normal;
+  padding: .25em .5em;
   line-height: 1;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing:border-box;
+  width:100%;
 }
 .navbar-static-top {
   position: static;
@@ -920,8 +918,7 @@ textarea {
   box-shadow: inset 0 1px 2px rgba(0,0,0,.2);
 }
 .navbar-inverse .navbar-search .search-query:focus {
-  box-shadow: inset 0 1px 2px rgba(0,0,0,.2), 0 0 .25em .25em rgba(0,0,0,.5);
-  outline:0;
+  box-shadow: inset 0 1px 2px rgba(0,0,0,.2);
 }
 .navbar-inverse .navbar-search .search-query:-moz-placeholder {
   color: #999;
diff --git a/styles/doc.css b/styles/doc.css
index a404023aa..86598ae52 100755
--- a/styles/doc.css
+++ b/styles/doc.css
@@ -167,7 +167,7 @@ aside#quicktoc {
 .docs .refentry .constructorsynopsis,
 .docs .refentry .methodsynopsis {
     color: #666;
-    font:normal 16px / 24px monospace;
+    font:normal 16px / 24px "Source Code Pro", monospace;
     margin:0;
 }
 
@@ -180,10 +180,6 @@ aside#quicktoc {
     margin-top:.75em;
 }
 
-.docs .refentry .parameters dl dt code.parameter {
-    font-size:1.23076em;
-}
-
 /* }}} */
 
 .docs .example {
@@ -466,7 +462,9 @@ div.soft-deprecation-notice blockquote.sidebar {
 
 #breadcrumbs {
     background:#eee;
-    margin:0 0 .75em;
+    margin:0 0 0.85714285714286em;
+    font-size:.875em;
+    line-height:1.71428571428571;
     -moz-border-radius:2px;
     border-radius:2px;
 }
diff --git a/styles/home.css b/styles/home.css
index 0fca17aa5..8b7800f4b 100644
--- a/styles/home.css
+++ b/styles/home.css
@@ -154,8 +154,9 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82    CCDA99
 }
 
 #head-beta-warning {
+    padding:.25em 0;
+    border:0;
     background-color: #99C;
-    display: none;
     position: fixed;
     top: 0px;
     left: 0px;
@@ -165,14 +166,10 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82    CCDA99
 
 #beta-warning {
     margin: 0 auto;
-    padding: 0.3em;
     text-align: center;
 }
 
 #beta-warning .blurb {
-    font-size: 1.1em;
-    line-height: 1.0em;
-    vertical-align: middle;
     color: #EEE;
 }
 
@@ -190,15 +187,13 @@ complimentary greens: 9FB553    7B8851    61761B    C6DA82    CCDA99
     font-weight: bold;
     text-decoration: none;
     margin: 0 0 0 1em;
-    height: 1.2em;
-    line-height: 1.2em;
-    vertical-align: middle;
     width: 1.2em;
-    padding: 0.2em 0.5em 0.2em 0.5em;
+    height: 1.2em;
+    padding: 0 0.375em;
     text-align: center;
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+    border:0;
 }
 
 /* Main content area */
@@ -282,81 +277,6 @@ section.layout-content.home {
     background:#669;
 }
 
-#thanks-to {
-    border-top:.25em solid #669;
-    padding-top:1.25em;
-}
-#thanks-to ul, #thanks-to li {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-#thanks-to ul {
-    width: 976px;
-}
-#thanks-to li {
-    float: left;
-    width: 228px;
-    margin: 0.6em 16px 0.6em 0;
-}
-#thanks-to li a:hover {
-    background: #ddd;
-}
-#thanks-to li a {
-    background: #eee;
-    border: 0;
-    color: #333;
-    padding: 0.6em 1em;
-    line-height: 1.25em;
-    text-decoration: none;
-    display: block;
-}
-
-#thanks-to .thanks-two {
-    position: relative;
-    overflow: hidden;
-    height: 2.4em;
-}
-#thanks-to .thanks-two a {
-    display: inline-block;
-    margin: 0;
-    padding: 0;
-    position: relative;
-    height: 0;
-    background: transparent;
-}
-#thanks-to .thanks-two a:hover {
-    background: transparent;
-}
-#thanks-to .thanks-two a:first-child {
-    border-top: 2.45em solid #eee;
-    border-right: 1em solid transparent;
-    width: 55%;
-}
-#thanks-to .thanks-two a:first-child:hover {
-    border-top: 2.45em solid #ddd;
-}
-#thanks-to .thanks-two a:last-child {
-    position: absolute;
-    top: 0;
-    right: 0;
-    left: 57%;
-    border-bottom: 2.45em solid #eee;
-    border-left: 1em solid transparent;
-}
-#thanks-to .thanks-two a:last-child:hover {
-    border-bottom: 2.45em solid #ddd;
-}
-#thanks-to .thanks-two span {
-    display: block;
-    position: absolute;
-    top: -1.85em;
-    left: 1em;
-}
-#thanks-to .thanks-two a:last-child span {
-    top: 0.6em;
-}
-
 .home .newsItem {
     border-bottom: 0;
 }
diff --git a/styles/theme.css b/styles/theme.css
index ff1fa0242..7032454a9 100755
--- a/styles/theme.css
+++ b/styles/theme.css
@@ -21,7 +21,17 @@ body * {
 }
 
 body, input, textarea {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
+}
+.docs .refentry .constructorsynopsis,
+.docs .refentry .methodsynopsis,
+code,
+pre.info {
+    font: 400 .75em / 1.5 "Source Code Pro", monospace; 
+}
+
+#head-beta-warning + #head-nav {
+    top:2em;
 }
 
 body {
@@ -416,12 +426,6 @@ dl dd p + p {
 }
 
 
-/* PHP source code highlighting ------------------------------------------- */
-code {
-    font: 12px / 18px monospace;
-    /* we were setting this in ems but the monospace seemed to be having problems */
-}
-
 .phpcode, div.classsynopsis {
     text-align: left;
 }
@@ -458,8 +462,6 @@ div.phpcode span.string {
     background-color: #EFEFEF;
 }
 pre.info {
-    font-family: monospace;
-    font-size:1.230769em; /* bumps it back up to the rest of the fonts because monospace is smaller */
     border: 1px solid #ddd;
     margin: 1em 2em 1.3em;
     margin-right: 0.8em;