diff --git a/README.md b/README.md index f0e7798..0d29396 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Timeline Express v1.1.6.4 +Timeline Express v1.1.6.5 ================ Timeline express allows you to create a vertical animated and responsive timeline of posts , without writing a single line of code. Sweet! @@ -281,6 +281,9 @@ Have an idea for a future release feature? I love hearing about new ideas! You c ### Changelog +###### 1.1.6.5 - March 31st, 2015 +* Enhancement: re-wrote part of the CSS file, to allow for native masonry layouts (uniform spacing between containers) + ###### 1.1.6.4 - March 23rd, 2015 * Enhancement: Packaged French translation - thanks goes to Julien Lambert * Enhancement: Fixed a few typos in the plugin diff --git a/classes/class.timeline-express.php b/classes/class.timeline-express.php index b24dce9..3a4438b 100644 --- a/classes/class.timeline-express.php +++ b/classes/class.timeline-express.php @@ -960,7 +960,7 @@ public function processShortcode( $p ) { // set the current date, with our offset $offset = get_option('gmt_offset'); - $current_date = strtotime( 'today ' . $offset ); + $current_date = strtotime( 'today +' . $offset ); // decide how to compare our $current_date to $announcement_start_date meta $compare = $this->timeline_express_optionVal['announcement-time-frame']; @@ -1266,11 +1266,17 @@ public function timeline_express_get_image_id($image_url) { // @since v1.1.5.7 public function timeline_express_build_bootstrap_dropdown( $field, $meta ) { + if( is_ssl() ) { + $http = 'http:'; + } else { + $http = 'https:'; + } // get the icons out of the css file - $response = wp_remote_get( 'http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css' ); + // based on https or http... + $response = wp_remote_get( $http . '//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css' ); if( is_wp_error( $response ) ) { - wp_die( $resposne->get_error_message() , $response->title , array( 'back_link' => true ) ); + wp_die( $response->get_error_message() , __( 'Error' , 'timeline-express' ) , array( 'back_link' => true ) ); } // splot the response body, and store the icon classes in a variable diff --git a/css/timeline-express.css b/css/timeline-express.css index c4aaf65..dbe1344 100644 --- a/css/timeline-express.css +++ b/css/timeline-express.css @@ -1,4 +1,4 @@ -/* Timeline Express Minified Styles 1.1.5.7 */ +/* Timeline Express Minified Styles 1.1.6.5 */ /* By Evan Herman (http://www.evan-herman.com */ /* -------------------------------------------------- */ .cd-container { @@ -17,6 +17,9 @@ display: block; margin: 1em auto; } +.cd-timeline-block:nth-child(2) { + margin-top: 11.5em; +} #cd-timeline { position: relative; padding: 2em 0; @@ -60,6 +63,7 @@ } }.cd-timeline-block { margin: 25px 0; + width: 50%; } .cd-timeline-block:after { content: ""; @@ -74,8 +78,7 @@ } @media only screen and (min-width:822px) { .cd-timeline-block { - width: 100%; - margin: -3.5em 0; + width: 50%; } .cd-timeline-block:first-child { margin-top: 0; @@ -86,7 +89,6 @@ }.cd-timeline-img { position: absolute; top: 0; - left: 0; width: 40px; height: 40px; border-radius: 50%; @@ -184,6 +186,7 @@ border-radius: .25em; padding: 1em; box-shadow: 0 3px 0 #B9C5CD; + width: 65%; } .cd-timeline-content:after { content: ""; @@ -252,7 +255,7 @@ .cd-timeline-content { margin-left: 0; padding: 1.6em; - width: 39%; + width: 75%; background: #EFEFEF; } .cd-timeline-content::before { @@ -304,7 +307,7 @@ animation: cd-bounce-2 .6s; } }@media only screen and (min-width:822px) { - .cssanimations .cd-timeline-block: nth-child(even) .cd-timeline-content.bounce-in { + .cssanimations .cd-timeline-block:nth-child(even) .cd-timeline-content.bounce-in { -webkit-animation: cd-bounce-2-inverse .6s; -moz-animation: cd-bounce-2-inverse .6s; animation: cd-bounce-2-inverse .6s; @@ -433,7 +436,12 @@ } .cd-timeline-icon-link { color: #fff!important; + position: absolute; } +.cd-timeline-block:nth-child(odd) .cd-timeline-icon-link { + right: 0; +} + @media only screen and (max-width:821px) { #cd-timeline span.fa { color: #fff; @@ -447,13 +455,22 @@ position: relative; z-index: 99999; } + .cd-timeline-block:nth-child(odd) .cd-timeline-icon-link, .cd-timeline-block:nth-child(even) { + left: 0 !important; + } + .cd-timeline-block { + width: 100% !important; + } + .cd-timeline-block:nth-child(2) { + margin: 25px 0 !important; + } } .timeline-width100 { width: 100%} -.timeline-width34 { - width: 34%} -.timeline-width30 { - width: 30%} +.timeline-width65 { + width: 65%} +.timeline-width60 { + width: 60%} .timeline-date-left { width: 100%; float: left !important; diff --git a/css/timeline-express.min.css b/css/timeline-express.min.css index e529f29..d367fbd 100644 --- a/css/timeline-express.min.css +++ b/css/timeline-express.min.css @@ -1,4 +1,4 @@ -/* Timeline Express Minified Styles 1.1.5.7 */ +/* Timeline Express Minified Styles 1.1.6.5 */ /* By Evan Herman (http://www.evan-herman.com */ /* -------------------------------------------------- */ -.cd-container{width:100%;max-width:822px;margin:0 auto}.cd-container::after{content:'';display:table;clear:both}.cd-timeline-announcement-image{box-shadow:none!important;max-width:100%;display:block;margin:1em auto}#cd-timeline{position:relative;padding:2em 0;margin-top:2em;margin-bottom:3em;-ms-filter:"alpha(Opacity=0)";filter:alpha(opacity=0);-moz-opacity:0;-khtml-opacity:0;opacity:0}#cd-timeline::before{content:'';position:absolute;top:0;left:18px;height:100%;width:4px;background:#d7e4ed}.announcement-banner-image{max-width:100%}.timeline-express-single-page-announcement-date{display:block;margin-bottom:1em}@media only screen and (min-width:822px){#cd-timeline{margin-top:3em;margin-bottom:5.5em}#cd-timeline::before{left:50%;margin-left:-2px}}.cd-timeline-block{margin:25px 0}.cd-timeline-block:after{content:"";display:table;clear:both}.cd-timeline-block:first-child{margin-top:0}.cd-timeline-block:last-child{margin-bottom:0}@media only screen and (min-width:822px){.cd-timeline-block{width:100%;margin:-3.5em 0}.cd-timeline-block:first-child{margin-top:0}.cd-timeline-block:last-child{margin-bottom:0}}.cd-timeline-img{position:absolute;top:0;left:0;width:40px;height:40px;border-radius:50%;box-shadow:0 0 0 4px white,inset 0 2px 0 rgba(0,0,0,.08),0 3px 0 4px rgba(0,0,0,.05)}.cd-timeline-img img{display:block;width:24px;height:24px;position:relative;left:50%;top:50%;margin-left:-12px;margin-top:-12px}.cd-timeline-img.cd-picture{background:#75ce66}.cd-timeline-img.cd-movie{background:#c03b44}.cd-timeline-img.cd-location{background:#f0ca45}@media only screen and (min-width:822px){.cd-timeline-img{width:60px;height:60px;left:50%;margin-left:-30px;-webkit-transform:translateZ(0);-webkit-backface-visibility:hidden}.cssanimations .cd-timeline-img.is-hidden{visibility:hidden}.cssanimations .cd-timeline-img.bounce-in{visibility:visible;-webkit-animation:cd-bounce-1 .6s;-moz-animation:cd-bounce-1 .6s;animation:cd-bounce-1 .6s}}@-webkit-keyframes cd-bounce-1{0%{opacity:0;-webkit-transform:scale(0.5)}60%{opacity:1;-webkit-transform:scale(1.2)}100%{-webkit-transform:scale(1)}}@-moz-keyframes cd-bounce-1{0%{opacity:0;-moz-transform:scale(0.5)}60%{opacity:1;-moz-transform:scale(1.2)}100%{-moz-transform:scale(1)}}@keyframes cd-bounce-1{0%{opacity:0;-webkit-transform:scale(0.5);-moz-transform:scale(0.5);-ms-transform:scale(0.5);-o-transform:scale(0.5);transform:scale(0.5)}60%{opacity:1;-webkit-transform:scale(1.2);-moz-transform:scale(1.2);-ms-transform:scale(1.2);-o-transform:scale(1.2);transform:scale(1.2)}100%{-webkit-transform:scale(1);-moz-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1);transform:scale(1)}}.cd-timeline-content{position:relative;margin-left:60px;background:#fff;border-radius:.25em;padding:1em;box-shadow:0 3px 0 #B9C5CD}.cd-timeline-content:after{content:"";display:table;clear:both}.cd-timeline-content .cd-date,.cd-timeline-content .cd-read-more{display:inline-block}.cd-timeline-content .cd-read-more{padding:.8em 1em;position:relative;z-index:9999}.cd-timeline-content .cd-date{float:left;padding:.8em 0;opacity:.7;font-size:12px}.cd-timeline-title-container{display:inline-block;width:100%;float:left;margin:.55em 0}.cd-timeline-title-container h2{float:left}.cd-timeline-content .timeline-date{opacity:.7;font-size:.857143rem;float:right;margin-top:.5em}.cd-timeline-content::before{content:'';position:absolute;top:16px;right:100%;height:0;width:0;border:7px solid transparent;border-right:7px solid #fff}@media only screen and (min-width:768px){.cd-timeline-content h2{margin-top:0;margin-bottom:0}.cd-timeline-content .the-excerpt{display:block;float:left;width:100%;margin:1em 0;position:relative;z-index:999}.cd-timeline-content .cd-date,.cd-timeline-content .cd-read-more{font-size:14px;font-size:.875rem;position:relative;z-index:999}}@media only screen and (min-width:822px){.cd-timeline-content{margin-left:0;padding:1.6em;width:39%;background:#EFEFEF}.cd-timeline-content::before{top:24px;left:100%;border-color:transparent transparent transparent #EFEFEF}.cd-timeline-content .cd-read-more{float:left;color:#333}.cd-timeline-content .cd-date{position:absolute;width:100%;left:125%;top:15px}.cd-timeline-block:nth-child(even) .cd-timeline-content{float:right}.cd-timeline-block:nth-child(even) .cd-timeline-content::before{top:24px;left:auto;right:100%;border-color:transparent #EFEFEF transparent transparent}.cd-timeline-block:nth-child(even) .cd-timeline-content .cd-read-more{float:right;color:#333;padding-right:0}.cd-timeline-block:nth-child(odd) .cd-timeline-content .cd-read-more{position:relative;z-index:99999;padding-left:0}.cd-timeline-block:nth-child(even) .cd-timeline-content .cd-date{left:auto;right:125%;text-align:right}.cssanimations .cd-timeline-content.is-hidden{visibility:hidden}.cssanimations .cd-timeline-content.bounce-in{visibility:visible;-webkit-animation:cd-bounce-2 .6s;-moz-animation:cd-bounce-2 .6s;animation:cd-bounce-2 .6s}}@media only screen and (min-width:822px){.cssanimations .cd-timeline-block:nth-child(even) .cd-timeline-content.bounce-in{-webkit-animation:cd-bounce-2-inverse .6s;-moz-animation:cd-bounce-2-inverse .6s;animation:cd-bounce-2-inverse .6s}}@-webkit-keyframes cd-bounce-2{0%{opacity:0;-webkit-transform:translateX(-100px)}60%{opacity:1;-webkit-transform:translateX(20px)}100%{-webkit-transform:translateX(0)}}@-moz-keyframes cd-bounce-2{0%{opacity:0;-moz-transform:translateX(-100px)}60%{opacity:1;-moz-transform:translateX(20px)}100%{-moz-transform:translateX(0)}}@keyframes cd-bounce-2{0%{opacity:0;-webkit-transform:translateX(-100px);-moz-transform:translateX(-100px);-ms-transform:translateX(-100px);-o-transform:translateX(-100px);transform:translateX(-100px)}60%{opacity:1;-webkit-transform:translateX(20px);-moz-transform:translateX(20px);-ms-transform:translateX(20px);-o-transform:translateX(20px);transform:translateX(20px)}100%{-webkit-transform:translateX(0);-moz-transform:translateX(0);-ms-transform:translateX(0);-o-transform:translateX(0);transform:translateX(0)}}@-webkit-keyframes cd-bounce-2-inverse{0%{opacity:0;-webkit-transform:translateX(100px)}60%{opacity:1;-webkit-transform:translateX(-20px)}100%{-webkit-transform:translateX(0)}}@-moz-keyframes cd-bounce-2-inverse{0%{opacity:0;-moz-transform:translateX(100px)}60%{opacity:1;-moz-transform:translateX(-20px)}100%{-moz-transform:translateX(0)}}@keyframes cd-bounce-2-inverse{0%{opacity:0;-webkit-transform:translateX(100px);-moz-transform:translateX(100px);-ms-transform:translateX(100px);-o-transform:translateX(100px);transform:translateX(100px)}60%{opacity:1;-webkit-transform:translateX(-20px);-moz-transform:translateX(-20px);-ms-transform:translateX(-20px);-o-transform:translateX(-20px);transform:translateX(-20px)}100%{-webkit-transform:translateX(0);-moz-transform:translateX(0);-ms-transform:translateX(0);-o-transform:translateX(0);transform:translateX(0)}}.more-to-come-container{position:relative;background:#EFEFEF;display:block;width:100%;text-align:center}.more-to-come{margin:10em 0 0;padding:1em 0;font-weight:200;color:rgba(100,100,100,.46)}.page article.page{background:0 0!important;box-shadow:none;border:none;-webkit-box-shadow:none}#cd-timeline span.fa{color:#fff;font-size:28px;display:block;text-align:center;margin-top:17px}.cd-timeline-icon-link{color:#fff!important}@media only screen and (max-width:821px){#cd-timeline span.fa{color:#fff;font-size:18px;display:block;text-align:center;margin-top:12px}.cd-timeline-block:nth-child(even) .cd-timeline-content .cd-read-more,.cd-timeline-block:nth-child(odd) .cd-timeline-content .cd-read-more{padding-left:0!important;position:relative;z-index:99999}}.timeline-width100{width:100%}.timeline-width34{width:34%}.timeline-width30{width:30%}.timeline-date-left{width:100%;float:left!important}.single-post .announcement-banner-image,.single-post .return-to-timeline,.single-post .timeline-express-single-page-announcement-date{display:none} \ No newline at end of file +.cd-container{width:100%;max-width:822px;margin:0 auto}.cd-container::after{content:'';display:table;clear:both}.cd-timeline-announcement-image{box-shadow:none!important;max-width:100%;display:block;margin:1em auto}.cd-timeline-block:nth-child(2){margin-top:11.5em}#cd-timeline{position:relative;padding:2em 0;margin-top:2em;margin-bottom:3em;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";filter:alpha(opacity=0);-moz-opacity:0;-khtml-opacity:0;opacity:0}#cd-timeline::before{content:'';position:absolute;top:0;left:18px;height:100%;width:4px;background:#d7e4ed}.announcement-banner-image{max-width:100%}.timeline-express-single-page-announcement-date{display:block;margin-bottom:1em}@media only screen and (min-width:822px){#cd-timeline{margin-top:3em;margin-bottom:5.5em}#cd-timeline::before{left:50%;margin-left:-2px}}.cd-timeline-block{margin:25px 0;width:50%}.cd-timeline-block:after{content:"";display:table;clear:both}.cd-timeline-block:first-child{margin-top:0}.cd-timeline-block:last-child{margin-bottom:0}@media only screen and (min-width:822px){.cd-timeline-block{width:50%}.cd-timeline-block:first-child{margin-top:0}.cd-timeline-block:last-child{margin-bottom:0}}.cd-timeline-img{position:absolute;top:0;width:40px;height:40px;border-radius:50%;box-shadow:0 0 0 4px #fff,inset 0 2px 0 rgba(0,0,0,.08),0 3px 0 4px rgba(0,0,0,.05)}.cd-timeline-img img{display:block;width:24px;height:24px;position:relative;left:50%;top:50%;margin-left:-12px;margin-top:-12px}.cd-timeline-img.cd-picture{background:#75ce66}.cd-timeline-img.cd-movie{background:#c03b44}.cd-timeline-img.cd-location{background:#f0ca45}@media only screen and (min-width:822px){.cd-timeline-img{width:60px;height:60px;left:50%;margin-left:-30px;-webkit-transform:translateZ(0);-webkit-backface-visibility:hidden}.cssanimations .cd-timeline-img.is-hidden{visibility:hidden}.cssanimations .cd-timeline-img.bounce-in{visibility:visible;-webkit-animation:cd-bounce-1 .6s;-moz-animation:cd-bounce-1 .6s;animation:cd-bounce-1 .6s}}@-webkit-keyframes cd-bounce-1{0%{opacity:0;-webkit-transform:scale(.5)}60%{opacity:1;-webkit-transform:scale(1.2)}100%{-webkit-transform:scale(1)}}@-moz-keyframes cd-bounce-1{0%{opacity:0;-moz-transform:scale(.5)}60%{opacity:1;-moz-transform:scale(1.2)}100%{-moz-transform:scale(1)}}@keyframes cd-bounce-1{0%{opacity:0;-webkit-transform:scale(.5);-moz-transform:scale(.5);-ms-transform:scale(.5);-o-transform:scale(.5);transform:scale(.5)}60%{opacity:1;-webkit-transform:scale(1.2);-moz-transform:scale(1.2);-ms-transform:scale(1.2);-o-transform:scale(1.2);transform:scale(1.2)}100%{-webkit-transform:scale(1);-moz-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1);transform:scale(1)}}.cd-timeline-content{position:relative;margin-left:60px;background:#fff;border-radius:.25em;padding:1em;box-shadow:0 3px 0 #B9C5CD;width:65%}.cd-timeline-content:after{content:"";display:table;clear:both}.cd-timeline-content .cd-date,.cd-timeline-content .cd-read-more{display:inline-block}.cd-timeline-content .cd-read-more{padding:.8em 1em;position:relative;z-index:9999}.cd-timeline-content .cd-date{float:left;padding:.8em 0;opacity:.7;font-size:12px}.cd-timeline-title-container{display:inline-block;width:100%;float:left;margin:.55em 0}.cd-timeline-title-container h2{float:left}.cd-timeline-content .timeline-date{opacity:.7;font-size:.857143rem;float:right;margin-top:.5em}.cd-timeline-content::before{content:'';position:absolute;top:16px;right:100%;height:0;width:0;border:7px solid transparent;border-right:7px solid #fff}@media only screen and (min-width:768px){.cd-timeline-content h2{margin-top:0;margin-bottom:0}.cd-timeline-content .the-excerpt{display:block;float:left;width:100%;margin:1em 0;position:relative;z-index:999}.cd-timeline-content .cd-date,.cd-timeline-content .cd-read-more{font-size:14px;font-size:.875rem;position:relative;z-index:999}}@media only screen and (min-width:822px){.cd-timeline-content{margin-left:0;padding:1.6em;width:75%;background:#EFEFEF}.cd-timeline-content::before{top:24px;left:100%;border-color:transparent transparent transparent #EFEFEF}.cd-timeline-content .cd-read-more{float:left;color:#333}.cd-timeline-content .cd-date{position:absolute;width:100%;left:125%;top:15px}.cd-timeline-block:nth-child(even) .cd-timeline-content{float:right}.cd-timeline-block:nth-child(even) .cd-timeline-content::before{top:24px;left:auto;right:100%;border-color:transparent #EFEFEF transparent transparent}.cd-timeline-block:nth-child(even) .cd-timeline-content .cd-read-more{float:right;color:#333;padding-right:0}.cd-timeline-block:nth-child(odd) .cd-timeline-content .cd-read-more{position:relative;z-index:99999;padding-left:0}.cd-timeline-block:nth-child(even) .cd-timeline-content .cd-date{left:auto;right:125%;text-align:right}.cssanimations .cd-timeline-content.is-hidden{visibility:hidden}.cssanimations .cd-timeline-content.bounce-in{visibility:visible;-webkit-animation:cd-bounce-2 .6s;-moz-animation:cd-bounce-2 .6s;animation:cd-bounce-2 .6s}}@media only screen and (min-width:822px){.cssanimations .cd-timeline-block:nth-child(even) .cd-timeline-content.bounce-in{-webkit-animation:cd-bounce-2-inverse .6s;-moz-animation:cd-bounce-2-inverse .6s;animation:cd-bounce-2-inverse .6s}}@-webkit-keyframes cd-bounce-2{0%{opacity:0;-webkit-transform:translateX(-100px)}60%{opacity:1;-webkit-transform:translateX(20px)}100%{-webkit-transform:translateX(0)}}@-moz-keyframes cd-bounce-2{0%{opacity:0;-moz-transform:translateX(-100px)}60%{opacity:1;-moz-transform:translateX(20px)}100%{-moz-transform:translateX(0)}}@keyframes cd-bounce-2{0%{opacity:0;-webkit-transform:translateX(-100px);-moz-transform:translateX(-100px);-ms-transform:translateX(-100px);-o-transform:translateX(-100px);transform:translateX(-100px)}60%{opacity:1;-webkit-transform:translateX(20px);-moz-transform:translateX(20px);-ms-transform:translateX(20px);-o-transform:translateX(20px);transform:translateX(20px)}100%{-webkit-transform:translateX(0);-moz-transform:translateX(0);-ms-transform:translateX(0);-o-transform:translateX(0);transform:translateX(0)}}@-webkit-keyframes cd-bounce-2-inverse{0%{opacity:0;-webkit-transform:translateX(100px)}60%{opacity:1;-webkit-transform:translateX(-20px)}100%{-webkit-transform:translateX(0)}}@-moz-keyframes cd-bounce-2-inverse{0%{opacity:0;-moz-transform:translateX(100px)}60%{opacity:1;-moz-transform:translateX(-20px)}100%{-moz-transform:translateX(0)}}@keyframes cd-bounce-2-inverse{0%{opacity:0;-webkit-transform:translateX(100px);-moz-transform:translateX(100px);-ms-transform:translateX(100px);-o-transform:translateX(100px);transform:translateX(100px)}60%{opacity:1;-webkit-transform:translateX(-20px);-moz-transform:translateX(-20px);-ms-transform:translateX(-20px);-o-transform:translateX(-20px);transform:translateX(-20px)}100%{-webkit-transform:translateX(0);-moz-transform:translateX(0);-ms-transform:translateX(0);-o-transform:translateX(0);transform:translateX(0)}}.more-to-come-container{position:relative;background:#EFEFEF;display:block;width:100%;text-align:center}.more-to-come{margin:10em 0 0;padding:1em 0;font-weight:200;color:rgba(100,100,100,.46)}.page article.page{background:0 0!important;box-shadow:none;border:none;-webkit-box-shadow:none}#cd-timeline span.fa{color:#fff;font-size:28px;display:block;text-align:center;margin-top:17px}.cd-timeline-icon-link{color:#fff!important;position:absolute}.cd-timeline-block:nth-child(odd) .cd-timeline-icon-link{right:0}@media only screen and (max-width:821px){#cd-timeline span.fa{color:#fff;font-size:18px;display:block;text-align:center;margin-top:12px}.cd-timeline-block:nth-child(even) .cd-timeline-content .cd-read-more,.cd-timeline-block:nth-child(odd) .cd-timeline-content .cd-read-more{padding-left:0!important;position:relative;z-index:99999}.cd-timeline-block:nth-child(even),.cd-timeline-block:nth-child(odd) .cd-timeline-icon-link{left:0!important}.cd-timeline-block{width:100%!important}.cd-timeline-block:nth-child(2){margin:25px 0!important}}.timeline-width100{width:100%}.timeline-width65{width:65%}.timeline-width60{width:60%}.timeline-date-left{width:100%;float:left!important}.single-post .announcement-banner-image,.single-post .return-to-timeline,.single-post .timeline-express-single-page-announcement-date{display:none} \ No newline at end of file diff --git a/js/script.timeline-express.js b/js/script.timeline-express.js index a35ef71..bbb4b12 100644 --- a/js/script.timeline-express.js +++ b/js/script.timeline-express.js @@ -39,16 +39,16 @@ jQuery(document).ready(function(){ // medium content width (twenty thirteen) if ( width <= 822 && ( entry_content_width.replace( 'px' , '' ) <= '475' && entry_content_width.replace( 'px' , '' ) <= '800' ) ) { - jQuery( '.cd-timeline-content' ).removeClass( 'timeline-width34' ); + jQuery( '.cd-timeline-content' ).removeClass( 'timeline-width65' ); } else if ( width >= 822 && ( entry_content_width.replace( 'px' , '' ) >= '475' && entry_content_width.replace( 'px' , '' ) <= '800' ) ) { - jQuery( '.cd-timeline-content' ).addClass( 'timeline-width34' ); + jQuery( '.cd-timeline-content' ).addClass( 'timeline-width65' ); } // narrow content widths (twenty fourteen) if ( width <= 822 && entry_content_width.replace( 'px' , '' ) <= '475' ) { - jQuery( '.cd-timeline-content' ).removeClass( 'timeline-width30' ); + jQuery( '.cd-timeline-content' ).removeClass( 'timeline-width60' ); } else if ( width >= 822 && entry_content_width.replace( 'px' , '' ) <= '475' ) { - jQuery( '.cd-timeline-content' ).addClass( 'timeline-width30' ); + jQuery( '.cd-timeline-content' ).addClass( 'timeline-width60' ); } // if the content is narrow (twenty thirteen) @@ -64,7 +64,7 @@ jQuery(document).ready(function(){ var timeline_content_width = jQuery( '.cd-timeline-content' ).css('width'); if ( width >= '822' && entry_content_width.replace( 'px' , '' ) <= '475' ) { - jQuery( '.cd-timeline-content' ).addClass( 'timeline-width30' ); + jQuery( '.cd-timeline-content' ).addClass( 'timeline-width60' ); } if ( width >= '822' && timeline_content_width.replace( 'px' , '' ) < 262 ) { @@ -76,7 +76,7 @@ jQuery(document).ready(function(){ if ( ( width < '822' ) ) { jQuery( '#cd-timeline' ).masonry('reload'); - jQuery( '.cd-timeline-content' ).removeClass( 'timeline-width30' ).removeClass( 'timeline-width34' ); + jQuery( '.cd-timeline-content' ).removeClass( 'timeline-width60' ).removeClass( 'timeline-width65' ); } diff --git a/js/script.timeline-express.min.js b/js/script.timeline-express.min.js index 3ca50cf..88feaa1 100644 --- a/js/script.timeline-express.min.js +++ b/js/script.timeline-express.min.js @@ -1,2 +1,2 @@ /* Timeline Express by Evan Herman - http://www.Evan-Herman.com */ -jQuery(document).ready(function(){jQuery("html").addClass("cssanimations csscolumns cssgradients cssreflections csstransforms csstransforms3d csstransitions");var e=jQuery(".cd-timeline-block");e.each(function(){if(jQuery(this).offset().top>jQuery(window).scrollTop()+jQuery(window).height()*.75){jQuery(this).find(".cd-timeline-img, .cd-timeline-content").addClass("is-hidden")}});jQuery(window).on("scroll",function(){e.each(function(){if(jQuery(this).offset().top<=jQuery(window).scrollTop()+jQuery(window).height()*.75&&jQuery(this).find(".cd-timeline-img").hasClass("is-hidden")){jQuery(this).find(".cd-timeline-img, .cd-timeline-content").removeClass("is-hidden").addClass("bounce-in")}})});var t=jQuery("#cd-timeline");t.imagesLoaded(function(){t.masonry({itemSelector:".cd-timeline-block"});jQuery("#cd-timeline").fadeTo(600,1)});var n=jQuery("#cd-timeline").parents("div").css("width");var r=jQuery(window).width()+parseInt(17);var i=jQuery(".cd-timeline-content").css("width");if(r<=822&&n.replace("px","")<="475"&&n.replace("px","")<="800"){jQuery(".cd-timeline-content").removeClass("timeline-width34")}else if(r>=822&&n.replace("px","")>="475"&&n.replace("px","")<="800"){jQuery(".cd-timeline-content").addClass("timeline-width34")}if(r<=822&&n.replace("px","")<="475"){jQuery(".cd-timeline-content").removeClass("timeline-width30")}else if(r>=822&&n.replace("px","")<="475"){jQuery(".cd-timeline-content").addClass("timeline-width30")}if(i.replace("px","")<262){jQuery(".cd-timeline-content").find(".timeline-date").addClass("timeline-date-left")}jQuery(window).resize(function(){var e=jQuery(window).width()+parseInt(17);var t=jQuery("#cd-timeline").parents("div").css("width");var n=jQuery(".cd-timeline-content").css("width");if(e>="822"&&t.replace("px","")<="475"){jQuery(".cd-timeline-content").addClass("timeline-width30")}if(e>="822"&&n.replace("px","")<262){jQuery(".cd-timeline-content").find(".timeline-date").addClass("timeline-date-left")}else{jQuery(".cd-timeline-content").find(".timeline-date").removeClass("timeline-date-left")}if(e<"822"){jQuery("#cd-timeline").masonry("reload");jQuery(".cd-timeline-content").removeClass("timeline-width30").removeClass("timeline-width34")}})}) \ No newline at end of file +jQuery(document).ready(function(){jQuery("html").addClass("cssanimations csscolumns cssgradients cssreflections csstransforms csstransforms3d csstransitions");var e=jQuery(".cd-timeline-block");e.each(function(){jQuery(this).offset().top>jQuery(window).scrollTop()+.75*jQuery(window).height()&&jQuery(this).find(".cd-timeline-img, .cd-timeline-content").addClass("is-hidden")}),jQuery(window).on("scroll",function(){e.each(function(){jQuery(this).offset().top<=jQuery(window).scrollTop()+.75*jQuery(window).height()&&jQuery(this).find(".cd-timeline-img").hasClass("is-hidden")&&jQuery(this).find(".cd-timeline-img, .cd-timeline-content").removeClass("is-hidden").addClass("bounce-in")})});var i=jQuery("#cd-timeline");i.imagesLoaded(function(){i.masonry({itemSelector:".cd-timeline-block"}),jQuery("#cd-timeline").fadeTo(600,1)});var t=jQuery("#cd-timeline").parents("div").css("width"),n=jQuery(window).width()+parseInt(17),d=jQuery(".cd-timeline-content").css("width");822>=n&&t.replace("px","")<="475"&&t.replace("px","")<="800"?jQuery(".cd-timeline-content").removeClass("timeline-width65"):n>=822&&t.replace("px","")>="475"&&t.replace("px","")<="800"&&jQuery(".cd-timeline-content").addClass("timeline-width65"),822>=n&&t.replace("px","")<="475"?jQuery(".cd-timeline-content").removeClass("timeline-width60"):n>=822&&t.replace("px","")<="475"&&jQuery(".cd-timeline-content").addClass("timeline-width60"),d.replace("px","")<262&&jQuery(".cd-timeline-content").find(".timeline-date").addClass("timeline-date-left"),jQuery(window).resize(function(){var e=jQuery(window).width()+parseInt(17),i=jQuery("#cd-timeline").parents("div").css("width"),t=jQuery(".cd-timeline-content").css("width");e>="822"&&i.replace("px","")<="475"&&jQuery(".cd-timeline-content").addClass("timeline-width60"),e>="822"&&t.replace("px","")<262?jQuery(".cd-timeline-content").find(".timeline-date").addClass("timeline-date-left"):jQuery(".cd-timeline-content").find(".timeline-date").removeClass("timeline-date-left"),"822">e&&(jQuery("#cd-timeline").masonry("reload"),jQuery(".cd-timeline-content").removeClass("timeline-width60").removeClass("timeline-width65"))})}); \ No newline at end of file diff --git a/readme.txt b/readme.txt index 30a7d96..3f8fed2 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Donate link: http://www.evan-herman.com/contact/?contact-reason=I%20want%20to%20 Tags: vertical, timeline, animated, css3, animations, evan, herman, evan herman, easy, time, line, font awesome, font, awesome, announcements, notifications, simple, events, calendar, scroll, triggered, scrolling, animated, fade, in, fade in Requires at least: 3.9 Tested up to: 4.1.1 -Stable tag: 1.1.6.4 +Stable tag: 1.1.6.5 License: GPLv2 or later Timeline express allows you to create a beautiful vertical animated and responsive timeline of posts , without writing a single line of code. Sweet! @@ -40,7 +40,7 @@ Timeline express comes ready for translation. I would love to get things transla * Portuguese (pt_BR) - thanks goes to Gustavo Magalhães * Polish (pl_PL) - thanks goes to Kanios * German (de_DE) - thanks goes to Martin Gerlach -* French (fr_FR) - thanks goes to Julien Lambert +* French (fr_FR) - thanks goes to Julien Lambert We're always looking for polyglots to help with the translations. If you enjoy this plugin, speak multiple languages and want to contribute please contact me about how you can help translate things so users around the world can benefit from this plugin. @@ -301,8 +301,11 @@ add_filter( 'timeline_express_custom_template' , 'custom_timeline_express_templa == Changelog == += 1.1.6.5 - March 31st, 2015 = +* Enhancement: re-wrote part of the CSS file, to allow for native masonry layouts (uniform spacing between containers) + = 1.1.6.4 - March 23rd, 2015 = -* Enhancement: Packaged French translation - thanks goes to Julien Lambert +* Enhancement: Packaged French translation - thanks goes to Julien Lambert * Enhancement: Fixed a few typos in the plugin = 1.1.6.3 - March 22nd, 2015 = @@ -439,8 +442,12 @@ add_filter( 'timeline_express_custom_template' , 'custom_timeline_express_templa == Upgrade Notice == += 1.1.6.5 - March 31st, 2015 = +* Enhancement: re-wrote part of the CSS file, to allow for native masonry layouts (uniform spacing between containers) + = 1.1.6.4 - March 23rd, 2015 = -* Enhancement: Packaged French translation - thanks goes to Julien Lambert +* Enhancement: Packaged French translation - thanks goes to Julien Lambert +* Enhancement: Fixed a few typos in the plugin = 1.1.6.3 - March 22nd, 2015 = * Enhancement: Added wp_error class to catch errors thrown by `wp_remote_get()` when building the bootstrap dropdown. diff --git a/timeline-express.php b/timeline-express.php index 89d62c1..53bb551 100644 --- a/timeline-express.php +++ b/timeline-express.php @@ -4,7 +4,7 @@ Plugin Name: Timeline Express Plugin URI: http://www.evan-herman.com Description: Create a beautiful vertical, CSS3 animated and responsive timeline in minutes flat without writing code. -Version: 1.1.6.4 +Version: 1.1.6.5 Author: Evan Herman Author URI: http://www.evan-herman.com License: GPL2 @@ -28,7 +28,7 @@ #_________________________________________________ CONSTANTS /** Configuration **/ -if(!defined('TIMELINE_EXPRESS_VERSION_CURRENT')) define('TIMELINE_EXPRESS_VERSION_CURRENT', '1.1.6.4'); +if(!defined('TIMELINE_EXPRESS_VERSION_CURRENT')) define('TIMELINE_EXPRESS_VERSION_CURRENT', '1.1.6.5'); if(!defined('TIMELINE_EXPRESS_PATH')) define('TIMELINE_EXPRESS_PATH', plugin_dir_path( __FILE__ )); if(!defined('TIMELINE_EXPRESS_URL')) define('TIMELINE_EXPRESS_URL', plugins_url('timeline-express/')); if(!defined('TIMELINE_EXPRESS_URL_WP')) define('TIMELINE_EXPRESS_URL_WP', get_bloginfo('url'));