Merge pull request #22 from MachoThemes/master

V 1.2.2 update

.jshintrc

@@ -15,10 +15,12 @@
   "unused": false,
   "browser": true,
   "globals": {
+    "tinymce": false,
+    "$": false,
     "jQuery": false,
     "wp": false,
     "shapelyCompanion": false,
-    "wpNavMenu" : false,
-    "Masonry" : false
+    "wpNavMenu": false,
+    "Masonry": false
   }
 }

.travis.yml

@@ -1,10 +1,9 @@
 sudo: false
 language: php
-dist: precise
+dist: trusty
 matrix:
   fast_finish: true
   include:
-  - php: '5.3'
   - php: '5.4'
   - php: '5.5'
   - php: '5.6'

assets/css/admin.css

@@ -1,42 +1,51 @@
 .shapely-media-control img {
-    width: 100%;
-    height: auto;
+	width: 100%;
+	height: auto;
 }
 
 .logo_heading {
-    display: block;
-    width: 100%;
+	display: block;
+	width: 100%;
 }
 
 #setting-error-tgmpa.notice {
-    display: block;
+	display: block;
 }
 
 .client-sortable .logo_heading {
-    background: #f3f3f3;
-    border: 1px dotted;
-    cursor: move;
-    display: block;
-    font-size: 14px;
-    padding: 8px 0;
-    text-align: center;
-    width: 100%;
+	background: #f3f3f3;
+	border: 1px dotted;
+	cursor: move;
+	display: block;
+	font-size: 14px;
+	padding: 8px 0;
+	text-align: center;
+	width: 100%;
 }
 
 .client-sortable .logo_heading:hover {
-    border: 1px solid;
+	border: 1px solid;
 }
 
 .client-sortable .cloneya a.clone,
 .client-sortable .cloneya a.delete {
-    display: none;
+	display: none;
 }
 
 .client-sortable .cloneya:last-child a.clone,
 .client-sortable .cloneya:last-child a.delete {
-    display: inline-block;
+	display: inline-block;
 }
 
 .shapely-media-control img {
-    width: 100%;
+	width: 100%;
+}
+
+.shapely-editor-container label {
+	position: relative;
+	top: 30px;
+}
+
+.checkbox_switch {
+	margin: 10px auto;
 }

assets/js/previewer.js

@@ -1,12 +1,15 @@
 (function( $ ) {// jscs:ignore validateLineBreaks
-	$( document ).ready(function() {
+
+	'use strict';
+
+	$( document ).ready( function() {
 		if ( 'undefined' === typeof wp || ! wp.customize || ! wp.customize.selectiveRefresh ) {
 			return;
 		}
 
 		wp.customize.selectiveRefresh.bind( 'widget-updated', function( placement ) {
-            var maxHeight, container, msnry, element;
-			$( '.logo-carousel' ).flexslider({
+			var maxHeight, container, msnry, element;
+			$( '.logo-carousel' ).flexslider( {
 				minItems: 1,
 				maxItems: 4,
 				move: 1,
@@ -17,53 +20,55 @@
 				slideshowSpeed: 3000,
 				directionNav: false,
 				controlNav: false
-			});
+			} );
 
 			if ( 'function' === typeof $( '.parallax-window' ).parallax ) {
 				$( '.parallax-window' ).parallax();
 			}
+
 			if ( $( '.masonry' ).length && 'undefined' !== typeof Masonry ) {
 				container = document.querySelector( '.masonry' );
 				msnry = new Masonry( container, {
 					itemSelector: '.masonry-item'
-				});
+				} );
 				maxHeight = -1;
 				msnry.on( 'layoutComplete', function() {
 					var element = jQuery( msnry.element ),
-							cols = element.find( '.masonry-item img' );
+						cols = element.find( '.masonry-item img' );
 					jQuery.each( cols, function() {
 						if ( parseInt( jQuery( this ).attr( 'height' ), 10 ) > maxHeight ) {
 							maxHeight = parseInt( jQuery( this ).attr( 'height' ), 10 );
 						}
-					});
+					} );
 
-				});
+				} );
 
 				msnry.layout();
 				element = jQuery( msnry.element );
 
 				jQuery( element ).css( 'height', maxHeight + 'px' );
 			}
 
-            if ( 0 !== jQuery( '.testimonial-section' ).length ) {
+			if ( 0 !== jQuery( '.testimonial-section' ).length ) {
 				testimonialHeight();
-				setTimeout(function() {
+				setTimeout( function() {
 					testimonialHeight();
 				}, 3000 );
 			}
 
-			$( '.slider-arrow-controls' ).flexslider({
+			$( '.slider-arrow-controls' ).flexslider( {
 				controlNav: false
-			});
+			} );
+
 			/*
 			 * Resetting testimonial parallax height
 			 */
 			function testimonialHeight() {
-			    var testimonialHeight = jQuery( '.testimonial-section .parallax-window .container' ).outerHeight() + 150;
+				var testimonialHeight = jQuery( '.testimonial-section .parallax-window .container' ).outerHeight() + 150;
 				jQuery( '.testimonial-section .parallax-window' ).css( 'height', testimonialHeight );
 				jQuery( window ).trigger( 'resize' ).trigger( 'scroll' );
 			}
-		});
-	});
+		} );
+	} );
 
 })( jQuery );