Skip to content
This repository has been archived by the owner. It is now read-only.

Search and mega footer #8

Merged
merged 3 commits into from
Aug 5, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</div><!-- .container-->
</div><!-- #content -->
<div id="footers">
<?php get_template_part('mega-footer'); ?>
<?php get_template_part( 'inc/mega', 'footer' ); ?>
<footer id="footer" class="site-footer" role="contentinfo">
<div class="container">
<ul id="uc-footer-links" class="clearfix">
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions inc/reg-sidebars.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ function custom_searchform($form){
$search_counter = 0;
}
$search_counter++;

$form = '<div class="searchform"><form action="/" method="get" class="form-inline" role="form"><div class="form-group"><fieldset>';
$form .= '<label for="search-'.$search_counter.'" class="sr-only">Search in '.home_url( '/' ).'></label>';
$form .= '<input type="text" name="s" id="search-'.$search_counter.'" value="'.the_search_query().'" class="form-control" placeholder="Search... " />';
$form = '<div class="searchform"><form action="'.home_url( '/' ).'" method="get" class="form-inline" role="form"><div class="form-group"><fieldset>';
$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>';
$form .= '</fieldset></div></form></div>';

Expand Down
9 changes: 5 additions & 4 deletions js/cs.js
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,12 @@ function stickyFoot(){
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')
var windowH = $(window).innerHeight();

if(windowH >= comboH){
$('body').addClass('sticky');
} else {
$('body').removeClass('sticky')
$('body').removeClass('sticky');
}
}
window.onload = function (){
Expand Down