com web/php: Initial commit for Material design.: include/footer.inc include/header.inc include/shared-manual.inc styles/home.css
styles/theme-base.css styles/theme-medium.css
| From: | Levi Morrison | Date: | Fri, 18 Jul 2014 18:00:27 +0000 |
| Subject: | com web/php: Initial commit for Material design.: include/footer.inc include/header.inc include/shared-manual.inc styles/home.css styles/theme-base.css styles/theme-medium.css |
||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-19477@lists.php.net to get a copy of this message | ||
Commit: 0108d9b7b045da1d6e0e5503aa72baa2a1221549
Author: Levi Morrison <levim@php.ent> Fri, 18 Jul 2014 12:00:27 -0600
Parents: 6dfbaafab81e5b53419f95a5203a2b4e30e46a98
Branches: material
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=0108d9b7b045da1d6e0e5503aa72baa2a1221549
Log:
Initial commit for Material design.
Changed paths:
M include/footer.inc
M include/header.inc
M include/shared-manual.inc
M styles/home.css
M styles/theme-base..css
M styles/theme-medium.css
diff --git a/include/footer.inc b/include/footer.inc index 4eb0870..cdf5aa2 100644 --- a/include/footer.inc +++ b/include/footer.inc @@ -9,7 +9,22 @@ ?> <?php if (!empty($config['related_menu'])): ?> <aside class='layout-menu'> - + +<?php + $id = substr($setup['this'][0], 0, -4); + $language_chooser = 'manual_language_chooser'; + echo <<<PAGE_TOOLS + <div class="page-tools"> + <div class="change-language"> + {$language_chooser($config['lang'], $config['thispage'])} + </div> + <div class="edit-bug"> + <a href="https://edit.php.net/?project=PHP&perm={$config['lang']}/{$config['thispage']}">Edit</a> + <a href="https://bugs.php.net/report.php?bug_type=Documentation+problem&manpage=$id">Report a Bug</a> + </div> + </div> +PAGE_TOOLS; +?> <ul class='parent-menu-list'> <?php foreach($config['related_menu'] as $section): ?> <li> diff --git a/include/header.inc b/include/header.inc index 88d56c8..4d20167 100644 --- a/include/header.inc +++ b/include/header.inc @@ -126,6 +126,7 @@ if (!isset($config["languages"])) { <?php if (!empty($config['breadcrumbs'])): ?> <div id="breadcrumbs" class="clearfix"> + <ul class="breadcrumbs-container"> <?php if (isset($config['next'])): ?> <div class="next"> <a href="<?php echo $config['next'][0]; ?>"> @@ -140,7 +141,6 @@ if (!isset($config["languages"])) { </a> </div> <?php endif; ?> - <ul class="breadcrumbs-container"> <?php $breadcrumbs = $config['breadcrumbs']; $last = array_pop($breadcrumbs); diff --git a/include/shared-manual.inc b/include/shared-manual.inc index 43cbb24..ee6dc4d 100644 --- a/include/shared-manual.inc +++ b/include/shared-manual.inc @@ -418,21 +418,7 @@ function manual_setup($setup) { "next" => $setup["next"], "cache" => $lastmod, ); - site_header($setup["this"][1] . " - Manual ", $config); - - $id = substr($setup['this'][0], 0, -4); - $language_chooser = 'manual_language_chooser'; - echo <<<PAGE_TOOLS - <div class="page-tools"> - <div class="change-language"> - {$language_chooser($config['lang'], $config['thispage'])} - </div> - <div class="edit-bug"> - <a href="https://edit.php.net/?project=PHP&perm={$config['lang']}/{$config['thispage']}">Edit</a> - <a href="https://bugs.php.net/report.php?bug_type=Documentation+problem&manpage=$id">Report a Bug</a> - </div> - </div> -PAGE_TOOLS; + site_header($setup["this"][1] . " - Manual ", $config); } function manual_language_chooser($currentlang, $currentpage) { @@ -461,7 +447,6 @@ function manual_language_chooser($currentlang, $currentpage) { $r = <<<CHANGE_LANG <form action="/manual/change.php" method="get" id="changelang" name="changelang"> <fieldset> - <label for="changelang-langs">Change language:</label> <select onchange="document.changelang.submit()" name="page" id="changelang-langs"> {$format_options($links)} <option value="help-translate.php">Other</option> diff --git a/styles/home.css b/styles/home.css index ffb0b02..065625d 100644 --- a/styles/home.css +++ b/styles/home.css @@ -1,13 +1,11 @@ /* Home Page */ #intro p { - color:#fff; text-rendering: optimizeLegibility; } #intro p, #intro ul { - text-shadow:0 1px 2px rgba(0,0,0,.5); - font-size:1.125rem; + font-size:1.25rem; } #intro ul a { @@ -26,10 +24,6 @@ #intro h3 { margin:1.5rem 0 0; - color:#E6E6E6; -} -#intro h3:after { - display:none; } #intro .row { @@ -55,24 +49,16 @@ font-size:.75em; white-space:nowrap; } -#intro .download a { - color:#ccc; - border:0; -} #intro .download a:hover, #intro .download a:focus { border-bottom:1px dotted; } #intro .download a.download-link { - color:#fff; width: 50px; display: inline-block; } -#layout-content { - border-right:.25rem solid #666; -} .home .newsentry .newstitle a:after { content:"\20 \00bb"; color:#666; diff --git a/styles/theme-base.css b/styles/theme-base.css index ba73007..5859615 100755 --- a/styles/theme-base.css +++ b/styles/theme-base.css @@ -21,13 +21,6 @@ .clearfix:after { clear: both; } -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} article, aside, details, @@ -50,11 +43,13 @@ video { audio:not([controls]) { display: none; } + html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } + a { border-bottom:1px solid; } @@ -66,6 +61,7 @@ a:hover, a:active { outline: 0; } + sub, sup { position: relative; @@ -82,6 +78,7 @@ sub { pre { white-space:pre-wrap; } + #map_canvas img, .google-maps img { max-width: none; @@ -169,20 +166,13 @@ textarea { } .navbar .brand { - margin-right:.75rem; + margin-right:1.5rem; float: left; display: block; - height: 1.5rem; - padding: .75rem .75rem .75rem 1.5rem; -} -.navbar .brand:hover, -.navbar .brand:focus { - text-decoration: none; } .navbar-search { position: relative; float: left; - margin-top: .625rem; margin-bottom: 0; width:100%; -moz-box-sizing:border-box; @@ -206,11 +196,7 @@ textarea { margin: 0 10px 0 0; } .navbar .nav > li { - float: left; -} -.navbar .nav > li > a { - float: none; - padding: .75rem; + display:inline-block; } @-ms-viewport { width: device-width; @@ -281,7 +267,7 @@ textarea { } body, input, textarea { - font-family: "Fira Sans", "Source Sans Pro", Helvetica, Arial, sans-serif; + font-family: "Fira Sans", "Source Sans Pro", Helvetica, Arial, sans-serif; font-weight: 400; } code, @@ -299,12 +285,12 @@ dl code { } body { - font-size: 1rem; - line-height: 1.5rem; - padding-left:0; - padding-right:0; - padding-bottom:0; - margin:0; + font-size: 1rem; + line-height: 1.5rem; + padding-left:0; + padding-right:0; + padding-bottom:0; + margin:0; } button, @@ -327,7 +313,7 @@ input[type="search"] { h1, h2, h3, h4, h5, h6 { line-height: 3rem; - margin:0 0 1.5rem; + margin:0; overflow:hidden; text-rendering: optimizeLegibility; } @@ -389,24 +375,26 @@ hr { padding:0; opacity:.75; border: 0; + vertical-align:middle; } .navbar a { border:0; } -.navbar { - border-bottom:.25rem solid; +body > .navbar { overflow: visible; *position: relative; *z-index: 2; + font-size:1.5rem; + line-height:4rem; } .page-tools { - margin-left:1.5rem; - float: right; text-align: right; - position: relative; - z-index: 100; + margin-bottom:1.5rem; +} +.page-tools #changelang-langs { + width:100%; } .page-tools #changelang-langs, .page-tools .edit-bug { @@ -569,12 +557,11 @@ pre.info { } .layout-menu { - padding:.75rem 1.5rem 1.5rem; + padding:1.5rem 1.5rem; -moz-box-sizing:border-box; box-sizing:border-box; } #layout-content { - padding:1.5rem; -moz-box-sizing:border-box; box-sizing:border-box; } @@ -991,7 +978,8 @@ fieldset { list-style:none; } .navbar a { - display:inline-block; + display:inline-block; + margin-right:1.5rem; } /* {{{ Typeahead search results */ @@ -1173,9 +1161,6 @@ fieldset { position:relative; clear:both; } -header.title { - margin-bottom:1.5rem; -} .title a { border:0; } @@ -1194,7 +1179,12 @@ header.title { } .refentry .refsect1 { - margin-bottom:3rem; + margin-bottom:1px; + padding:1rem 1.5rem; +} + +.refentry .refsect1 > *:last-child { + margin-bottom:0; } /* {{{ General styles (p, parameters, initializers, ...) */ @@ -1476,9 +1466,10 @@ div.soft-deprecation-notice blockquote.sidebar { display:none; } #breadcrumbs ul { - margin:0; - padding:0 .5rem 0 1.5rem; - overflow: hidden; + margin:0 auto; + -moz-box-sizing:border-box; + box-sizing:border-box; + overflow: hidden; } #breadcrumbs div { padding:0 1.5rem; @@ -1508,7 +1499,7 @@ div.soft-deprecation-notice blockquote.sidebar { transform: translateZ(0); } body { - margin:3.25rem 0 0; + margin:4rem 0 0; } #breadcrumbs { display:block; @@ -1550,7 +1541,7 @@ div.soft-deprecation-notice blockquote.sidebar { @media (min-width: 1200px) { #intro .container, .navbar-inner, - #breadcrumbs, + #breadcrumbs .breadcrumbs-container, #goto div, #trick div, #layout, @@ -1673,6 +1664,8 @@ div.soft-deprecation-notice blockquote.sidebar { @media (min-width:768px) { #topsearch { float:right; + margin-top:.625rem; + height:3rem; } .navbar-search .search-query { width:100%; @@ -1772,7 +1765,6 @@ aside.tips .panel .headline { border-bottom:0; line-height: 1.5rem; font-size:1.125rem; - color:#E6E6E6; text-rendering: optimizeLegibility; } /* Announcement Area */ @@ -1813,10 +1805,6 @@ aside.tips div.inner { .newsentry header h2 { margin:0; } -.newsentry { - margin: 0 0 3rem; - position: relative; -} .newsentry h2 { font-weight:normal; } diff --git a/styles/theme-medium.css b/styles/theme-medium.css index 7efe67a..78af8ef 100755 --- a/styles/theme-medium.css +++ b/styles/theme-medium.css @@ -13,15 +13,8 @@ html { - background: #333 url('/images/bg-texture-00.svg'); - color: #CCC; -} -#layout-content { - background:#F2F2F2; - color:#333; -} -#layout-content:not(:only-child) { - border-right:.25rem solid #666; + background: #F9F9F9; + color: #212121; } abbr { @@ -32,36 +25,17 @@ h1, h2, h3, h4, h5, h6 { font-weight: 500; color:#333 } -header.title, -h1:after, -h2:after, -h3:after { - display:table; - width:100%; - content:" "; - margin-top:-1px; - border-bottom:1px dotted; -} -.title h1:after, -.title h2:after, -.title h3:after { - display:none; -} -a:link, -a:visited { - color: #ccc; -} -#layout-content a:link, -#layout-content a:visited { - color: #369; +a:link { + color: #303f9f; } +a:visited, a:hover, a:focus, #layout-content a:hover, #layout-content a:focus { - color: #AE508D; - border-color: #AE508D; + color: #9c27b0; + border-color: #9c27b0; outline:0; } @@ -79,15 +53,26 @@ dl.qandaentry { } h1.refname { - color: #793862; + color: #3f51b5; +} + +.paper, +article.newsentry { + background:#fff; + border-radius:1px; + box-shadow:0 0 2px rgba(0,0,0,.12), 0 1px 1px rgba(0,0,0,.24); + padding:1rem 1.5rem; } +article.newsentry { + margin:1px 0; +} .interfacename a, .fieldsynopsis .type, .methodsynopsis .type, .constructorsynopsis .type { - color:#693; + color:#259b24; } .fieldsynopsis .modifier, @@ -106,7 +91,7 @@ h1.refname { .title a, .title { - color: #793862; + color: #3f51b5; } .title time { color: #333; @@ -117,7 +102,7 @@ h1.refname { .methodname a, .classsynopsis .classname, .parameter { - color: #369; + color: #303f9f; } .initializer, @@ -129,6 +114,12 @@ h1.refname { color:#737373; } +.refentry .refsect1 { + background:#fff; + box-shadow:0 0 2px rgba(0,0,0,.12), 0 1px 1px rgba(0,0,0,.24); + border-radius:1px; +} + /* {{{ Warnings, Tips and Notes */ #flash-message .success { background:#E6F2D9; @@ -155,8 +146,7 @@ div.caution { } #flash-message .error, div.warning { - background:#F4DFDF; - border-color: #EABFBF; + border-left:12px solid #e91e63; } .docs .classsynopsis, @@ -166,57 +156,17 @@ div.tip, blockquote.note, div.caution, div.warning { - box-shadow:inset 0 0 0 1px rgba(0,0,0,.15); - border-radius:0 0 2px 2px; -} -#flash-message .error a, -div.warning a:link, -div.warning a:visited, -div.warning h2, -div.warning h3 { - color:#936; -} -#flash-message .success a, -#flash-message a:hover, -#flash-message a:focus, -div.warning a:hover, -div.warning a:focus { - color:#693; - border-color:#693; + box-shadow: 0 0 0 1px rgba(0,0,0,.12), 0 1px 1px rgba(0,0,0,.24); + border-radius:2px; } /* }}} */ /* {{{ Navbar */ -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - color: #333333; -} -.navbar .nav > .active > a { - box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); -} .navbar .brand, -.navbar .nav > li > a { - color: #E2E4EF; - border:0; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .brand:hover, -.navbar .nav > li > a:hover, -.navbar .brand:focus, -.navbar .nav > li > a:focus { - color: #fff; -} -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - background-color: transparent; +.navbar .nav a { color: #fff; -} -.navbar .nav .active > a, -.navbar .nav .active > a:hover, -.navbar .nav .active > a:focus { - color: #fff; - background-color: #4F5B93; + border:0; } .navbar .navbar-search .search-query { background-color: #fff; @@ -239,23 +189,19 @@ div.warning a:focus { color: #999; } .navbar { - border-color:#4F5B93; - background:#8892BF; - box-shadow: 0 .25em .25em rgba(0,0,0,.1); + background:#3f51b5; + box-shadow: 0 2px 5px rgba(0,0,0,.26); } .navbar .brand { color: #fff; } -.navbar a { - text-shadow: 0 1px 0 #fff; -} /* }}} */ /* {{{ User notes */ #usernotes .count { - background-color: #793862; + background-color: #3f51b5; color: #fff; border-radius: 4px; } @@ -333,19 +279,19 @@ div.warning a:focus { background-color: transparent; } .phpcode span.comment { - color: #4F5B93; + color: #ff9800; background-color: transparent; } div.phpcode span.default { - color: #369; + color: #303f9f; background-color: transparent; } div.phpcode span.keyword { - color: #693; + color: #259b24; background-color: transparent; } div.phpcode span.string { - color: #c33; + color: #e51c23; background-color: transparent; } @@ -399,25 +345,18 @@ pre.info { aside.tips div.border { display:none; } -aside.tips h3 { - color:#E6E6E6; -} -aside.tips a { - color:#ccc; - border-bottom:1px dotted #666; -} aside.tips .panel > a:after { content:" "; display:block; border-bottom:1px dotted #666; } aside.tips .panel > a:hover:after { - border-color:#AE508D; + border-color:#9c27b0; } aside.tips a:hover, aside.tips a:focus { - color:#AE508D; - border-color:#AE508D; + color:#9c27b0; + border-color:#9c27b0; } .soft-deprecation-notice { @@ -436,7 +375,8 @@ aside.tips a:focus { /* {{{ Breadcrumbs */ #breadcrumbs { - color: #999; + color: #424242; + background:#e6e6e6; } /* }}} */ @@ -446,8 +386,8 @@ aside.tips a:focus { border-top-color:#666; } .layout-menu ul.child-menu-list li.current a { - color:#AE508D; - border-bottom-color:#AE508D; + color:#9c27b0; + border-bottom-color:#9c27b0; } .layout-menu ul.child-menu-list a { border-color: #666;
diff --git a/include/footer.inc b/include/footer.inc index 4eb0870..cdf5aa2 100644 --- a/include/footer.inc +++ b/include/footer.inc @@ -9,7 +9,22 @@ ?> <?php if (!empty($config['related_menu'])): ?> <aside class='layout-menu'> - + +<?php + $id = substr($setup['this'][0], 0, -4); + $language_chooser = 'manual_language_chooser'; + echo <<<PAGE_TOOLS + <div class="page-tools"> + <div class="change-language"> + {$language_chooser($config['lang'], $config['thispage'])} + </div> + <div class="edit-bug"> + <a href="https://edit.php.net/?project=PHP&perm={$config['lang']}/{$config['thispage']}">Edit</a> + <a href="https://bugs.php.net/report.php?bug_type=Documentation+problem&manpage=$id">Report a Bug</a> + </div> + </div> +PAGE_TOOLS; +?> <ul class='parent-menu-list'> <?php foreach($config['related_menu'] as $section): ?> <li> diff --git a/include/header.inc b/include/header.inc index 88d56c8..4d20167 100644 --- a/include/header.inc +++ b/include/header.inc @@ -126,6 +126,7 @@ if (!isset($config["languages"])) { <?php if (!empty($config['breadcrumbs'])): ?> <div id="breadcrumbs" class="clearfix"> + <ul class="breadcrumbs-container"> <?php if (isset($config['next'])): ?> <div class="next"> <a href="<?php echo $config['next'][0]; ?>"> @@ -140,7 +141,6 @@ if (!isset($config["languages"])) { </a> </div> <?php endif; ?> - <ul class="breadcrumbs-container"> <?php $breadcrumbs = $config['breadcrumbs']; $last = array_pop($breadcrumbs); diff --git a/include/shared-manual.inc b/include/shared-manual.inc index 43cbb24..ee6dc4d 100644 --- a/include/shared-manual.inc +++ b/include/shared-manual.inc @@ -418,21 +418,7 @@ function manual_setup($setup) { "next" => $setup["next"], "cache" => $lastmod, ); - site_header($setup["this"][1] . " - Manual ", $config); - - $id = substr($setup['this'][0], 0, -4); - $language_chooser = 'manual_language_chooser'; - echo <<<PAGE_TOOLS - <div class="page-tools"> - <div class="change-language"> - {$language_chooser($config['lang'], $config['thispage'])} - </div> - <div class="edit-bug"> - <a href="https://edit.php.net/?project=PHP&perm={$config['lang']}/{$config['thispage']}">Edit</a> - <a href="https://bugs.php.net/report.php?bug_type=Documentation+problem&manpage=$id">Report a Bug</a> - </div> - </div> -PAGE_TOOLS; + site_header($setup["this"][1] . " - Manual ", $config); } function manual_language_chooser($currentlang, $currentpage) { @@ -461,7 +447,6 @@ function manual_language_chooser($currentlang, $currentpage) { $r = <<<CHANGE_LANG <form action="/manual/change.php" method="get" id="changelang" name="changelang"> <fieldset> - <label for="changelang-langs">Change language:</label> <select onchange="document.changelang.submit()" name="page" id="changelang-langs"> {$format_options($links)} <option value="help-translate.php">Other</option> diff --git a/styles/home.css b/styles/home.css index ffb0b02..065625d 100644 --- a/styles/home.css +++ b/styles/home.css @@ -1,13 +1,11 @@ /* Home Page */ #intro p { - color:#fff; text-rendering: optimizeLegibility; } #intro p, #intro ul { - text-shadow:0 1px 2px rgba(0,0,0,.5); - font-size:1.125rem; + font-size:1.25rem; } #intro ul a { @@ -26,10 +24,6 @@ #intro h3 { margin:1.5rem 0 0; - color:#E6E6E6; -} -#intro h3:after { - display:none; } #intro .row { @@ -55,24 +49,16 @@ font-size:.75em; white-space:nowrap; } -#intro .download a { - color:#ccc; - border:0; -} #intro .download a:hover, #intro .download a:focus { border-bottom:1px dotted; } #intro .download a.download-link { - color:#fff; width: 50px; display: inline-block; } -#layout-content { - border-right:.25rem solid #666; -} .home .newsentry .newstitle a:after { content:"\20 \00bb"; color:#666; diff --git a/styles/theme-base.css b/styles/theme-base.css index ba73007..5859615 100755 --- a/styles/theme-base.css +++ b/styles/theme-base.css @@ -21,13 +21,6 @@ .clearfix:after { clear: both; } -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} article, aside, details, @@ -50,11 +43,13 @@ video { audio:not([controls]) { display: none; } + html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } + a { border-bottom:1px solid; } @@ -66,6 +61,7 @@ a:hover, a:active { outline: 0; } + sub, sup { position: relative; @@ -82,6 +78,7 @@ sub { pre { white-space:pre-wrap; } + #map_canvas img, .google-maps img { max-width: none; @@ -169,20 +166,13 @@ textarea { } .navbar .brand { - margin-right:.75rem; + margin-right:1.5rem; float: left; display: block; - height: 1.5rem; - padding: .75rem .75rem .75rem 1.5rem; -} -.navbar .brand:hover, -.navbar .brand:focus { - text-decoration: none; } .navbar-search { position: relative; float: left; - margin-top: .625rem; margin-bottom: 0; width:100%; -moz-box-sizing:border-box; @@ -206,11 +196,7 @@ textarea { margin: 0 10px 0 0; } .navbar .nav > li { - float: left; -} -.navbar .nav > li > a { - float: none; - padding: .75rem; + display:inline-block; } @-ms-viewport { width: device-width; @@ -281,7 +267,7 @@ textarea { } body, input, textarea { - font-family: "Fira Sans", "Source Sans Pro", Helvetica, Arial, sans-serif; + font-family: "Fira Sans", "Source Sans Pro", Helvetica, Arial, sans-serif; font-weight: 400; } code, @@ -299,12 +285,12 @@ dl code { } body { - font-size: 1rem; - line-height: 1.5rem; - padding-left:0; - padding-right:0; - padding-bottom:0; - margin:0; + font-size: 1rem; + line-height: 1.5rem; + padding-left:0; + padding-right:0; + padding-bottom:0; + margin:0; } button, @@ -327,7 +313,7 @@ input[type="search"] { h1, h2, h3, h4, h5, h6 { line-height: 3rem; - margin:0 0 1.5rem; + margin:0; overflow:hidden; text-rendering: optimizeLegibility; } @@ -389,24 +375,26 @@ hr { padding:0; opacity:.75; border: 0; + vertical-align:middle; } .navbar a { border:0; } -.navbar { - border-bottom:.25rem solid; +body > .navbar { overflow: visible; *position: relative; *z-index: 2; + font-size:1.5rem; + line-height:4rem; } .page-tools { - margin-left:1.5rem; - float: right; text-align: right; - position: relative; - z-index: 100; + margin-bottom:1.5rem; +} +.page-tools #changelang-langs { + width:100%; } .page-tools #changelang-langs, .page-tools .edit-bug { @@ -569,12 +557,11 @@ pre.info { } .layout-menu { - padding:.75rem 1.5rem 1.5rem; + padding:1.5rem 1.5rem; -moz-box-sizing:border-box; box-sizing:border-box; } #layout-content { - padding:1.5rem; -moz-box-sizing:border-box; box-sizing:border-box; } @@ -991,7 +978,8 @@ fieldset { list-style:none; } .navbar a { - display:inline-block; + display:inline-block; + margin-right:1.5rem; } /* {{{ Typeahead search results */ @@ -1173,9 +1161,6 @@ fieldset { position:relative; clear:both; } -header.title { - margin-bottom:1.5rem; -} .title a { border:0; } @@ -1194,7 +1179,12 @@ header.title { } .refentry .refsect1 { - margin-bottom:3rem; + margin-bottom:1px; + padding:1rem 1.5rem; +} + +.refentry .refsect1 > *:last-child { + margin-bottom:0; } /* {{{ General styles (p, parameters, initializers, ...) */ @@ -1476,9 +1466,10 @@ div.soft-deprecation-notice blockquote.sidebar { display:none; } #breadcrumbs ul { - margin:0; - padding:0 .5rem 0 1.5rem; - overflow: hidden; + margin:0 auto; + -moz-box-sizing:border-box; + box-sizing:border-box; + overflow: hidden; } #breadcrumbs div { padding:0 1.5rem; @@ -1508,7 +1499,7 @@ div.soft-deprecation-notice blockquote.sidebar { transform: translateZ(0); } body { - margin:3.25rem 0 0; + margin:4rem 0 0; } #breadcrumbs { display:block; @@ -1550,7 +1541,7 @@ div.soft-deprecation-notice blockquote.sidebar { @media (min-width: 1200px) { #intro .container, .navbar-inner, - #breadcrumbs, + #breadcrumbs .breadcrumbs-container, #goto div, #trick div, #layout, @@ -1673,6 +1664,8 @@ div.soft-deprecation-notice blockquote.sidebar { @media (min-width:768px) { #topsearch { float:right; + margin-top:.625rem; + height:3rem; } .navbar-search .search-query { width:100%; @@ -1772,7 +1765,6 @@ aside.tips .panel .headline { border-bottom:0; line-height: 1.5rem; font-size:1.125rem; - color:#E6E6E6; text-rendering: optimizeLegibility; } /* Announcement Area */ @@ -1813,10 +1805,6 @@ aside.tips div.inner { .newsentry header h2 { margin:0; } -.newsentry { - margin: 0 0 3rem; - position: relative; -} .newsentry h2 { font-weight:normal; } diff --git a/styles/theme-medium.css b/styles/theme-medium.css index 7efe67a..78af8ef 100755 --- a/styles/theme-medium.css +++ b/styles/theme-medium.css @@ -13,15 +13,8 @@ html { - background: #333 url('/images/bg-texture-00.svg'); - color: #CCC; -} -#layout-content { - background:#F2F2F2; - color:#333; -} -#layout-content:not(:only-child) { - border-right:.25rem solid #666; + background: #F9F9F9; + color: #212121; } abbr { @@ -32,36 +25,17 @@ h1, h2, h3, h4, h5, h6 { font-weight: 500; color:#333 } -header.title, -h1:after, -h2:after, -h3:after { - display:table; - width:100%; - content:" "; - margin-top:-1px; - border-bottom:1px dotted; -} -.title h1:after, -.title h2:after, -.title h3:after { - display:none; -} -a:link, -a:visited { - color: #ccc; -} -#layout-content a:link, -#layout-content a:visited { - color: #369; +a:link { + color: #303f9f; } +a:visited, a:hover, a:focus, #layout-content a:hover, #layout-content a:focus { - color: #AE508D; - border-color: #AE508D; + color: #9c27b0; + border-color: #9c27b0; outline:0; } @@ -79,15 +53,26 @@ dl.qandaentry { } h1.refname { - color: #793862; + color: #3f51b5; +} + +.paper, +article.newsentry { + background:#fff; + border-radius:1px; + box-shadow:0 0 2px rgba(0,0,0,.12), 0 1px 1px rgba(0,0,0,.24); + padding:1rem 1.5rem; } +article.newsentry { + margin:1px 0; +} .interfacename a, .fieldsynopsis .type, .methodsynopsis .type, .constructorsynopsis .type { - color:#693; + color:#259b24; } .fieldsynopsis .modifier, @@ -106,7 +91,7 @@ h1.refname { .title a, .title { - color: #793862; + color: #3f51b5; } .title time { color: #333; @@ -117,7 +102,7 @@ h1.refname { .methodname a, .classsynopsis .classname, .parameter { - color: #369; + color: #303f9f; } .initializer, @@ -129,6 +114,12 @@ h1.refname { color:#737373; } +.refentry .refsect1 { + background:#fff; + box-shadow:0 0 2px rgba(0,0,0,.12), 0 1px 1px rgba(0,0,0,.24); + border-radius:1px; +} + /* {{{ Warnings, Tips and Notes */ #flash-message .success { background:#E6F2D9; @@ -155,8 +146,7 @@ div.caution { } #flash-message .error, div.warning { - background:#F4DFDF; - border-color: #EABFBF; + border-left:12px solid #e91e63; } .docs .classsynopsis, @@ -166,57 +156,17 @@ div.tip, blockquote.note, div.caution, div.warning { - box-shadow:inset 0 0 0 1px rgba(0,0,0,.15); - border-radius:0 0 2px 2px; -} -#flash-message .error a, -div.warning a:link, -div.warning a:visited, -div.warning h2, -div.warning h3 { - color:#936; -} -#flash-message .success a, -#flash-message a:hover, -#flash-message a:focus, -div.warning a:hover, -div.warning a:focus { - color:#693; - border-color:#693; + box-shadow: 0 0 0 1px rgba(0,0,0,.12), 0 1px 1px rgba(0,0,0,.24); + border-radius:2px; } /* }}} */ /* {{{ Navbar */ -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - color: #333333; -} -.navbar .nav > .active > a { - box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); -} .navbar .brand, -.navbar .nav > li > a { - color: #E2E4EF; - border:0; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .brand:hover, -.navbar .nav > li > a:hover, -.navbar .brand:focus, -.navbar .nav > li > a:focus { - color: #fff; -} -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - background-color: transparent; +.navbar .nav a { color: #fff; -} -.navbar .nav .active > a, -.navbar .nav .active > a:hover, -.navbar .nav .active > a:focus { - color: #fff; - background-color: #4F5B93; + border:0; } .navbar .navbar-search .search-query { background-color: #fff; @@ -239,23 +189,19 @@ div.warning a:focus { color: #999; } .navbar { - border-color:#4F5B93; - background:#8892BF; - box-shadow: 0 .25em .25em rgba(0,0,0,.1); + background:#3f51b5; + box-shadow: 0 2px 5px rgba(0,0,0,.26); } .navbar .brand { color: #fff; } -.navbar a { - text-shadow: 0 1px 0 #fff; -} /* }}} */ /* {{{ User notes */ #usernotes .count { - background-color: #793862; + background-color: #3f51b5; color: #fff; border-radius: 4px; } @@ -333,19 +279,19 @@ div.warning a:focus { background-color: transparent; } .phpcode span.comment { - color: #4F5B93; + color: #ff9800; background-color: transparent; } div.phpcode span.default { - color: #369; + color: #303f9f; background-color: transparent; } div.phpcode span.keyword { - color: #693; + color: #259b24; background-color: transparent; } div.phpcode span.string { - color: #c33; + color: #e51c23; background-color: transparent; } @@ -399,25 +345,18 @@ pre.info { aside.tips div.border { display:none; } -aside.tips h3 { - color:#E6E6E6; -} -aside.tips a { - color:#ccc; - border-bottom:1px dotted #666; -} aside.tips .panel > a:after { content:" "; display:block; border-bottom:1px dotted #666; } aside.tips .panel > a:hover:after { - border-color:#AE508D; + border-color:#9c27b0; } aside.tips a:hover, aside.tips a:focus { - color:#AE508D; - border-color:#AE508D; + color:#9c27b0; + border-color:#9c27b0; } .soft-deprecation-notice { @@ -436,7 +375,8 @@ aside.tips a:focus { /* {{{ Breadcrumbs */ #breadcrumbs { - color: #999; + color: #424242; + background:#e6e6e6; } /* }}} */ @@ -446,8 +386,8 @@ aside.tips a:focus { border-top-color:#666; } .layout-menu ul.child-menu-list li.current a { - color:#AE508D; - border-bottom-color:#AE508D; + color:#9c27b0; + border-bottom-color:#9c27b0; } .layout-menu ul.child-menu-list a { border-color: #666;