Commit: eb5dbfb0bccea4e9fb60eba1ca3510e20618d5ce
Author: Levi Morrison <[email protected]> Thu, 11 Jul 2013 16:03:32 -0600
Parents: b1eb7418d69b43ee1b9b709e9bdf67958e405a7a
Branches: responsive
Link:
http://git.php.net/?p=web/php.git;a=commitdiff;h=eb5dbfb0bccea4e9fb60eba1ca3510e20618d5ce
Log:
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.
Changed paths:
M images/logos/php-logo.png
M include/header.inc
M js/common.js
M styles/bootstrap.css
M styles/doc.css
M styles/home.css
M styles/theme.css
diff --git a/images/logos/php-logo.png b/images/logos/php-logo.png
index f4c4451..decb0f5 100644
Binary files a/images/logos/php-logo.png and b/images/logos/php-logo.png differ
diff --git a/include/header.inc b/include/header.inc
index e5599b2..9187b7f 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 02723e7..805999e 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 fac6727..4097f2c 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 a404023..86598ae 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 0fca17a..8b7800f 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 ff1fa02..7032454 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;--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
![[PHP-WEBMASTER] com web/php: 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 include/header.inc js/common.js styles/bootstrap.css styles/doc.css styles/home.css styles/theme.css](/search?l=php-webmaster@lists.php.net&q=subject:%22%5C%5BPHP%5C-WEBMASTER%5C%5D+com+web%5C%2Fphp%5C%3A+Updated+beta%5C-warning+to+actually+work+with+the+new+fixed%5C-header.+A+lot+of+header+love+in+general%2C+such+as+a+cleaned%5C-up+logo+and+a+better+searchbox.%5C%3A+images%5C%2Flogos%5C%2Fphp%5C-logo.png+include%5C%2Fheader.inc+js%5C%2Fcommon.js+styles%5C%2Fbootstrap.css+styles%5C%2Fdoc.css+styles%5C%2Fhome.css+styles%5C%2Ftheme.css%22&o=newest){kind=link}
