com web/php: Fixed merge conflicts: include/header.inc styles/home.css styles/theme-base.css

Commit: f7359aa2eaf7928b7e22400757df9bd2ff564b51 Author: Levi Morrison <levim@php.net> Sun, 15 Dec 2013 11:28:32 -0700 Parents: 7e68fd3e0ca5f7e74f1821409512f7b8678902a9 Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=f7359aa2eaf7928b7e22400757df9bd2ff564b51 Log: Fixed merge conflicts Changed paths: M include/header.inc M styles/home.css M styles/theme-base.css Diff: diff --git a/include/header.inc b/include/header.inc index 1391d04..6d56564 100755 --- a/include/header.inc +++ b/include/header.inc @@ -65,7 +65,7 @@ if (isset($shortname) && $shortname) { </head> <body class="<?php print $curr; ?> <?php echo $classes; ?>"> -<nav id="head-nav" class="navbar navbar-inverse navbar-fixed-top"> +<nav id="head-nav" class="navbar navbar-fixed-top clearfix"> <div class="navbar-inner"> <div class="row"> <a href="/" class="brand"><img src="/images/logo.php" width="48" height="24" alt="php"></a> diff --git a/styles/home.css b/styles/home.css index c776617..be2d2e3 100644 --- a/styles/home.css +++ b/styles/home.css @@ -19,19 +19,14 @@ complimentary greens: 9FB553 7B8851 61761B C6DA82 CCDA99 #intro .row .download { display:table-cell; float:none; + vertical-align: middle; } #intro .blurb { - vertical-align: middle; + padding:0 1.5em; } #intro .blurb p { line-height:1.8; } -#intro .blurb p:first-child { - margin-top:0; -} -#intro .blurb p:last-child { - margin-bottom:0; -} #intro h2 { font-size:1.25em; line-height:1.8; @@ -57,6 +52,8 @@ complimentary greens: 9FB553 7B8851 61761B C6DA82 CCDA99 #intro .download a.notes { font-size:.75em; line-height:2; + padding-left:.5em; + white-space:nowrap; } #intro .download a { color:#ccc; diff --git a/styles/theme-base.css b/styles/theme-base.css index 1028d00..bcf06d2 100755 --- a/styles/theme-base.css +++ b/styles/theme-base.css @@ -191,11 +191,7 @@ textarea { page-break-after: avoid; } } -.navbar { - overflow: visible; - *position: relative; - *z-index: 2; -} + .nav-collapse.collapse { height: auto; overflow: visible; @@ -285,6 +281,9 @@ textarea { float: left; margin-top: .625em; margin-bottom: 0; + width:100%; + -moz-box-sizing:border-box; + box-sizing:border-box; } .navbar-search .search-query { margin-bottom: 0; @@ -299,24 +298,10 @@ textarea { position: static; margin-bottom: 0; } -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - margin-bottom: 0; -} .navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { margin:0 auto; } -.navbar-fixed-top { - top: 0; - -webkit-transform: translateZ(0); - -moz-transform: translateZ(0); - transform: translateZ(0); -} .navbar-fixed-top .navbar-inner, .navbar-static-top .navbar-inner { -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); @@ -348,7 +333,6 @@ textarea { .navbar .nav > li > a { float: none; padding: .75em; - color: #777777; text-decoration: none; text-shadow: 0 1px 0 #fff; } @@ -503,42 +487,29 @@ textarea { .navbar .navbar-inner { background-color: #99c; } -.navbar-inverse .brand, -.navbar-inverse .nav > li > a { +.navbar .brand, +.navbar .nav > li > a { color: #eef; border:0; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.navbar-inverse .brand:hover, -.navbar-inverse .nav > li > a:hover, -.navbar-inverse .brand:focus, -.navbar-inverse .nav > li > a:focus { +.navbar .brand:hover, +.navbar .nav > li > a:hover, +..navbar .brand:focus, +.navbar .nav > li > a:focus { color: #fff; } -.navbar-inverse .brand { - color: #eef; -} -.navbar-inverse .navbar-text { - color: #999999; -} -.navbar-inverse .nav > li > a:focus, -.navbar-inverse .nav > li > a:hover { +.navbar .nav > li > a:focus, +.navbar .nav > li > a:hover { background-color: transparent; color: #fff; } -.navbar-inverse .nav .active > a, -.navbar-inverse ..nav .active > a:hover, -.navbar-inverse .nav .active > a:focus { +.navbar .nav .active > a, +.navbar .nav .active > a:hover, +.navbar .nav .active > a:focus { color: #fff; background-color: #669; } -.navbar-inverse .navbar-link { - color: #999999; -} -.navbar-inverse .navbar-link:hover, -.navbar-inverse .navbar-link:focus { - color: #fff; -} .navbar-inverse .divider-vertical { border-left-color: #111111; border-right-color: #222222; @@ -564,7 +535,7 @@ textarea { border-top-color: #fff; border-bottom-color: #fff; } -.navbar-inverse .navbar-search .search-query { +.navbar .navbar-search .search-query { background-color: #fff; color: #333; text-shadow: 0 1px 0 #fff; @@ -574,19 +545,19 @@ textarea { -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.2); box-shadow: inset 0 1px 2px rgba(0,0,0,.2); } -.navbar-inverse .navbar-search .search-query:focus { +.navbar .navbar-search .search-query:focus { box-shadow: inset 0 1px 2px rgba(0,0,0,.2); } -.navbar-inverse .navbar-search .search-query:-moz-placeholder { +.navbar .navbar-search .search-query:-moz-placeholder { color: #999; } -.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { +.navbar .navbar-search .search-query:-ms-input-placeholder { color: #999; } -.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { +.navbar .navbar-search .search-query::-webkit-input-placeholder { color: #999; } -.navbar-inverse .btn-navbar { +.navbar .btn-navbar { color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e0e0e; @@ -604,18 +575,18 @@ textarea { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.navbar-inverse .btn-navbar:hover, -.navbar-inverse .btn-navbar:focus, -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active, -.navbar-inverse .btn-navbar.disabled, -.navbar-inverse .btn-navbar[disabled] { +.navbar .btn-navbar:hover, +.navbar .btn-navbar:focus, +.navbar .btn-navbar:active, +.navbar .btn-navbar.active, +..navbar .btn-navbar.disabled, +.navbar .btn-navbar[disabled] { color: #fff; background-color: #040404; *background-color: #000; } -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active { +.navbar .btn-navbar:active, +.navbar .btn-navbar.active { background-color: #000; } .hero-unit { @@ -696,10 +667,6 @@ textarea { display: none !important; } } -@media (max-width: 767px) { -} -@media (min-width: 768px) and (max-width: 979px) { -} @media (max-width: 979px) { } @media (min-width: 980px) { @@ -725,7 +692,7 @@ body { padding-left:0; padding-right:0; padding-bottom:0; - margin:3.25em 0 0; + margin:0; } button, @@ -815,7 +782,10 @@ hr { } .navbar { - border-bottom:.25em solid; + border-bottom:.25em solid; + overflow: visible; + *position: relative; + *z-index: 2; } .page-tools { @@ -1428,7 +1398,7 @@ fieldset { width: 100%; } -.navbar-inverse .navbar-search .tt-hint.search-query { +.navbar .navbar-search .tt-hint.search-query { color: silver; } @@ -1915,6 +1885,16 @@ div.soft-deprecation-notice blockquote.sidebar { @media (max-width:767px) { } @media (min-width: 768px) { + + .navbar-fixed-top { + top: 0; + -webkit-transform: translateZ(0); + -moz-transform: translateZ(0); + transform: translateZ(0); + } + body { + margin:3.25em 0 0; + } #breadcrumbs { display:block; } @@ -1933,6 +1913,13 @@ div.soft-deprecation-notice blockquote.sidebar { float:left; width:75%; } + .navbar-fixed-top { + position: fixed; + right: 0; + left: 0; + z-index: 1030; + margin-bottom: 0; + } } @media (min-width: 768px) and (max-width: 979px) { } @@ -1959,10 +1946,7 @@ div.soft-deprecation-notice blockquote.sidebar { @media (max-width:767px) { - - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { + .navbar-fixed-top .container { width:auto; }