Merge pull request #34 from MIGHTYminnow/fix/mobile-menu-jquery

Update jQuery to add +/- signs to mobile menu. Fixes #33.

includes/functions/theme-functions.php

@@ -195,7 +195,7 @@ function trestle_body_classes( $classes ) {
 	}
 
 	// Add logo class.
-	if ( trestle_get_option( 'logo_url' ) || trestle_get_option( 'logo_url_mobile' ) ) {
+	if ( trestle_get_option( 'logo_id' ) || trestle_get_option( 'logo_id_mobile' ) ) {
 		$classes[] = 'has-logo';
 	}
 
@@ -268,7 +268,7 @@ function trestle_do_logos( $title, $inside, $wrap ) {
 	}
 
 	if ( $logo_html ) {
-		$inside .= sprintf( '<a href="%s" title="%s">%s</a>',
+		$inside .= sprintf( '<a href="%s" title="%s" class="logos">%s</a>',
 			trailingslashit( home_url() ),
 			esc_attr( get_bloginfo( 'name' ) ),
 			$logo_html
@@ -418,3 +418,42 @@ function trestle_read_more_link( $default_text ) {
 		return $default_text;
 	}
 }
+
+
+/*===========================================
+ * Helper Functions
+===========================================*/
+
+/**
+ * Check if image has specified image size.
+ *
+ * @since 2.2.0
+ *
+ * @param int $image_id ID of image to check.
+ * @param string $image_size Slug of image size to check for.
+ *
+ * @return true|false Whether or not the image has the specified size generated.
+ */
+function trestle_image_has_size( $image_id, $image_size = null ) {
+
+	global $_wp_additional_image_sizes;
+
+	// Return with error if no image_size is specified.
+	if ( ! $image_size ) {
+		return new WP_Error( 'no_image_size_specified', __( 'Please specify an image size.', 'trestle' ) );
+	}
+
+	// Get the attributes for the specified image size.
+	$image_size_atts = $_wp_additional_image_sizes[ $image_size ];
+
+	// Get data for specified image ID and size.
+	$img_data = wp_get_attachment_image_src( $image_id, $image_size );
+
+	// Check if the dimensions match.
+	if ( $img_data[1] == $image_size_atts['width'] && $img_data[2] == $image_size_atts['height'] ) {
+		return true;
+	}
+
+	return false;
+
+}

style.css

@@ -151,6 +151,10 @@ body {
 	line-height: 1.625;
 }
 
+body.bubble {
+	background-color: #f5f5f5;
+}
+
 /* Used in the editor */
 body.mce-content-body {
 	width: auto;
@@ -158,10 +162,7 @@ body.mce-content-body {
 	float: none;
 	-webkit-font-smoothing: auto !important;
 	font-smoothing: auto !important;
-}
-
-body.bubble {
-	background-color: #f5f5f5;
+	background: #fff;
 }
 
 a,
@@ -868,6 +869,35 @@ img.alignright,
 	text-align: center;
 }
 
+/* Text meant only for screen readers. */
+.screen-reader-text {
+	clip: rect(1px, 1px, 1px, 1px);
+	position: absolute !important;
+	height: 1px;
+	width: 1px;
+	overflow: hidden;
+}
+
+.screen-reader-text:focus {
+	background-color: #f1f1f1;
+	border-radius: 3px;
+	box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6);
+	clip: auto !important;
+	color: #21759b;
+	display: block;
+	font-size: 14px;
+	font-size: 0.875rem;
+	font-weight: bold;
+	height: auto;
+	left: 5px;
+	line-height: normal;
+	padding: 15px 23px 14px;
+	text-decoration: none;
+	top: 5px;
+	width: auto;
+	z-index: 100000; /* Above WP toolbar. */
+}
+
 /* Genesis
 --------------------------------------------- */