From 68128dffce5094d031d898486d8e6312452a8cc7 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Thu, 14 Apr 2016 15:50:42 -0400 Subject: [PATCH] changing slide id references --- css/app.css | 10 +-- js/app.js | 55 ++++++++-------- js/custom/pageSetup.js | 55 ++++++++-------- scss/_slideshow.scss | 144 ++++++++++++++++++++--------------------- 4 files changed, 133 insertions(+), 131 deletions(-) diff --git a/css/app.css b/css/app.css index 282ae29..cc0fd92 100644 --- a/css/app.css +++ b/css/app.css @@ -6774,7 +6774,7 @@ h2#block-title { font-size: 0.875rem; letter-spacing: normal; } } -#metaslider_11 .nivo-caption.open > .captionContent { +#metaslider_14 .nivo-caption.open > .captionContent { width: auto; transform: translate3d(0px, 0px, 0px) !important; visibility: visible; @@ -6782,7 +6782,7 @@ h2#block-title { transition: translate3d 500ms ease 0s !important; transition: visibility 500ms, opacity 1s linear !important; } -#metaslider_11 .nivo-caption.open > .captionButton { +#metaslider_14 .nivo-caption.open > .captionButton { width: auto; transform: translate3d(.1%, 0%, 0px) !important; visibility: visible; @@ -6791,15 +6791,15 @@ h2#block-title { transition: visibility 500ms, opacity 1s linear !important; transition: all 500ms !important; } -#metaslider_11 .nivo-caption.close > .captionContent { +#metaslider_14 .nivo-caption.close > .captionContent { transform: translate3d(-100%, 0%, 0px) !important; visibility: hidden; opacity: 0; - transition: translate3d 2000ms ease 0s !important; + transition: translate3d 500ms ease 0s !important; transition: visibility 500ms, opacity 0.5s linear !important; transition: all 500ms !important; } -#metaslider_11 .nivo-caption.close > .captionButton { +#metaslider_14 .nivo-caption.close > .captionButton { transform: translate3d(-100%, 0%, 0px) !important; visibility: hidden; opacity: 0; diff --git a/js/app.js b/js/app.js index fad49b5..dc98d25 100644 --- a/js/app.js +++ b/js/app.js @@ -64,40 +64,41 @@ $(document).ready(function () { // // -// $("#metaslider_14").nivoSlider({ -// afterLoad: function (){ -//// $("#metaslider_11 .nivo-caption").fadeIn(); -// $("#metaslider_14 .nivo-caption").addClass("open"); -// -// }, -// beforeChange: function () { -// $("#metaslider_14 .nivo-caption").removeClass("open"); -// $("#metaslider_14 .nivo-caption").addClass("close"); -// }, -// afterChange: function () { -// $("#metaslider_14 .nivo-caption").removeClass("close"); -// $("#metaslider_14 .nivo-caption").addClass("open"); -// -// -// } -// }); - - - // remove this code before final push - $("#metaslider_11").nivoSlider({ + $("#metaslider_14").nivoSlider({ pauseTime: 7000, afterLoad: function (){ -// $("#metaslider_11 .nivo-caption").fadeIn(); - $("#metaslider_11 .nivo-caption").addClass("open"); +// $("#metaslider_11 .nivo-caption").fadeIn(); + $("#metaslider_14 .nivo-caption").addClass("open"); }, beforeChange: function () { - $("#metaslider_11 .nivo-caption").removeClass("open"); - $("#metaslider_11 .nivo-caption").addClass("close"); + $("#metaslider_14 .nivo-caption").removeClass("open"); + $("#metaslider_14 .nivo-caption").addClass("close"); }, afterChange: function () { - $("#metaslider_11 .nivo-caption").removeClass("close"); - $("#metaslider_11 .nivo-caption").addClass("open"); + $("#metaslider_14 .nivo-caption").removeClass("close"); + $("#metaslider_14 .nivo-caption").addClass("open"); + + } }); + + + // remove this code before final push +// $("#metaslider_11").nivoSlider({ +// pauseTime: 7000, +// afterLoad: function (){ +//// $("#metaslider_11 .nivo-caption").fadeIn(); +// $("#metaslider_11 .nivo-caption").addClass("open"); +// +// }, +// beforeChange: function () { +// $("#metaslider_11 .nivo-caption").removeClass("open"); +// $("#metaslider_11 .nivo-caption").addClass("close"); +// }, +// afterChange: function () { +// $("#metaslider_11 .nivo-caption").removeClass("close"); +// $("#metaslider_11 .nivo-caption").addClass("open"); +// } +// }); }); diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js index 61f8a80..66a01f0 100644 --- a/js/custom/pageSetup.js +++ b/js/custom/pageSetup.js @@ -55,40 +55,41 @@ $(document).ready(function () { // // -// $("#metaslider_14").nivoSlider({ -// afterLoad: function (){ -//// $("#metaslider_11 .nivo-caption").fadeIn(); -// $("#metaslider_14 .nivo-caption").addClass("open"); -// -// }, -// beforeChange: function () { -// $("#metaslider_14 .nivo-caption").removeClass("open"); -// $("#metaslider_14 .nivo-caption").addClass("close"); -// }, -// afterChange: function () { -// $("#metaslider_14 .nivo-caption").removeClass("close"); -// $("#metaslider_14 .nivo-caption").addClass("open"); -// -// -// } -// }); - - - // remove this code before final push - $("#metaslider_11").nivoSlider({ + $("#metaslider_14").nivoSlider({ pauseTime: 7000, afterLoad: function (){ -// $("#metaslider_11 .nivo-caption").fadeIn(); - $("#metaslider_11 .nivo-caption").addClass("open"); +// $("#metaslider_11 .nivo-caption").fadeIn(); + $("#metaslider_14 .nivo-caption").addClass("open"); }, beforeChange: function () { - $("#metaslider_11 .nivo-caption").removeClass("open"); - $("#metaslider_11 .nivo-caption").addClass("close"); + $("#metaslider_14 .nivo-caption").removeClass("open"); + $("#metaslider_14 .nivo-caption").addClass("close"); }, afterChange: function () { - $("#metaslider_11 .nivo-caption").removeClass("close"); - $("#metaslider_11 .nivo-caption").addClass("open"); + $("#metaslider_14 .nivo-caption").removeClass("close"); + $("#metaslider_14 .nivo-caption").addClass("open"); + + } }); + + + // remove this code before final push +// $("#metaslider_11").nivoSlider({ +// pauseTime: 7000, +// afterLoad: function (){ +//// $("#metaslider_11 .nivo-caption").fadeIn(); +// $("#metaslider_11 .nivo-caption").addClass("open"); +// +// }, +// beforeChange: function () { +// $("#metaslider_11 .nivo-caption").removeClass("open"); +// $("#metaslider_11 .nivo-caption").addClass("close"); +// }, +// afterChange: function () { +// $("#metaslider_11 .nivo-caption").removeClass("close"); +// $("#metaslider_11 .nivo-caption").addClass("open"); +// } +// }); }); diff --git a/scss/_slideshow.scss b/scss/_slideshow.scss index 7c1d854..d16ca57 100644 --- a/scss/_slideshow.scss +++ b/scss/_slideshow.scss @@ -124,73 +124,7 @@ } } -//#metaslider_14 .nivo-caption.open > .captionContent{ -//// overflow-y: hidden; -//// max-height: 500px; /* approximate max height */ -//// -//// transition-property: all; -//// transition-duration: 4s; -//// transition-timing-function: cubic-bezier(.4,.89,.85,.99); -// width: auto; -//// position: absolute; -// transform: translate3d(0px, 0px, 0px) !important; -// visibility: visible; -// opacity: 1; -// transition: translate3d 500ms ease 0s !important; -// transition: visibility 500ms, opacity 1s linear !important; -// -//} -//#metaslider_14 .nivo-caption.open > .captionButton{ -//// overflow-y: hidden; -//// max-height: 500px; /* approximate max height */ -//// -//// transition-property: all; -//// transition-duration: 4s; -//// transition-timing-function: cubic-bezier(.4,.89,.85,.99); -// width: auto; -//// position: absolute; -// -// transform: translate3d(.1%, 0%, 0px) !important; -// visibility: visible; -// opacity: 1; -// transition: translate3d 500ms ease 1s !important; -// transition: visibility 500ms, opacity 1s linear !important; -// -// transition: all 500ms !important; -// -//} -//#metaslider_14 .nivo-caption.close >.captionContent{ -//// overflow-y: hidden; -//// max-height: 500px; /* approximate max height */ -//// -//// transition-property: all; -//// transition-duration: 4s; -//// transition-timing-function: cubic-bezier(.4,.89,.85,.99); -// transform: translate3d(-100%, 0%, 0px) !important; -// visibility: hidden; -// opacity: 0; -// transition: translate3d 500ms ease 0s !important; -// transition: visibility 500ms, opacity 0.5s linear !important; -// transition: all 500ms !important; -//} -//#metaslider_14 .nivo-caption.close >.captionButton{ -//// overflow-y: hidden; -//// max-height: 500px; /* approximate max height */ -//// -//// transition-property: all; -//// transition-duration: 4s; -//// transition-timing-function: cubic-bezier(.4,.89,.85,.99); -// transform: translate3d(-100%, 0%, 0px) !important; -// visibility: hidden; -// opacity: 0; -// transition: translate3d 500ms ease 0s !important; -// transition: visibility 500ms, opacity 0.5s linear !important; -// transition: all 500ms !important; -//} - -// remove this before final push - -#metaslider_11 .nivo-caption.open > .captionContent{ +#metaslider_14 .nivo-caption.open > .captionContent{ // overflow-y: hidden; // max-height: 500px; /* approximate max height */ // @@ -206,7 +140,7 @@ transition: visibility 500ms, opacity 1s linear !important; } -#metaslider_11 .nivo-caption.open > .captionButton{ +#metaslider_14 .nivo-caption.open > .captionButton{ // overflow-y: hidden; // max-height: 500px; /* approximate max height */ // @@ -225,7 +159,7 @@ transition: all 500ms !important; } -#metaslider_11 .nivo-caption.close >.captionContent{ +#metaslider_14 .nivo-caption.close >.captionContent{ // overflow-y: hidden; // max-height: 500px; /* approximate max height */ // @@ -235,11 +169,11 @@ transform: translate3d(-100%, 0%, 0px) !important; visibility: hidden; opacity: 0; - transition: translate3d 2000ms ease 0s !important; + transition: translate3d 500ms ease 0s !important; transition: visibility 500ms, opacity 0.5s linear !important; transition: all 500ms !important; } -#metaslider_11 .nivo-caption.close >.captionButton{ +#metaslider_14 .nivo-caption.close >.captionButton{ // overflow-y: hidden; // max-height: 500px; /* approximate max height */ // @@ -252,4 +186,70 @@ transition: translate3d 500ms ease 0s !important; transition: visibility 500ms, opacity 0.5s linear !important; transition: all 500ms !important; -} \ No newline at end of file +} + +// remove this before final push + +//#metaslider_11 .nivo-caption.open > .captionContent{ +//// overflow-y: hidden; +//// max-height: 500px; /* approximate max height */ +//// +//// transition-property: all; +//// transition-duration: 4s; +//// transition-timing-function: cubic-bezier(.4,.89,.85,.99); +// width: auto; +//// position: absolute; +// transform: translate3d(0px, 0px, 0px) !important; +// visibility: visible; +// opacity: 1; +// transition: translate3d 500ms ease 0s !important; +// transition: visibility 500ms, opacity 1s linear !important; +// +//} +//#metaslider_11 .nivo-caption.open > .captionButton{ +//// overflow-y: hidden; +//// max-height: 500px; /* approximate max height */ +//// +//// transition-property: all; +//// transition-duration: 4s; +//// transition-timing-function: cubic-bezier(.4,.89,.85,.99); +// width: auto; +//// position: absolute; +// +// transform: translate3d(.1%, 0%, 0px) !important; +// visibility: visible; +// opacity: 1; +// transition: translate3d 500ms ease 1s !important; +// transition: visibility 500ms, opacity 1s linear !important; +// +// transition: all 500ms !important; +// +//} +//#metaslider_11 .nivo-caption.close >.captionContent{ +//// overflow-y: hidden; +//// max-height: 500px; /* approximate max height */ +//// +//// transition-property: all; +//// transition-duration: 4s; +//// transition-timing-function: cubic-bezier(.4,.89,.85,.99); +// transform: translate3d(-100%, 0%, 0px) !important; +// visibility: hidden; +// opacity: 0; +// transition: translate3d 2000ms ease 0s !important; +// transition: visibility 500ms, opacity 0.5s linear !important; +// transition: all 500ms !important; +//} +//#metaslider_11 .nivo-caption.close >.captionButton{ +//// overflow-y: hidden; +//// max-height: 500px; /* approximate max height */ +//// +//// transition-property: all; +//// transition-duration: 4s; +//// transition-timing-function: cubic-bezier(.4,.89,.85,.99); +// transform: translate3d(-100%, 0%, 0px) !important; +// visibility: hidden; +// opacity: 0; +// transition: translate3d 500ms ease 0s !important; +// transition: visibility 500ms, opacity 0.5s linear !important; +// transition: all 500ms !important; +//} \ No newline at end of file -- 2.17.1