From 79f3b1e049ccce86bdc6433a3a75b9c8771e4dea Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Tue, 14 May 2019 13:44:18 -0400
Subject: [PATCH] Update CSS

---
 .../css/display-featured-image-genesis.css    |  2 +-
 ...ss-displayfeaturedimagegenesis-enqueue.php | 20 +++++++++++--------
 sass/display-featured-image-genesis.scss      |  5 +++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/includes/css/display-featured-image-genesis.css b/includes/css/display-featured-image-genesis.css
index 6e78be7..04fbe74 100644
--- a/includes/css/display-featured-image-genesis.css
+++ b/includes/css/display-featured-image-genesis.css
@@ -1 +1 @@
-.has-leader .site-inner{margin-top:0}.big-leader{overflow:hidden;max-height:100vh;position:relative}.big-leader .wrap{position:absolute;right:0;bottom:0;left:0;width:100%;z-index:1}.big-leader--scriptless{height:auto}.big-leader--scriptless img{display:block;height:100vh;max-width:none;-o-object-fit:cover;object-fit:cover;width:100vw}.big-leader .entry-title.featured-image-overlay,.big-leader .archive-title.featured-image-overlay{color:#fff;text-align:center}.big-leader .excerpt,.big-leader .archive-description{margin-bottom:24px;padding:24px;background:rgba(255,255,255,.85)}.big-leader p{margin-top:18px;margin-bottom:0}.home .big-leader p{margin-top:0}.home .big-leader p:last-child{margin-bottom:0}.big-leader .excerpt .entry-title,.big-leader .archive-description .archive-title{margin-bottom:0}.backstretch.no-js{max-height:600px}img.featured{max-width:100%}
\ No newline at end of file
+.has-leader .site-inner{margin-top:0}.big-leader{overflow:hidden;max-height:100vh;position:relative}.big-leader .wrap{position:absolute;right:0;bottom:0;left:0;width:100%;z-index:1}.big-leader--scriptless{height:auto}.big-leader--scriptless img{display:block;height:100vh;max-width:none;-o-object-fit:cover;object-fit:cover;width:100vw}.big-leader .entry-title.featured-image-overlay,.big-leader .archive-title.featured-image-overlay{color:#fff;text-align:center}.big-leader .excerpt,.big-leader .archive-description{margin-bottom:24px;padding:24px;background:rgba(255,255,255,.85)}.big-leader p{margin-top:18px;margin-bottom:0}.home .big-leader p{margin-top:0}.home .big-leader p:last-child{margin-bottom:0}.big-leader .excerpt .entry-title,.big-leader .archive-description .archive-title{margin-bottom:0}@keyframes fadein{from{opacity:0}to{opacity:1}}.backstretch.no-js{max-height:600px}img.featured{max-width:100%}
\ No newline at end of file
diff --git a/includes/output/class-displayfeaturedimagegenesis-enqueue.php b/includes/output/class-displayfeaturedimagegenesis-enqueue.php
index 9a11063..23e1ccc 100644
--- a/includes/output/class-displayfeaturedimagegenesis-enqueue.php
+++ b/includes/output/class-displayfeaturedimagegenesis-enqueue.php
@@ -44,8 +44,10 @@ public function __construct( $setting, $item, $version ) {
 	 * @since 3.1.0
 	 */
 	public function enqueue_style() {
-		$css_file = apply_filters( 'display_featured_image_genesis_css_file', plugin_dir_url( __FILE__ ) . 'css/display-featured-image-genesis.css' );
-		wp_enqueue_style( 'displayfeaturedimage-style', esc_url( $css_file ), array(), $this->version );
+		$css_file = apply_filters( 'display_featured_image_genesis_css_file', plugin_dir_url( dirname( __FILE__ ) ) . 'css/display-featured-image-genesis.css' );
+		if ( $css_file ) {
+			wp_enqueue_style( 'displayfeaturedimage-style', esc_url( $css_file ), array(), $this->version );
+		}
 		$this->add_inline_style();
 	}
 
@@ -55,10 +57,10 @@ public function enqueue_style() {
 	 */
 	public function enqueue_scripts() {
 		$minify = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-		wp_register_script( 'backstretch', plugins_url( "/includes/js/backstretch{$minify}.js", dirname( __FILE__ ) ), array( 'jquery' ), '2.1.16', true );
+		wp_register_script( 'backstretch', plugins_url( "/js/backstretch{$minify}.js", dirname( __FILE__ ) ), array( 'jquery' ), '2.1.16', true );
 		wp_enqueue_script(
 			'displayfeaturedimage-backstretch-set',
-			plugins_url( "/includes/js/backstretch-set{$minify}.js", dirname( __FILE__ ) ),
+			plugins_url( "/js/backstretch-set{$minify}.js", dirname( __FILE__ ) ),
 			array(
 				'jquery',
 				'backstretch',
@@ -172,10 +174,12 @@ private function get_max_height_css() {
 	 * @return string
 	 */
 	private function get_image_css() {
-		$css    = $this->get_object_position();
-		$height = $this->setting['less_header'];
-		if ( $height ) {
-			$css .= "height: calc( 100vh - {$height}px );";
+		$css = $this->get_object_position();
+		if ( $this->setting['less_header'] ) {
+			$css .= "height: calc( 100vh - {$this->setting['less_header']}px );";
+		}
+		if ( $this->setting['fade'] ) {
+			$css .= "animation: fadein {$this->setting['fade']}ms;";
 		}
 		if ( $css ) {
 			$css = ".big-leader--scriptless img { {$css} }";
diff --git a/sass/display-featured-image-genesis.scss b/sass/display-featured-image-genesis.scss
index cd25578..508314a 100644
--- a/sass/display-featured-image-genesis.scss
+++ b/sass/display-featured-image-genesis.scss
@@ -64,6 +64,11 @@
 	}
 }
 
+@keyframes fadein {
+	from { opacity: 0; }
+	to   { opacity: 1; }
+}
+
 .backstretch.no-js {
 	max-height: 600px;
 }