f4763aac by Jeff Balicki

qa

Signed-off-by: Jeff <jeff@gotenzing.com>
1 parent c1b76676
...@@ -18079,7 +18079,6 @@ ul.sf_date_field .sf-datepicker { ...@@ -18079,7 +18079,6 @@ ul.sf_date_field .sf-datepicker {
18079 .side-caption:hover, .side-caption:focus-within { 18079 .side-caption:hover, .side-caption:focus-within {
18080 bottom: 0 !important; 18080 bottom: 0 !important;
18081 } 18081 }
18082
18083 .side-caption { 18082 .side-caption {
18084 position: absolute; 18083 position: absolute;
18085 bottom: -100%; 18084 bottom: -100%;
......
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
...@@ -20901,26 +20901,10 @@ ...@@ -20901,26 +20901,10 @@
20901 jQuery('.side-caption').each(function () { 20901 jQuery('.side-caption').each(function () {
20902 var that = this; 20902 var that = this;
20903 var _bottom = jQuery(this).find('.image-side-caption').innerHeight(); 20903 var _bottom = jQuery(this).find('.image-side-caption').innerHeight();
20904 if (!Responsive.isDesktop()) {
20905 if (jQuery(that).parent().is('.entry-header') && !jQuery(that).parent().is('.no-photo')) {
20906 jQuery(that).css('margin-bottom', -_bottom);
20907 var _bottom = jQuery(that).parent().find('.title-container').innerHeight();
20908 jQuery(that).css('bottom', _bottom);
20909 setTimeout(function () {
20910 jQuery(that).addClass('ready');
20911 }, 500);
20912 } else {
20913 jQuery(that).css('bottom', -_bottom);
20914 setTimeout(function () {
20915 jQuery(that).addClass('ready');
20916 }, 500);
20917 }
20918 } else {
20919 jQuery(this).css('bottom', -_bottom); 20904 jQuery(this).css('bottom', -_bottom);
20920 setTimeout(function () { 20905 setTimeout(function () {
20921 jQuery(that).addClass('ready'); 20906 jQuery(that).addClass('ready');
20922 }, 500); 20907 }, 500);
20923 }
20924 }); 20908 });
20925 } 20909 }
20926 }; 20910 };
...@@ -21008,7 +20992,7 @@ ...@@ -21008,7 +20992,7 @@
21008 if (img_width != '0') { 20992 if (img_width != '0') {
21009 var _bottom = jQuery(this).find('figcaption').innerHeight(); 20993 var _bottom = jQuery(this).find('figcaption').innerHeight();
21010 jQuery(this).find('figcaption').css('bottom', -_bottom); 20994 jQuery(this).find('figcaption').css('bottom', -_bottom);
21011 if ($('.post-template-default.page').length == 0) { 20995 if ($('.post-template-default').length == 0) {
21012 jQuery(this).find('.cap-wrapper').css('width', img_width); 20996 jQuery(this).find('.cap-wrapper').css('width', img_width);
21013 } 20997 }
21014 jQuery(this).addClass('captionized'); 20998 jQuery(this).addClass('captionized');
......
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
...@@ -29,6 +29,10 @@ if ($thumbnail_image && isset($thumbnail_image[0])) { ...@@ -29,6 +29,10 @@ if ($thumbnail_image && isset($thumbnail_image[0])) {
29 $img_alt = get_post_meta($post_thumbnail_id , '_wp_attachment_image_alt', true); 29 $img_alt = get_post_meta($post_thumbnail_id , '_wp_attachment_image_alt', true);
30 $img_title = $thumbnail_image[0]->post_title; 30 $img_title = $thumbnail_image[0]->post_title;
31 $copy = get_field('copy', $post_thumbnail_id ); 31 $copy = get_field('copy', $post_thumbnail_id );
32 if(!$copy){
33 $en_post_thumbnail_id = apply_filters( 'wpml_object_id', $post_thumbnail_id , 'attachment', FALSE, 'en' );
34 $copy = get_field('copy', $en_post_thumbnail_id );
35 }
32 } 36 }
33 37
34 38
......
...@@ -7,26 +7,12 @@ var HeaderMenu = (function() { ...@@ -7,26 +7,12 @@ var HeaderMenu = (function() {
7 jQuery('.side-caption').each(function() { 7 jQuery('.side-caption').each(function() {
8 var that = this; 8 var that = this;
9 var _bottom = jQuery(this).find('.image-side-caption').innerHeight(); 9 var _bottom = jQuery(this).find('.image-side-caption').innerHeight();
10 if(!Responsive.isDesktop()) { 10
11 if(jQuery(that).parent().is('.entry-header') && !jQuery(that).parent().is('.no-photo')) {
12 jQuery(that).css('margin-bottom', -_bottom);
13 var _bottom = jQuery(that).parent().find('.title-container').innerHeight();
14 jQuery(that).css('bottom', _bottom);
15 setTimeout(function() {
16 jQuery(that).addClass('ready');
17 }, 500);
18 } else {
19 jQuery(that).css('bottom', -_bottom);
20 setTimeout(function() {
21 jQuery(that).addClass('ready');
22 }, 500);
23 }
24 } else {
25 jQuery(this).css('bottom', -_bottom); 11 jQuery(this).css('bottom', -_bottom);
26 setTimeout(function() { 12 setTimeout(function() {
27 jQuery(that).addClass('ready'); 13 jQuery(that).addClass('ready');
28 }, 500); 14 }, 500);
29 } 15
30 }); 16 });
31 } 17 }
32 } 18 }
......
...@@ -8,7 +8,7 @@ jQuery(function($) { ...@@ -8,7 +8,7 @@ jQuery(function($) {
8 if(img_width != '0') { 8 if(img_width != '0') {
9 var _bottom = jQuery(this).find('figcaption').innerHeight(); 9 var _bottom = jQuery(this).find('figcaption').innerHeight();
10 jQuery(this).find('figcaption').css('bottom', -_bottom); 10 jQuery(this).find('figcaption').css('bottom', -_bottom);
11 if($('.post-template-default.page').length == 0) { 11 if($('.post-template-default').length == 0) {
12 jQuery(this).find('.cap-wrapper').css('width', img_width); 12 jQuery(this).find('.cap-wrapper').css('width', img_width);
13 } 13 }
14 jQuery(this).addClass('captionized'); 14 jQuery(this).addClass('captionized');
......
...@@ -124,6 +124,9 @@ ...@@ -124,6 +124,9 @@
124 .side-caption { 124 .side-caption {
125 &:hover, &:focus-within { 125 &:hover, &:focus-within {
126 bottom:0 !important; 126 bottom:0 !important;
127 @media screen and (max-width: 48rem) {
128
129 }
127 } 130 }
128 } 131 }
129 132
...@@ -145,6 +148,7 @@ ...@@ -145,6 +148,7 @@
145 max-width: 30%; 148 max-width: 30%;
146 @media screen and (max-width: 48rem) { 149 @media screen and (max-width: 48rem) {
147 max-width: 100%; 150 max-width: 100%;
151
148 } 152 }
149 } 153 }
150 154
......
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
2 Theme Name: MSF CA Child 2 Theme Name: MSF CA Child
3 Author: Tenzing Communications 3 Author: Tenzing Communications
4 Template: msf-ca 4 Template: msf-ca
5 Version: 1.0.6 5 Version: 1.0.7
6 */ 6 */
...\ No newline at end of file ...\ No newline at end of file
......