Commit: a821979d481056ce96123281fc1c0cc2fba31bf0
Author: Levi Morrison <[email protected]> Mon, 16 Sep 2013 08:40:16 -0600
Parents: b3fcfda2908192e9a40c9f54ca4227c9be9d5bbb
Branches: master
Link:
http://git.php.net/?p=web/php.git;a=commitdiff;h=a821979d481056ce96123281fc1c0cc2fba31bf0
Log:
Some minor structure and color changes.
Changed paths:
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/include/header.inc b/include/header.inc
index 544ca89..8021319 100644
--- a/include/header.inc
+++ b/include/header.inc
@@ -72,15 +72,6 @@ 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="head-nav" class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
@@ -98,6 +89,15 @@ if (isset($shortname) && $shortname) {
</div>
</nav>
+<?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;?>
+
<?php if (!empty($config['intro'])):?>
<div id="intro">
<div class="container">
diff --git a/js/common.js b/js/common.js
index 1d424ec..1ccf712 100644
--- a/js/common.js
+++ b/js/common.js
@@ -16,21 +16,11 @@ $(document).ready(function() {
// Ugh, cookie handling.
var cookies = document.cookie.split(";");
- var showBetaWarning = true;
- for (var i = 0; i < cookies.length; i++) {
- if (cookies[i].indexOf("BetaWarning=") != -1) {
- showBetaWarning = false;
- break;
- }
- }
-
- var $headBetaWarning = $('#head-beta-warning'); // Cache for multiple
references
// Wire up the beta warning.
$("#beta-warning-close").click(function(event) {
event.preventDefault();
- $('body').css('margin-top', 0);
- $headBetaWarning.slideUp("fast", function(){$(this).remove()});
+ $('#head-beta-warning').slideUp("fast", function(){$(this).remove()});
// Hide it for a month by default.
var expiry = new Date();
@@ -39,14 +29,6 @@ $(document).ready(function() {
document.cookie = "BetaWarning=off; expires=" + expiry.toGMTString() +
"; path=/";
});
- if (showBetaWarning) {
- $headBetaWarning.show();
- $('body').css('margin-top', $headBetaWarning.outerHeight()+12);
- $headBetaWarning.slideDown(300, function() {
- $(this).find('.blurb').fadeIn('slow');
- });
- }
-
var $docs = $('.docs');
var $refsect1 = $docs.find('.refentry .refsect1');
var $docsDivWithId = $docs.find('div[id]');
diff --git a/styles/bootstrap.css b/styles/bootstrap.css
index ca46eb6..6d94fe3 100644
--- a/styles/bootstrap.css
+++ b/styles/bootstrap.css
@@ -1877,9 +1877,8 @@ textarea {
.navbar-fixed-bottom {
position: static;
}
- .navbar-fixed-top .navbar-inner,
.navbar-fixed-bottom .navbar-inner {
- padding: 5px;
+ padding: 0 5px;
}
.navbar .container {
padding: 0;
diff --git a/styles/doc.css b/styles/doc.css
index 01d4cd8..4b82cc4 100755
--- a/styles/doc.css
+++ b/styles/doc.css
@@ -20,8 +20,8 @@ body.docs #layout {
.docs .methodname strong,
.docs .methodname a,
.docs .classsynopsis .classname {
- color: #458;
- border-color:#458;
+ color: #369;
+ border-color:#369;
}
.docs .refsect1 .parameter {
@@ -32,8 +32,7 @@ body.docs #layout {
}
.docs .parameter {
- color: #447;
- font-style:italic;
+ color: #369;
}
.docs .refsect1 code.parameter {
font-weight:bold;
@@ -48,7 +47,7 @@ body.docs #layout {
.docs .initializer,
.docs .initializer code {
font-style:italic !important;
- color:#b14;
+ color:#936;
}
/* }}} */
@@ -137,7 +136,7 @@ body.docs #layout {
margin:0;
}
.docs .dc-description {
- color:#666;
+ color:#808080;
}
/* {{{ Parameter listing */
@@ -167,7 +166,7 @@ body.docs #layout {
.docs .example-contents.screen {
background-color: #fff;
padding: .75em .625em;
- border:1px solid #dcdcdc;
+ border:1px solid #d6d6d6;
}
.docs .refsect1 .example-contents > [class$="code"],
.docs .refsect1 .example-contents.screen {
@@ -205,7 +204,7 @@ body.docs #layout {
background-color: #ffffff;
}
.docs .doctable tbody tr:nth-child(even) {
- background-color: #eeeef6;
+ background-color: #ebebf4;
}
.docs .doctable {
@@ -266,13 +265,25 @@ ul.chunklist_children {
}
.docs h1.refname {
- color: #336;
+ color: #669;
font-weight:bolder
}
.docs .refnamediv {
position:relative;
}
+.docs .refentry .refpurpose {
+ display:none;
+ border-radius:0 0 2px 2px;
+ padding: .75em .625em;
+ background-color:#F0F0F0;
+ border-top:.125em solid #808080;
+ border-bottom:1px solid #D6D6D6;
+ box-shadow:
+ inset 2px 0 2px -2px #D6D6D6,
+ inset -2px 0 2px -2px #D6D6D6;
+}
+
.docs .refsect1 h3.title {
color: #333;
position: absolute;
@@ -284,10 +295,10 @@ ul.chunklist_children {
.docs .refsect1 {
color: #333;
border-top:0.125em solid #669;
- border-bottom:1px solid #d6d6dd;
+ border-bottom:1px solid #CACAE2;
box-shadow:
- inset 2px 0 2px -2px #d6d6dd,
- inset -2px 0 2px -2px #d6d6dd;
+ inset 2px 0 2px -2px #CACAE2,
+ inset -2px 0 2px -2px #CACAE2;
}
.docs .refsect1 {
@@ -297,7 +308,7 @@ ul.chunklist_children {
.docs .classsynopsis,
.docs div.refsect1 {
position: relative;
- background-color: #eeeef6;
+ background-color: #ebebf4;
-moz-border-radius:0 0 2px 2px;
border-radius:0 0 2px 2px;
padding: .75em .625em;
@@ -311,8 +322,8 @@ ul.chunklist_children {
.docs .fieldsynopsis .type,
.docs .methodsynopsis .type,
.docs .constructorsynopsis .type {
- color:#092;
- border-color:#092;
+ color:#693;
+ border-color:#693;
}
.docs .fieldsynopsis .modifier,
@@ -360,8 +371,8 @@ ul.chunklist_children {
}
.docs .layout-menu ul.parent-menu-list a:hover {
- color: #336;
- border-color: #669;
+ color: #693;
+ border-color: #693;
text-shadow:0 0 .25em #fff;
}
@@ -375,22 +386,28 @@ ul.chunklist_children {
margin: 0;
}
+.docs .layout-menu ul.child-menu-list .current a {
+ color:#669;
+ border-color:#669;
+}
.docs .layout-menu ul.child-menu-list a {
font-size: .875em;
line-height: 1.714285714;
- border-bottom: 1px dotted #c1c1c1;
+ border-bottom: 1px dotted #BDBDBD;
display:block;
- padding-left:.5em;
+ padding-left:.125em;
}
.docs .layout-menu ul.child-menu-list .current {
- font-weight:700;
+ font-weight:bolder;
}
-.docs .layout-menu ul.child-menu-list .current a {
- color:#000;
+.docs .layout-menu ul.child-menu-list .current {
+ position:relative;
}
.docs .layout-menu ul.child-menu-list .current a:before {
content:"\bb \20";
+ position:absolute;
+ left:-.675em;
}
#changelang-langs {
@@ -432,9 +449,10 @@ div.soft-deprecation-notice blockquote.sidebar {
#breadcrumbs {
- background:#f2f2f2;
- border:1px solid #e6e6e6;
- border-bottom-color:#dcdcdc;
+ color:#888;
+ background:#f0f0f0;
+ border:1px solid #e3e3e3;
+ border-bottom-color:#d6d6d6;
margin:0 0 0.85714285714286em;
font-size:.875em;
line-height:1.71428571428571;
@@ -454,9 +472,20 @@ div.soft-deprecation-notice blockquote.sidebar {
#breadcrumbs .divider {
padding:0 .25em;
}
-#breadcrumbs a {
- border:0;
+#breadcrumbs a:link,
+#breadcrumbs a:visited {
+ color:#369;
+ border-width:0;
+ border-color:#369;
}
#breadcrumbs li:last-child a {
- color:#222;
+ color:#666;
+ border-color:#999;
+}
+#breadcrumbs li:last-child a:hover,
+#breadcrumbs li:last-child a:focus,
+#breadcrumbs a:hover,
+#breadcrumbs a:focus {
+ color:#693;
+ border-color:#693;
}
diff --git a/styles/home.css b/styles/home.css
index e21342e..459bce9 100644
--- a/styles/home.css
+++ b/styles/home.css
@@ -3,9 +3,6 @@
complimentary greens: 9FB553 7B8851 61761B C6DA82 CCDA99
*/
-body #head-beta-warning + #head-nav + #intro {
- margin-top:2em;
-}
#intro {
background:#444449;
box-shadow:inset 0 0 2em rgba(0,0,0,.375);
@@ -64,49 +61,6 @@ body #head-beta-warning + #head-nav + #intro {
content: "\21AF \2003";
}
-#head-beta-warning {
- padding:.25em 0;
- border:0;
- background-color: #99C;
- position: fixed;
- top: 0px;
- left: 0px;
- width: 100%;
- z-index: 999;
-}
-
-#beta-warning {
- margin: 0 auto;
- text-align: center;
-}
-
-#beta-warning .blurb {
- color: #EEE;
-}
-
-#beta-warning .blurb a {
- color: #333;
-}
-
-#beta-warning .blurb strong {
- color: #333;
-}
-
-#beta-warning-close {
- background-color: #333;
- color: #EEE;
- font-weight: bold;
- text-decoration: none;
- margin: 0 0 0 1em;
- width: 1.2em;
- height: 1.2em;
- padding: 0 0.375em;
- text-align: center;
- -moz-border-radius: 2px;
- border-radius: 2px;
- border:0;
-}
-
/* Announcement Area */
.home aside.tips {
@@ -122,9 +76,9 @@ body #head-beta-warning + #head-nav + #intro {
}
.home .announcements {
display: block;
- background-color: #eeeef6;
- border:1px solid #e6e6ee;
- border-bottom-color:#d6d6dd;
+ background-color: #ebebf4;
+ border:1px solid #dbdbeb;
+ border-bottom-color:#cacae2;
border-radius: 0 0 2px 2px;
padding: 1em;
margin: 0;
@@ -147,10 +101,10 @@ body #head-beta-warning + #head-nav + #intro {
}
.home aside.tips h3.panel a {
- background:#f2f2f2;
+ background:#f0f0f0;
color:#333;
- border:1px solid #e6e6e6;
- border-bottom-color:#dcdcdc;
+ border:1px solid #e3e3e3;
+ border-bottom-color:#d6d6d6;
border-radius:2px;
display: block;
padding: .625em 0.88888888888889em;
@@ -162,8 +116,9 @@ body #head-beta-warning + #head-nav + #intro {
}
.home aside.tips h3.panel a:hover,
.home aside.tips h3.panel a:focus {
- background:#eeeef6;
- border-bottom-color:#d6d6dd;
+ background:#ebebf4;
+ border-color:#dbdbeb;
+ border-bottom-color:#cacae2;
color:#000;
}
.home aside.tips h3.panel a:hover::after,
@@ -173,12 +128,13 @@ body #head-beta-warning + #head-nav + #intro {
.home aside.tips a:link,
.home aside.tips a:visited {
+ color:#369;
border-bottom-color: transparent;
}
.home aside.tips a:hover,
.home aside.tips a:focus {
- border-bottom-color: inherit;
- border-bottom-color:rgba(63, 67, 141, 0.5);
+ color:#f25050;
+ border-bottom-color: #f25050;
}
.home-content #recentNewsEntries {
diff --git a/styles/theme.css b/styles/theme.css
index b880cfd..a844c69 100755
--- a/styles/theme.css
+++ b/styles/theme.css
@@ -33,21 +33,12 @@ pre.info {
font: 400 1em / 1.5 "Source Code Pro", monospace;
}
-#head-beta-warning + #head-nav {
- top:2em;
-}
-body #head-beta-warning + #head-nav + #layout {
- margin-top:2.75em;
-}
#head-beta-warning {
padding:.25em 0;
- border:0;
- background-color: #99C;
- position: fixed;
- top: 0px;
- left: 0px;
- width: 100%;
- z-index: 999;
+ height:1.5em;
+ border-bottom:.125em solid #696;
+ background-color: #9c9;
+ color:#fff;
}
#beta-warning {
@@ -55,26 +46,21 @@ body #head-beta-warning + #head-nav + #layout {
text-align: center;
}
-#beta-warning .blurb {
- color: #EEE;
-}
-
-#beta-warning .blurb a {
- color: #333;
-}
-
+#beta-warning .blurb a,
#beta-warning .blurb strong {
- color: #333;
+ color: #fff;
+ border-color:#fff;
}
#beta-warning-close {
- background-color: #333;
- color: #EEE;
+ background-color: #696;
+ color: #fff;
font-weight: bold;
text-decoration: none;
- margin: 0 0 0 1em;
+ margin: 0 0 0 .25em;
width: 1.2em;
height: 1.2em;
+ line-height:1.2em;
padding: 0 0.375em;
text-align: center;
-moz-border-radius: 2px;
@@ -188,16 +174,14 @@ h4, h5, h6 {
a:link,
a:visited {
- color: rgb(63, 67, 141);
- border-bottom: 1px solid rgb(63, 67, 141);
- border-bottom: 1px solid rgba(63, 67, 141, 0.5);
+ color: #369;
+ border-bottom: 1px solid #369;
}
a:hover,
a:focus {
- color: rgb(0, 17, 85);
- border-bottom-color:rgb(0, 17, 85);
- border-bottom-color:rgba(0, 17, 85, 0.5);
+ color: #693;
+ border-bottom-color:#693;
}
ul {
@@ -340,11 +324,10 @@ hr {
}
#usernotes .count {
- background-color: #7F7FB2;
+ background-color: #669;
color: white;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
padding: 0.333333333em .5em;
font-size: 0.666666667em;
line-height:2;
@@ -415,16 +398,16 @@ hr {
}
#usernotes .note .text {
- background-color: #f2f2f2;
- border-top: .125em solid #dcdcdc;
+ background-color: #f0f0f0;
+ border-top: .125em solid #d6d6d6;
padding: .625em .75em .75em;
margin-top:.25em;
-moz-border-radius:0 0 2px 2px;
border-radius:0 0 2px 2px;
- border-bottom:1px solid #e6e6e6;
+ border-bottom:1px solid #e3e3e3;
box-shadow:
- inset 2px 0 2px -2px #e6e6e6,
- inset -2px 0 2px -2px #e6e6e6;
+ inset 2px 0 2px -2px #e3e3e3,
+ inset -2px 0 2px -2px #e3e3e3;
}
/* Vote arrow styles. */
@@ -612,8 +595,8 @@ aside.tips div.border {
aside.tips div.inner {
padding: .75em;
background:#eeeef6;
- border-left:1px solid #e6e6e6;
- border-right:1px solid #e6e6e6;
+ border-left:1px solid #e3e3e3;
+ border-right:1px solid #e3e3e3;
border-bottom:1px solid #d6d6dd;
border-radius: 0 0 2px 2px;
}
@@ -627,9 +610,9 @@ aside.tips div.inner {
.layout-menu {
float: left;
padding:.5em .75em 1.5em;
- background-color:#f2f2f2;
- border: 1px solid #e6e6e6;
- border-bottom-color:#dcdcdc;
+ background-color:#f0f0f0;
+ border: 1px solid #e3e3e3;
+ border-bottom-color:#d6d6d6;
border-radius:2px;
}--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
