From 32d744ca8bb1a0372e6ac298808f544d28ba0158 Mon Sep 17 00:00:00 2001
From: Mickey Kay <mickey@mickeykaycreative.com>
Date: Fri, 17 Jan 2014 13:30:51 -0800
Subject: [PATCH] Added support for custom jQuery in uploads folder. Edited nav
 extras button to maintain proper padding and alignment for dropdowns.

---
 lib/functions/theme-functions.php | 11 +++++++----
 style.css                         |  1 -
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/functions/theme-functions.php b/lib/functions/theme-functions.php
index 4f4c4e0..5cbd056 100644
--- a/lib/functions/theme-functions.php
+++ b/lib/functions/theme-functions.php
@@ -20,13 +20,16 @@
  */
 function trestle_header_actions() {
 	// Google fonts
-	wp_enqueue_style( 'trestle-google-fonts', '//fonts.googleapis.com/css?family=Lato:300,700,900' );
+	wp_enqueue_style( 'theme-google-fonts', '//fonts.googleapis.com/css?family=Lato:300,700,900' );
 
-	// Custom CSS if desired
+	// Custom CSS (if desired)
 	wp_enqueue_style( 'trestle-custom-css', '/wp-content/uploads/custom.css' );
 
-	// Custom jQuery
-	wp_enqueue_script( 'trestle-jquery', get_stylesheet_directory_uri() . '/lib/js/theme-jquery.js', array( 'jquery' ), '1.0.0', true );
+	// Theme jQuery
+	wp_enqueue_script( 'theme-jquery', get_stylesheet_directory_uri() . '/lib/js/theme-jquery.js', array( 'jquery' ), '1.0.0', true );
+
+	// Custom jQuery (if desired)
+	wp_enqueue_script( 'trestle-custom-jquery', '/wp-content/uploads/custom.js', array( 'jquery' ), '1.0.0', true );
 }
 
 
diff --git a/style.css b/style.css
index 4bfce11..0c845de 100644
--- a/style.css
+++ b/style.css
@@ -1252,7 +1252,6 @@ Site Navigation
 .nav-primary .genesis-nav-menu > .right > .button {
 	padding: 12px 18px;
 	color: #FFF;
-	vertical-align: middle;
 }