Merge branch 'jem08002-master'

functions.php

@@ -30,6 +30,7 @@ function huskypress_page_menu_args( $args ) {
 }
 add_filter( 'wp_page_menu_args', 'huskypress_page_menu_args' );
 
+
 if(!function_exists('is_parent_private')){
 	function is_parent_private($id){
 		$page = get_post($id);
@@ -190,7 +191,6 @@ function hale_page_menu_args( $args ) {
 
 function hale_enqueue_scripts() {
 	wp_enqueue_script('bootstrap-min', network_home_url().'wp-content/global/bootstrap-2.3.1/js/bootstrap.min.js', array('jquery'));
-	//wp_enqueue_script('uc-modernizr', get_bloginfo('template_url').'/js/uc-modernizr.js', array('jquery'));
 	wp_enqueue_script('uc-hale-custom', get_bloginfo('template_url').'/js/custom.js', array('jquery'));
 
 	$outboundtracking = get_option( 'outbound_tracking','');
@@ -439,6 +439,7 @@ function search_menu_item($items, $args){
 if(!class_exists('Bootstrap_Nav_Walker')) {
 	class Bootstrap_Nav_Walker extends Walker_Nav_Menu {     
 		/*This was taken from 320press WP-Bootstrap theme. No licensing restriction given, and it said it was free. */
+
 		/* Skip private pages
 		 */ 
 		function skip( $item ) {
@@ -453,6 +454,7 @@ function skip( $item ) {
 				return false;
 			}
 		}
+
 		/* Start of the <ul> 
 		 * 
 		 * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu".  
@@ -497,7 +499,9 @@ function end_lvl(&$output, $depth)
 		function start_el(&$output, $item, $depth, $args)  
 		{    
 			global $wp_query; 
+
     		if ( $this->skip( $item ) ) return;
+
 			$indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; 
 			$class_names = $value = ''; 
 			$classes = empty( $item->classes ) ? array() : (array) $item->classes; 

style.css

@@ -1606,7 +1606,7 @@ video {
 			min-height: 100% !important;
 			min-width: 100% !important;
 			}
-
+/* Flexible Posts */ 
 
 * html .widget.widget_dpe_fp_widget .dpe-flexible-posts li a{ 
 		height:1%
@@ -1615,37 +1615,39 @@ video {
 	padding:0px;
 	}
 	.widget.widget_dpe_fp_widget ul{
-		padding:10px 0px;	
+		padding: 0px 5px 0px 0px;
+		margin:10px 10px 10px 10px;
 	}
 	.widget.widget_dpe_fp_widget li{
-		padding: 8px 0px 8px 0px;
+		padding: 0px;
+		margin: 10px 0px;
 		display:block;
 		box-shadow:none;
 	}
 		.widget.widget_dpe_fp_widget li a{
-			margin:0;
+			margin:0px;
 			position:relative;
 			display:inline-block;
+			width:100%;
 		}
 			.widget.widget_dpe_fp_widget li a .attachment-thumbnail{
 				height: 60px;
 				width: 60px;
-				margin-right:10px;
-				margin-bottom:10px;
+				margin-right: 10px;
 				float:left;
 			}
 			.widget.widget_dpe_fp_widget li a .attachment-medium{
 				width:48%;
-				margin-right:10px;
-				margin-bottom:10px;
+				margin-right: 10px;
 				float:left;
 			}
 			.widget.widget_dpe_fp_widget li a .attachment-large{
 				max-width:100%;
-				margin-right:10px;
-				margin-bottom:10px;
+				margin-bottom: 10px;
 				float:left;
 				clear:right;
+				display:block;
+				border:2px solid black;
 			}
 			.widget.widget_dpe_fp_widget li a .title{
 				display:block;
@@ -1823,7 +1825,6 @@ video {
 				}
 				.uup-name {
 					font-weight:bold;
-					display:block;
 					padding-top:0px;
 					padding-bottom:5px;
 					}
@@ -1914,6 +1915,11 @@ video {
 div.uc-cal.uc-listcal.list-view.hidden-desktop ul.uc-cal-list {
 list-style: none;
 margin: 0;
+}
+#events-toolbar { 
+	margin-left:0;
+	margin-bottom:12px;
+
 }
 #events-grid-wrap{
 	width: 100%;