update

footer.php

@@ -7,7 +7,7 @@
  * @package cornerstone
  */
 ?>
-	</div><!-- #page -->
+
 	</div><!-- .container-->
 	</div><!-- #content -->
 	<div id="footers">
@@ -71,7 +71,7 @@
 				</ul>
 			</div>
 		</footer>
-	</div>
+	</div><!-- #footers -->
 </div><!-- #page -->
 
 <?php wp_footer(); ?>

functions.php

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?php
 /**
  * cornerstone functions and definitions

inc/reg-sidebars.php

@@ -148,7 +148,7 @@ function custom_searchform($form){
 	}
 	$search_counter++;
 
-	$form = '<div class="searchform"><form action="'.home_url( '/' ).'" method="get" class="form-inline" role="form"><div class="form-group"><fieldset>';
+	$form = '<div class="searchform"><form action="'.home_url( '/' ).'" method="get" class="form-inline" role="form"><div class="form-group"><fieldset><legend class="sr-only">Search this Site</legend>';
 		$form .= '<label for="searchfield-'.$search_counter.'" class="sr-only">Search in '.home_url( '/' ).'></label>';
 		$form .= '<input type="text" name="s" id="searchfield-'.$search_counter.'" value="'.get_search_query().'" class="form-control search" placeholder="Search '.get_bloginfo("name").'... " />';
 		$form .= '<button type="submit" class="btn btn-default" title="Search"><i class="glyphicon glyphicon-search"></i><span class="sr-only">Search</span></button>';

inc/submenu-check.php

@@ -33,5 +33,5 @@
 			<?php include('sidemenu-walker.php')?>
 		</nav>
 	</div>
-	<div class="col-sm-9">
+	<div class="col-sm-8 col-sm-offset-1">
 		<?php } /* end checkMenu */?>

js/admin-style.js

@@ -10,6 +10,4 @@ jQuery(document).ready(function($) {
 				$(this).css('display', 'none');
 			}
 		});		
-	}
-
-});
+	}

js/cs.js

@@ -215,16 +215,19 @@ jQuery(document).ready(function($) {
 
 function stickyFoot(){
 	/* Andrew's Sticky Footer JS. */
-	var wrapperH = document.getElementById('page').clientHeight;
-	var footerH = document.getElementById('footers').clientHeight
-
-	var comboH = wrapperH + footerH;
-	var windowH = window.innerHeight;
-	if(windowH>=comboH){
-		$('body').addClass('sticky')
-	} else {
-		$('body').removeClass('sticky')
+
+	if (document.getElementById('page')!=null && document.getElementById('footers') !=null){
+		var wrapperH = document.getElementById('page').clientHeight;
+		var footerH = document.getElementById('footers').clientHeight
+		var windowH = window.innerHeight;
+		if(windowH>=wrapperH){
+			$('body').addClass('sticky')
+		} else {
+			$('body').removeClass('sticky')
+		}
 	}
+
+
 }
 window.onload = function (){
 	placeholderSupport = ("placeholder" in document.createElement("input"));

js/navigation.js

@@ -1,8 +1,40 @@
 /**
  * navigation.js
  *
+ */ 
+
+jQuery(document).ready(function($) {
+
+	function replaceAnchors(selector) {
+		$(selector).each(function(){
+			var atag = $(this).children('a');
+			var newhref = getFirstLink(this);
+			atag.attr('href',newhref);
+		});
+	}
+	function getFirstLink(element){
+		var href = $(element).children('a').attr('href');
+		if(href == '#'){
+			var firstChild = $(element).children('ul').children('li').first();
+			if(firstChild.length == 0){
+				return href;
+			}
+			else {
+				return getFirstLink(firstChild);
+			}
+		}
+		else {
+			return href;
+		}
+	}
+
+	replaceAnchors('.menu-item-has-children');
+
+});
+
+/*
  * Handles toggling the navigation menu for small screens.
- */
+ *
 ( function() {
 	var container, button, menu;
 
@@ -32,3 +64,4 @@
 			container.className += ' toggled';
 	};
 } )();
+*/

page-home.php

@@ -9,32 +9,29 @@
 $rows = get_theme_mod('homepagerows');
 $count = 1;
 get_header(); ?>
+
 <div id="page-home">
 	<?php while ( have_posts() ) : the_post(); ?>
-
-				<?php for($i=0; $i<$rows; $i++){ /* Begin Homepage Builder... */?>
-					<div class="row">
-
-								<?php 
-									$widths = get_theme_mod('homepage_'.$i);
-									$widths = explode(',',$widths);
-									foreach($widths as $width){
-									if($width == 0) break; 
-								?>
-								<div class="col-sm-<?php echo $width; ?>">
-									<div class="home-section" id="home-section-<?php echo $count; ?>">
-									<?php if ( is_active_sidebar( 'home'.$count ) ) { ?>
-										<?php dynamic_sidebar( 'home'.$count ); ?>
-									<?php } else { ?>
-
-									<?php }; ?>	
-									</div>
-								</div>
-								<?php $count ++; } ?>
-
-					</div><!-- /row-->
-				<?php  } /* ... end Homepage Builder */?>
-
+	<?php for($i=0; $i<$rows; $i++){ /* Begin Homepage Builder... */?>
+	<div class="row">
+		<?php 
+			$widths = get_theme_mod('homepage_'.$i);
+			$widths = explode(',',$widths);
+			foreach($widths as $width){
+			if($width == 0) break; 
+		?>
+		<div class="col-sm-<?php echo $width; ?>">
+			<div class="home-section" id="home-section-<?php echo $count; ?>">
+				<?php if ( is_active_sidebar( 'home'.$count ) ) { ?>
+				<?php dynamic_sidebar( 'home'.$count ); ?>
+				<?php } else { ?>
+				<?php }; ?>
+			</div>
+		</div>
+		<?php $count ++; } ?>
+	</div>
+	<!-- /row-->
+	<?php  } /* ... end Homepage Builder */?>
 	<?php endwhile; // end of the loop. ?>
 </div>
 <?php get_footer(); ?>

page.php

@@ -14,7 +14,7 @@
 <?php include('inc/sidebar-check.php')?>
 <div id="page-page">
 	<?php while ( have_posts() ) : the_post(); ?>
-		<?php include('inc/submenu-check.php')?>
+		<?php include('inc/submenu-check.php') ?>
 			<div class="row">
 				<div class="col-sm-<?php echo (is_active_sidebar( $sidebar )?9:12); ?>">
 					<div id="primary" class="content-area">