From ea9eeb55a53a034bb908261d2b5294c192841bee Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Fri, 17 May 2019 18:01:34 -0400 Subject: [PATCH] Secondary links in oc, fix slideshow caption, 3rd level oc - Secondary links are now in the top of oc (extra home link removed) - Slideshow caption made smaller in small view to not overlap nav - 3rd level oc given a background for visibility --- assets/up-mini-white.png | Bin 0 -> 1453 bytes css/app.css | 25 ++ css/app.css.map | 2 +- lib/navigation.php | 2 +- scss/_off-canvas.scss | 611 ++++++++++++++++++++------------------- scss/_slideshow.scss | 7 + sections/off-canvas.php | 40 +++ 7 files changed, 393 insertions(+), 294 deletions(-) create mode 100644 assets/up-mini-white.png diff --git a/assets/up-mini-white.png b/assets/up-mini-white.png new file mode 100644 index 0000000000000000000000000000000000000000..fcc94611e03fff145e308534f66994c31060251e GIT binary patch literal 1453 zcmV;e1ycHnP);7l3)&)R z1NBF?kdT&AkZF-*n^C9`YT-he<)DtZ&C?%q2EL}bckXrW+_`u9e*fJ0?zfzC-simM zocBH79Vij07ptGBd(=bfUUjQFoBxqIwK0Sdzzx78U|izV0bm8N0r-?uMS(HH%$l28 zsJJlh$pB)XIzbJom5KwRQk|Ir#&-3@)JnyJal5)L1B_?YKB<+82jj*p^Tj^(wA4z) zgYmg~EDMk~Q!5n@#`|X1+iKU;QpJJMI|g^zbZKg-)`ietov*&49%u%}{f+NUEm&9> zUDVCyuI}-^PU?H=$kd930nuHZmBa9q)XD_JkJV`jkE&JItHabO>gA;xD5_OzH+865 zkTg`MTzfz86mSl(3RnxA089n01$yOK?gq6ASP%3AMgZO7xvs$9Ks7KNI1CH|YDx&i zbl`EI3aA5mg%B!=Rrti%YYVCQ>byMf`C9GVh7fwFqtp+YsM|+{DyLI3mADO9)C%pJ z5*NT4Us0XPa&0H*>yfRp2KV|~?{Jt3$A)dwt14K83? zCl{zrcjj4c2X%N;^G=6^JI+zp0y}^ofq5mmj+oc5LTe$6RY0MJn$CHYdk63?@Ll}; z&jpWKep=H45O=A&3S6J+*r}@$%lTgFLUnvR9;9xFX{6`ledjk-!8w+vCN$BO3Uzn} z5S20BX${rIt>@h_7JE&tiRad-SE~CH*Dq7wQu}4+Dap}Rh5~@tBe(Hd~fJ1R5R|6~t?klmn ze+Y~XA@peu$Xwu&_Lx*?s=Xzk&LM;&|5{}=(xi5p6f#Znaa^vX{=KOefR3pRTSc|NH6etRIlFP(^PUKdqW*=pF&R<_sq$AH zFc)|(gixFJxEj5u8!!Wya~wITa@7&w4dAnwrJfy!oaVFzI3tJawgJzyc%oAW05cPtP_=EZ_je;fWDr2Db zw0hX~rPp(`!PrEEuDU!!W~6UJk};8NY~59$`cjz~yGH$4T^#p*rmLIOo79_Q?RQ7=#js|S;B|D_gcTR3Mo+V~pU9@|+?%f;&xX_W0DgpFx8 zZ9DH6lkklF>X7!@)^hQXWP'; - echo ''; + //echo ''; echo '
    '; echo glm_get_mobile_nav_menu( 'top-bar' ); diff --git a/scss/_off-canvas.scss b/scss/_off-canvas.scss index 81d6046..481e1b8 100644 --- a/scss/_off-canvas.scss +++ b/scss/_off-canvas.scss @@ -1,342 +1,369 @@ /* for the mobile menu */ aside.oc-overlay { - position: fixed; - display: none; - width: 100%; - height: 100%; - top: 0; - left: 0; - right: 0; - overflow-y: scroll; - bottom: 0; - background-color: $green; - z-index: 999999; - cursor: pointer; - } - aside.oc-overlay .mobile-logo-link img { - max-height: 60px; - margin-left: 10px; - } - aside.oc-overlay li.page_item { - display: block; - // overflow: hidden; - position: relative; - padding: 11px 8px 11px 22px;; + position: fixed; + display: none; + width: 100%; + height: 100%; + top: 0; + left: 0; + right: 0; + overflow-y: scroll; + bottom: 0; + background-color: $green; + z-index: 999999; + cursor: pointer; +} +aside.oc-overlay .mobile-logo-link img { + max-height: 60px; + margin-left: 10px; +} +aside.oc-overlay li.page_item { + display: block; +// overflow: hidden; + position: relative; + padding: 11px 8px 11px 22px; +} +aside.oc-overlay #oc-top-links { + margin-left: 40px; + margin-top: 10px; + margin-bottom: -10px; + .top-link { + height: 40px; + margin-bottom: 8px; + img { + max-width: 42px; + } + &.up-link { + .top-link-text { + margin-top: 12px; + display: inline-block; + } + } + .top-link-text { + margin-left: 10px; + } } - aside.oc-overlay .left-off-canvas-list{ - clear: both; - margin-top: 20px; +} +aside.oc-overlay li.page_item.oc-expanded { + z-index: 9; +} +aside.oc-overlay ul.children li.oc-expanded ul.children.oc-open { + background: #4A5756; +} +aside.oc-overlay .left-off-canvas-list{ + clear: both; + margin-top: 20px; +} +aside.oc-overlay .off-canvas-listaside.oc-overlay .off-canvas-list ul li a { + line-height: 20px; + color: darken($green, 10%); + border-bottom: 1px solid #b1b3b6; + background-repeat: no-repeat; + background-position: 3px 50%; +} +aside.oc-overlay ul.oc-destinations-nav > li > a, +aside.oc-overlay ul.oc-primary-nav > li > a, +aside.oc-overlay ul.oc-home-link > li > a { + color: $white; +} +aside.oc-overlay li.page_item_has_children a.toggle { + position: absolute; + right: 10px; + top: 8px; + width: auto; + text-decoration: none; + &:before { + // @include off-canvas-point(right, $d-teal, 17px); + content: url(../assets/arrow-down-white.png); + width: 20px; + height: 20px; } - aside.oc-overlay .off-canvas-listaside.oc-overlay .off-canvas-list ul li a { - line-height: 20px; - color: darken($green, 10%); - border-bottom: 1px solid #b1b3b6; - background-repeat: no-repeat; - background-position: 3px 50%; + &:hover { + background: transparent; } - aside.oc-overlay ul.oc-destinations-nav > li > a, - aside.oc-overlay ul.oc-primary-nav > li > a, - aside.oc-overlay ul.oc-home-link > li > a { - color: $white; +} +aside.oc-overlay li.page_item_has_children a.toggle.open { + &:before { + content: url(../assets/arrow-up-white.png); } - aside.oc-overlay li.page_item_has_children a.toggle { - position: absolute; - right: 10px; - top: 8px; - width: auto; - text-decoration: none; - &:before { - // @include off-canvas-point(right, $d-teal, 17px); - content: url(../assets/arrow-down-white.png); - width: 20px; - height: 20px; +} + +aside.oc-overlay .off-canvas-list ul li > ul li > a { + padding-left: 10px; + margin-left: 25px; + line-height: 18px; +} + +#oc-client-info-container{ + background: $white; + .oc-client-info{ + color: $oil; + padding: 25px 0; + max-width: 220px; + margin: 0 auto; + text-align: center; + line-height: 1.2; + > * { + margin-bottom: 8px; + font-size: 16px; } - &:hover { - background: transparent; + > h2{ + font-size: 20px; + color: $oil; } } - aside.oc-overlay li.page_item_has_children a.toggle.open { - &:before { - content: url(../assets/arrow-up-white.png); +} +.oc-overlay { + @media #{$medium-down}{ + .glm-top-header-left{ + float: left; + margin-left: 5px; + margin-top: 10px; + img{ + max-width: 230px; + } } } - - aside.oc-overlay .off-canvas-list ul li > ul li > a { - padding-left: 10px; - margin-left: 25px; - line-height: 18px; + .oc-open{ + top: 45px !important; + opacity: 1 !important; + z-index: 99 !important; + padding-top: 20px !important; + padding-left: 20px !important; } - - #oc-client-info-container{ - background: $white; - .oc-client-info{ - color: $oil; - padding: 25px 0; - max-width: 220px; - margin: 0 auto; - text-align: center; - line-height: 1.2; - > * { - margin-bottom: 8px; - font-size: 16px; - } - > h2{ - font-size: 20px; - color: $oil; + ul.children{ + border-top: 1px solid white; + position: absolute; + top: 100vh; + opacity: 0; + z-index: -1; + width: 100%; + margin: 0; + left:0; + height: auto; + min-height: 100vh; + overflow-y: auto; + background-color: darken($green, 10%); + transition: top 500ms ease, opacity 500ms ease; + -webkit-transition: top 500ms ease, opacity 500ms ease; + -moz-transition: top 500ms ease, opacity 500ms ease; + li{ + a{ + color: white; } } + // overflow:hidden; + // height: auto; } - .oc-overlay { - @media #{$medium-down}{ - .glm-top-header-left{ - float: left; - margin-left: 5px; - margin-top: 10px; - img{ - max-width: 230px; - } + @media #{$large-up}{ + display: none !important; + } + #oc-socials-container { + background: white; + width: 100%; + } + #oc-socials { + padding: 0 15px; + background: white; + max-width: 300px; + margin: 0 auto 0 auto; + .social-link { + background-image: url(../assets/social-icons-medium-teal.png); + margin-right: 15px; + display: inline-block; + width: 44px; + height: 44px; + &.facebook { + background-position: 0px 0px; } - } - .oc-open{ - top: 45px !important; - opacity: 1 !important; - z-index: 99 !important; - padding-top: 20px !important; - padding-left: 20px !important; - } - ul.children{ - border-top: 1px solid white; - position: absolute; - top: 100vh; - opacity: 0; - z-index: -1; - width: 100%; - margin: 0; - left:0; - height: auto; - min-height: 100vh; - overflow-y: auto; - background-color: darken($green, 10%); - transition: top 500ms ease, opacity 500ms ease; - -webkit-transition: top 500ms ease, opacity 500ms ease; - -moz-transition: top 500ms ease, opacity 500ms ease; - li{ - a{ - color: white; - } + &.blog { + background-position: 0px -105px; } - // overflow:hidden; - // height: auto; - } - @media #{$large-up}{ - display: none !important; } - #oc-socials-container { - background: white; - width: 100%; - } - #oc-socials { - padding: 0 15px; - background: white; - max-width: 300px; - margin: 0 auto 0 auto; - .social-link { - background-image: url(../assets/social-icons-medium-teal.png); - margin-right: 15px; - display: inline-block; - width: 44px; - height: 44px; - &.facebook { - background-position: 0px 0px; - } - &.blog { - background-position: 0px -105px; - } + } + .footer-social{ + li{ + a{ + margin: 0; } } - .footer-social{ - li{ - a{ - margin: 0; - } - } + } + .button{ + display: block; + margin: 0 auto; + } + list-style: none; + li { + a { + color: $white; + font-size: 17px; + line-height: 1.2; + border-color: $white; + margin-bottom: 5px; } - .button{ - display: block; - margin: 0 auto; + a:hover { + color: $white; + } + .dropdown { + list-style: none; } + } + ul { list-style: none; + padding: 10px 0 0 0; li { a { color: $white; - font-size: 17px; - line-height: 1.2; - border-color: $white; - margin-bottom: 5px; } - a:hover { - color: $white; - } - .dropdown { + ul { list-style: none; - } - } - ul { - list-style: none; - padding: 10px 0 0 0; - li { - a { - color: $white; - } - ul { - list-style: none; - li { - a { - // width: 85%; - display: inline; - white-space: pre-wrap; - } + li { + a { + // width: 85%; + display: inline; + white-space: pre-wrap; } } } } } - - .offcavas-social-list { - @include inline-list; - margin-left: auto; - } - - - .offcavas-social-list { - @include inline-list; - margin-right: auto; - } - - body{ - #ocSearchForm{ - // max-width: 300px; - width: 80%; - margin: 10px auto 0 auto; - float: right; - position: relative; - left: -15px; - input{ - margin-bottom: 15px; - } +} + +.offcavas-social-list { + @include inline-list; + margin-left: auto; +} + + +.offcavas-social-list { + @include inline-list; + margin-right: auto; +} + +body{ + #ocSearchForm{ + // max-width: 300px; + width: 80%; + margin: 10px auto 0 auto; + float: right; + position: relative; + left: -15px; + input{ + margin-bottom: 15px; } - #off-canvas-connect{ - background-color: $oil; - padding: 30px 0 20px 0; - .footer-enews{ - max-width: 150px; - background-color: $bright-blue; - color: $white; - margin: 15px auto 0 auto; - text-align: center; - padding: 10px 0; - a { - color: white; - } - } - .footer-social-container{ - max-width: 270px; - margin: 0 auto; - .footer-social{ - padding-top: 0; - } - } - h2{ - color: $white; - font-size: 20px; - margin-bottom: 0; - text-align: center; + } + #off-canvas-connect{ + background-color: $oil; + padding: 30px 0 20px 0; + .footer-enews{ + max-width: 150px; + background-color: $bright-blue; + color: $white; + margin: 15px auto 0 auto; + text-align: center; + padding: 10px 0; + a { + color: white; } } - .oc-secondary-nav{ - background-color: darken($green, 10%); - margin: 0; - padding: 25px 0 0 0; - li{ - a{ - color: $white; - } + .footer-social-container{ + max-width: 270px; + margin: 0 auto; + .footer-social{ + padding-top: 0; } } - .oc-primary-separator { - max-width: 300px; + h2{ color: $white; - padding: 0 20px; - display: block; - margin: 0 0 20px 30px; - width: 80%; + font-size: 20px; + margin-bottom: 0; + text-align: center; } - #oc-overlay #oc-members-only-nav { - // margin: 0 0 0 15px; - //background: lighten($d-teal, 10%); - //max-width: 300px; - //border-radius: 5px; - // padding: 5px; - .oc-section-title h2 { + } + .oc-secondary-nav{ + background-color: darken($green, 10%); + margin: 0; + padding: 25px 0 0 0; + li{ + a{ color: $white; - font-size: 30px; } } - .oc-home-link{ - margin: 0; - padding: 0; - } - .oc-destinations-nav { - background: $green; - margin: 0; - padding: 0; - position: relative; - } - .oc-primary-nav{ - background: $green; - margin: 0; - padding: 0 0 15px 0; - position: relative; - } - - } - .mobile-menu-toggle{ - float: right; } - #menu-icon-close{ - background-color: darken($green, 10%); + .oc-primary-separator { + max-width: 300px; color: $white; - padding: 5px; - border-radius: 50%; - width: 35px; - text-align : center; - font-weight: bold; - float: right; - margin: 9px 10px 0 0; - } - .sub-menu-section > li.menu-item.oc-collapsed{ - max-height: 0; + padding: 0 20px; + display: block; + margin: 0 0 20px 30px; + width: 80%; + } + #oc-overlay #oc-members-only-nav { + // margin: 0 0 0 15px; + //background: lighten($d-teal, 10%); + //max-width: 300px; + //border-radius: 5px; + // padding: 5px; + .oc-section-title h2 { + color: $white; + font-size: 30px; + } + } + .oc-home-link{ + margin: 0; padding: 0; - opacity: 0; } - .oc-hidden{ - height: 0; - padding: 0 !important; - overflow: hidden; + .oc-destinations-nav { + background: $green; + margin: 0; + padding: 0; + position: relative; } - $top : 10px; - $left: 10px; - .sub-menu-section > li.oc-section-title { - padding-left: 45px; + .oc-primary-nav{ + background: $green; + margin: 0; + padding: 0 0 15px 0; + position: relative; } - .sub-menu-section > li.menu-item{ - // max-height: 2rem; - opacity: 1; - transition: padding 400ms ease, max-height 400ms ease; - -webkit-transition: padding 400ms ease, max-height 400ms ease; - -moz-transition: padding 400ms ease, max-height 400ms ease; - background: rgba($white, 0); - padding-left: 45px !important; - position: relative; - } \ No newline at end of file +} +.mobile-menu-toggle{ + float: right; +} +#menu-icon-close{ + background-color: darken($green, 10%); + color: $white; + padding: 5px; + border-radius: 50%; + width: 35px; + text-align : center; + font-weight: bold; + float: right; + margin: 9px 10px 0 0; +} +.sub-menu-section > li.menu-item.oc-collapsed{ + max-height: 0; + padding: 0; + opacity: 0; +} +.oc-hidden{ + height: 0; + padding: 0 !important; + overflow: hidden; +} +$top : 10px; +$left: 10px; +.sub-menu-section > li.oc-section-title { + padding-left: 45px; +} +.sub-menu-section > li.menu-item{ + // max-height: 2rem; + opacity: 1; + transition: padding 400ms ease, max-height 400ms ease; + -webkit-transition: padding 400ms ease, max-height 400ms ease; + -moz-transition: padding 400ms ease, max-height 400ms ease; + background: rgba($white, 0); + + padding-left: 45px !important; + position: relative; +} \ No newline at end of file diff --git a/scss/_slideshow.scss b/scss/_slideshow.scss index e61a003..1349216 100644 --- a/scss/_slideshow.scss +++ b/scss/_slideshow.scss @@ -11,6 +11,13 @@ } } } +#front-featured-image-container #front-featured-image-content #front-featured-image-headline { + p span, + p { + font-size: 12pt; + line-height: 1; + } +} #front-page-video{ width: 100%; } diff --git a/sections/off-canvas.php b/sections/off-canvas.php index b6b8f0c..a55f443 100644 --- a/sections/off-canvas.php +++ b/sections/off-canvas.php @@ -5,6 +5,46 @@ + +
    -- 2.17.1