com web/master: Sync with how php.net will hopefully someday look like: images/php-logo@2x.png include/functions.inc style.css

Commit: 4a4ba118f037e56fe8c763c30d6f8316290b3add Author: Hannes Magnusson <bjori@10gen.com> Tue, 20 Aug 2013 19:38:59 -0700 Parents: 3a766e2eb21f99d55ad2408ddc0a0ecdab5bd4a7 Branches: master Link: http://git.php.net/?p=web/master.git;a=commitdiff;h=4a4ba118f037e56fe8c763c30d6f8316290b3add Log: Sync with how php.net will hopefully someday look like . And remove that password note that has been ignored for years now :) Changed paths: A images/php-logo@2x.png M include/functions.inc M style.css Diff: diff --git a/images/php-logo@2x.png b/images/php-logo@2x.png new file mode 100644 index 0000000..aa4da62 Binary files /dev/null and b/images/php-logo@2x.png differ diff --git a/include/functions.inc b/include/functions.inc index be6d87b..0734313 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -23,7 +23,8 @@ function head($title="",$private=1) { // Default to $private == true to permit n <head> <title>PHP: <?php echo $title ?></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <link type="text/css" media="all" rel="stylesheet" href="/style.css" /> + <link type="text/css" media="all" rel="stylesheet" href="/style.css?v=2" /> + <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="shortcut icon" href="//php.net/favicon.ico" /> <script type="text/javascript" src="js/jquery.min.js"></script> <script type="text/javascript" > @@ -50,10 +51,12 @@ function head($title="",$private=1) { // Default to $private == true to permit n </head> <body> - <h1 id="header"><a href="http://php.net/index.php">PHP: Hypertext Preprocessor</a><?php echo !empty($title) ? ' - '.$title : ''; ?></h1> +<header> + <nav id="header-nav"> + <div id="pagename"><a href="/">master . <img src="/images/php-logo@2x.png" width="48" height="24" alt="php"> . net</a></div> <?php if ($private) { ?> - <ul id="mainmenu"> + <ul> <li><a href="/manage/event.php">Events</a></li> <li><a href="/manage/mirrors.php">Mirrors</a></li> <li><a href="/manage/users.php">Users</a></li> @@ -67,8 +70,8 @@ function head($title="",$private=1) { // Default to $private == true to permit n <li><a href="/login.php?action=logout">Logout</a></li> </ul> <?php - warn("Have you changed your password yet?"); } // End if ($private) + echo '</nav></header>'; } function foot() { diff --git a/style.css b/style.css index e7c0181..c24983d 100644 --- a/style.css +++ b/style.css @@ -1,19 +1,60 @@ -div#header { - background: #dde; - border: 2px solid #669; - padding: 2px 4px; +header { + top: 0px; + left: 0px; + position: fixed; + width: 100%; + + border-bottom: 0.2em solid #669; + background-color: #99c; + box-shadow: -2px 2px 6px #bbb; } -div#header div#logo { - display: inline; +body { + padding: 20px; + margin: 20px; + border: 1px solid #ddd; + box-shadow: -2px 2px 6px #bbb; + background-color: #eeeef6; + color: #444; } -div#header div#logo a { - text-decoration: none; + +nav { + margin-left: 100px; } -div#header div#links { - display: inline; - text-align: right; - font-size: smaller; - font-family: sans-serif; +nav ul { + list-style: none; + list-style-type: none; + margin: 0; + padding: 0; +} + +nav li { + display: inline-block; + padding: 0; + margin: 0; +} +nav li a { + display: inline-block; + padding: 15px 20px; + font-weight: normal; + color: #eef; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + text-decoration: none; + font-family: "Source Sans Pro", Helvetica, Arial, sans-serif; +} +nav li a:active, nav li a:hover, nav li a:focus, nav li a:visited { + font-family: "Source Sans Pro", Helvetica, Arial, sans-serif; + font-weight: normal; + background-color: #669; + color: #eef; +} +#pagename { + float: left; +} +#pagename a { + display: inline-block; + padding: 11px 20px; + text-decoration: none; + color: #eef; } /* Notes management page */ @@ -103,42 +144,9 @@ div.phpcode span.string { body { - margin: 0; font-family: Tahoma, Arial, sans-serif, serif, monospace; background-color: #f8f8f8; } -h1#header { - margin: 0; - background: url(/images/php.gif) #5a5993 no-repeat; - padding: 20px 0 10px 150px; - height: 37px; - font-style: italic; - font-size: 1em; - color: #B5B5E9; -} -h1#header a { - color: #B5B5E9; -} -ul#mainmenu { - margin: 0; - background-color: #f3f3f3; - font-size: 0.9em; - padding: 8px 10px; - text-align: center; - border-top: 1px solid #000000; - border-bottom: 1px solid #D0D0D0; -} -ul#mainmenu li { - display: inline; - padding: 0 1%; - border-right: 1px solid #CDCDCD; -} -ul#mainmenu li a { - color: #6181B7; -} -ul#mainmenu li:last-child { - border: 0px; -} p.warning, p.warning { padding: 1em; margin: 0px;