release v1.1.6.5

EvanHerman · Mar 31, 2015 · 019fc87 · 019fc87
1 parent c984819
commit 019fc87
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
diff --git 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 <a href="http://toborino.com" target="_blank">Gustavo Magalhães</a>
 * Polish (pl_PL) - thanks goes to Kanios
 * German (de_DE) - thanks goes to <a href="http://www.fairsoft.koeln" target="_blank">Martin Gerlach</a>
-* French (fr_FR) - thanks goes to Julien Lambert
+* French (fr_FR) - thanks goes to <a href="http://troisplus-et-aeliin-cosplay.fr/" target=_blank">Julien Lambert</a>
 
 <em>We're always looking for polyglots to help with the translations. If you enjoy this plugin, speak multiple languages and want to contribute please <a href="http://www.evan-herman.com/contact/" target="_blank">contact me</a> about how you can help translate things so users around the world can benefit from this plugin.</em>
 
@@ -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 <a href="http://troisplus-et-aeliin-cosplay.fr/" target=_blank">Julien Lambert</a>
 * 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 <a href="http://troisplus-et-aeliin-cosplay.fr/" target=_blank">Julien Lambert</a>
+* 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
@@ -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'));