From: Laury GvR Date: Mon, 10 Jul 2017 15:52:49 +0000 (-0400) Subject: Merge branch 'master' into develop X-Git-Tag: v1.0.0^2~64 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=abdabdc7df690f9e8e4ab140b7ceadaefbf6865d;p=WP-Themes%2Ftruenorthgolf.git Merge branch 'master' into develop --- abdabdc7df690f9e8e4ab140b7ceadaefbf6865d diff --cc css/app.css index a6dc1e2,b5fe0e0..490c7d0 --- a/css/app.css +++ b/css/app.css @@@ -6698,10 -6698,10 +6698,10 @@@ a[href^=tel] text-decoration: none; } header#page-header { - height: 295px; + height: 210px; - background: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.95) 5%, rgba(0, 0, 0, 0) 100%); - background: -moz-linear-gradient(center top, rgba(0, 0, 0, 0.95) 5%, rgba(0, 0, 0, 0) 100%); - background: -ms-linear-gradient(top, rgba(0, 0, 0, 0.95) 5%, rgba(0, 0, 0, 0) 100%); + background: -webkit-linear-gradient(top, #000000 5%, rgba(0, 0, 0, 0) 100%); + background: -moz-linear-gradient(center top, #000000 5%, rgba(0, 0, 0, 0) 100%); + background: -ms-linear-gradient(top, #000000 5%, rgba(0, 0, 0, 0) 100%); position: relative; padding-top: 11px; z-index: 5; } @@@ -7022,11 -7018,38 +7046,37 @@@ ul#sec-nav img.orb-shadow { position: relative; - text-align: center; - top: -185px; } - - #content-wrapper { - position: relative; } - top: -57px; + text-align: center; } + @media (max-width: 1024px) { + img.orb-shadow { + top: -10px; } } + @media (max-width: 829px) { + img.orb-shadow { + top: -11px; } } + @media (max-width: 766px) { + img.orb-shadow { + top: -12px; } } + @media (max-width: 704px) { + img.orb-shadow { + top: -13px; } } + @media (max-width: 640px) { + img.orb-shadow { + top: -14px; } } + @media (max-width: 590px) { + img.orb-shadow { + top: -15px; } } + @media (max-width: 534px) { + img.orb-shadow { + top: -16px; } } + @media (max-width: 468px) { + img.orb-shadow { + top: -17px; } } + @media (max-width: 410px) { + img.orb-shadow { + top: -18px; } } + @media (max-width: 347px) { + img.orb-shadow { + top: -19px; } } main .wp-caption p.wp-caption-text { text-align: left; } @@@ -7034,38 -7057,118 +7084,88 @@@ main p a /* font-style: italic; font-family: "Times New Roman"*/ font-weight: bold; } - main.page-front .blocks .block-thumb-wrap { - text-align: center; - max-height: 230px; - overflow: hidden; } + main.page-front { + margin-top: -25px; } @media (max-width: 1024px) { - main.page-front .blocks .block-thumb-wrap { - max-height: 170px; } } - main.page-front .blocks .block { - margin-bottom: 80px; } - main.page-front .blocks .block img { - border: none; - padding: 0; } - main.page-front .blocks .block h3 { - font-size: 22px; - margin-top: 0; - margin-left: 15px; - margin-right: 15px; - text-transform: uppercase; - padding-top: 8px; } - main.page-front .blocks .block p { - font-size: 0.875rem; } - main.page-front .blocks .block .block-readmore { - font-size: 0.875rem; - display: block; - padding-bottom: 10px; - margin: 0 15px; - /*position: absolute;*/ - /*bottom: 0;*/ } - main.page-front #main-content { - margin-top: 25px; } + main.page-front { + margin: 0 auto; } } - main.page-front .blocks:last-child { - float: right; } + main.page-front .blocks .block-thumb-wrap { + text-align: center; + max-height: 230px; + overflow: hidden; } + @media (max-width: 1024px) { + main.page-front .blocks .block-thumb-wrap { + max-height: 170px; } } + main.page-front .blocks .block { + margin-bottom: 80px; } + main.page-front .blocks .block img { + border: none; + padding: 0; } + main.page-front .blocks .block h3 { + color: #000000; + font-family: "ingram-wide-2"; + text-align: center; + font-size: 22px; + margin-top: 0; + margin-left: 15px; + margin-right: 15px; + text-transform: uppercase; + padding-top: 8px; } - @media (max-width: 1024px) { - main.page-front .blocks .block h3 { - font-size: 20px; } } - @media (max-width: 687px) { - main.page-front .blocks .block h3 { - margin-left: 5px; - margin-right: 5px; } } + main.page-front .blocks .block p { + color: #888888; + text-align: center; - font-size: 0.875rem; - margin: 0 15px 10px; - /*padding-bottom: 25px;*/ } - @media (max-width: 800px) { - main.page-front .blocks .block p { - margin: 0 10px 10px; } } - @media (max-width: 705px) { - main.page-front .blocks .block p { - margin: 0 0 10px; } } - @media (max-width: 640px) { - main.page-front .blocks .block p { - margin: 0 22%; } } - @media (max-width: 450px) { - main.page-front .blocks .block p { - margin: 0 15%; } } - @media (max-width: 375px) { - main.page-front .blocks .block p { - margin: 0 10%; } } ++ font-size: 0.875rem; } + main.page-front .blocks .block .block-text a { + color: #b32024; } + main.page-front .blocks .block .block-readmore { + text-align: center; + font-size: 0.9375rem; + display: block; + padding-bottom: 10px; + margin: 0 15px; + color: #b32024; + text-transform: uppercase; + /*position: absolute;*/ + /*bottom: 0;*/ } + main.page-front #main-content { + margin-top: 25px; } + main.page-front #main-content h1 { + font-size: 52px; + font-family: "Kaushan Script"; } + main.page-front #mid { + background: url(../assets/central-swing-full-image.jpg); + background-size: cover; + background-position: bottom; } + main.page-front #mid img { + margin-top: -31px; + -webkit-box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.5); + -ms-box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.5); + box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.5); + width: 100%; } + main.page-front #mid #golf { + margin-top: -3px; + margin-bottom: 30px; + background: rgba(179, 32, 36, 0.9); + -webkit-box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.5); + -ms-box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.5); + box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.5); + position: relative; + z-index: 1; + padding: 0 20px 10px; } + main.page-front #mid #golf h2 { + color: #FFFFFF; + padding-top: 11px; } + main.page-front #mid #golf p { + color: #FFFFFF; + margin-bottom: 10px; + font-size: 14px; } + main.page-front #mid #golf a { + color: #ffc742; + font-size: 14px; } -main.page-inside #content-wrapper { - top: -57px; - position: relative; } - @media (max-width: 1024px) { - main.page-inside #content-wrapper { - top: -10px; } } +main.page-inside img.orb-shadow { + top: 0; } main #mid { margin: 40px auto 0; max-width: 1000px; } diff --cc footer.php index acc5db3,2100599..fd179b1 --- a/footer.php +++ b/footer.php @@@ -1,34 -1,11 +1,10 @@@ -