diff --git a/footer.php b/footer.php
index 4f37ceb..c08955a 100755
--- a/footer.php
+++ b/footer.php
@@ -9,66 +9,68 @@
?>
-
-
+
diff --git a/inc/reg-sidebars.php b/inc/reg-sidebars.php
index 169f1f4..80191e5 100644
--- a/inc/reg-sidebars.php
+++ b/inc/reg-sidebars.php
@@ -17,63 +17,11 @@
'before_title' => '
'
));
- register_sidebar(array(
- 'name' => 'Home1',
- 'id' => 'home1',
- 'before_title' => '
',
- ));
- register_sidebar(array(
- 'name' => 'Home2',
- 'id' => 'home2',
- 'before_widget' => '
',
- 'after_widget' => '
',
- 'before_title' => '
',
- ));
- register_sidebar(array(
- 'name' => 'Home3',
- 'id' => 'home3',
- 'before_widget' => '
',
- 'after_widget' => '
',
- 'before_title' => '
',
- ));
- register_sidebar(array(
- 'name' => 'Home4',
- 'id' => 'home4',
- 'before_widget' => '
',
- 'after_widget' => '
',
- 'before_title' => '
',
- ));
- register_sidebar(array(
- 'name' => 'Home5',
- 'id' => 'home5',
- 'before_widget' => '
',
- 'after_widget' => '
',
- 'before_title' => '
',
- ));
- register_sidebar(array(
- 'name' => 'Home6',
- 'id' => 'home6',
- 'before_widget' => '
',
- 'after_widget' => '
',
- 'before_title' => '
',
- ));
- register_sidebar(array(
- 'name' => 'Home7',
- 'id' => 'home7',
- 'before_widget' => '
',
- 'after_widget' => '
',
- 'before_title' => '
',
- ));
+
register_sidebar( array(
- 'name' => __( 'Mega Footer' ),
- 'id' => 'mega-footer',
+ 'name' => __( 'Mega Footer' ),
+ 'id' => 'mega-footer',
+ 'description' => 'Limited to 6 widgets. Will appear at the bottom of every page in the site.',
'before_widget' => '
',
'before_title' => '' && isset( $settings[ 'title' ] ) && empty( $settings[ 'title' ] ) ){
$params[0][ 'before_widget' ] .= '';
}
-
#Counts widgets in mega footer and adds column class accordingly
if( $params[0]['id'] == 'mega-footer' ){
if( is_multisite() ){
@@ -112,7 +57,6 @@ function check_sidebar_params( $params ) {
}
return $params;
}
-
function mf_remove_extra( $sidebars_widgets ){
$widgets = $sidebars_widgets['mega-footer'];
if( is_array($sidebars_widgets['mega-footer']) ){
@@ -125,5 +69,4 @@ function mf_remove_extra( $sidebars_widgets ){
return $sidebars_widgets;
}
add_filter( 'sidebars_widgets', 'mf_remove_extra' );
-
?>
\ No newline at end of file
diff --git a/js/cs.js b/js/cs.js
index 4a6d0ad..f433e44 100644
--- a/js/cs.js
+++ b/js/cs.js
@@ -23,41 +23,45 @@ jQuery(document).ready(function($) {
var ext = null
var flag = null
- if ((href.charAt(0) != '#' || href.charAt(0) != '?') && img == 0 ){
-
- var hrefExploded = href.split('/')
- base = hrefExploded[2]
-
- if (base != site) {
- //console.log('external link detected, adding icon...')
- // is external, and is not a named anchor tag
- var icon = '
'
- $(this).addClass('external').prepend(icon)
- }
-
- //console.log('checking to see if it might be a file...')
- last = hrefExploded[hrefExploded.length-1] || ''
- var lastExploded = last.split('.')
-
- if (lastExploded[1]){
- //console.log('ok, so there was a dot in the last value of the url.')
- $.each(extensions, function(index, value){
-
- if (value == lastExploded[1]){
- flag = $('
')
- //console.log('match!')
- ext = lastExploded[1]
- //console.log('ext:'+ext)
- flag.append('.'+ext)
- }
+ // if (((href.charAt(0) != '?') || (href.charAt(0) != '#')) && img == 0 ){
+ if (href.charAt(0) != '#' && img == 0){
+ if (href.charAt(0) != '/'){
+ var hrefExploded = href.split('/')
+ base = hrefExploded[2]
+
+ if (base != site) {
+ //console.log('external link detected, adding icon...')
+ // is external, and is not a named anchor tag
+ var icon = ''
+ $(this).addClass('external').prepend(icon)
+ }
+
+ //console.log('checking to see if it might be a file...')
+ last = hrefExploded[hrefExploded.length-1] || ''
+ var lastExploded = last.split('.')
+
+ if (lastExploded[1]){
+ //console.log('ok, so there was a dot in the last value of the url.')
+ $.each(extensions, function(index, value){
+
+ if (value == lastExploded[1]){
+ flag = $('')
+ //console.log('match!')
+ ext = lastExploded[1]
+ //console.log('ext:'+ext)
+ flag.append('.'+ext)
+ }
+
+ })
- })
+ //console.log('ext:'+ext)
+ }
+ if (flag != null){
+ $(this).append(flag)
+ }
- //console.log('ext:'+ext)
}
- if (flag != null){
- $(this).append(flag)
- }
+
}
})
@@ -162,7 +166,32 @@ 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')
+ }
+}
+window.onload = function (){
+ placeholderSupport = ("placeholder" in document.createElement("input"));
+ if(placeholderSupport!=false){
+ var d = document.getElementById("main");
+ d.classList.add("supports-placeholder");
+ }
+ stickyFoot();
+}
+
+window.onresize = function() {
+
+ stickyFoot();
+}
})
\ No newline at end of file
diff --git a/js/min/cs.min.js b/js/min/cs.min.js
index 12d5b62..e9d97a1 100644
--- a/js/min/cs.min.js
+++ b/js/min/cs.min.js
@@ -1 +1 @@
-jQuery(document).ready(function(a){function i(i){var t=a("");t.addClass("alert alert-danger accessibility-fail-msg"),t.width(i.width+"px");var l=a("
");l.addClass("glyphicon glyphicon-ban-circle");var n=a("");n.append(' This image needs a valid Alt tag. '),t.append(l).append(n),a(i).after(t)}var t=location.href,l=t.split("/"),n=l[2],s=["3g2","3gp","avi","doc","docx","dotx","gif","jpg","jpeg","m4a","mid","midi","mov","mp3","mp4","mpg","odt","ogg","ogv","pdf","png","ppt","pptx","xls","xlsx","wav","wmv","zip","vsd"];a("#page a").each(function(){var i=a(this).attr("href").toLowerCase(),t=a(this).children("img").length,l=null,e=null,p=null,d=null;if(("#"!=i.charAt(0)||"?"!=i.charAt(0))&&0==t){var c=i.split("/");if(l=c[2],l!=n){var h='';a(this).addClass("external").prepend(h)}e=c[c.length-1]||"";var g=e.split(".");g[1]&&a.each(s,function(i,t){t==g[1]&&(d=a(''),p=g[1],d.append("."+p))}),null!=d&&a(this).append(d)}}),a("#page img").each(function(){alt=a(this).attr("alt"),alt?(alt=alt.toLowerCase(),(alt.indexOf(".jpg")>=0||alt.indexOf(".png")>=0||alt.indexOf(".gif")>=0)&&(a(this).addClass("accessibility-fail"),i(this))):(a(this).addClass("accessibility-fail"),i(this))}),a("#page table").each(function(){a(this).addClass("table")})});
\ No newline at end of file
+jQuery(document).ready(function(a){function t(t){var e=a("");e.addClass("alert alert-danger accessibility-fail-msg"),e.width(t.width+"px");var i=a("
");i.addClass("glyphicon glyphicon-ban-circle");var n=a("");n.append(' This image needs a valid Alt tag. '),e.append(i).append(n),a(t).after(e)}function e(){var t=document.getElementById("page").clientHeight,e=document.getElementById("footers").clientHeight,i=t+e,n=window.innerHeight;n>=i?a("body").addClass("sticky"):a("body").removeClass("sticky")}var i=location.href,n=i.split("/"),l=n[2],s=["3g2","3gp","avi","doc","docx","dotx","gif","jpg","jpeg","m4a","mid","midi","mov","mp3","mp4","mpg","odt","ogg","ogv","pdf","png","ppt","pptx","xls","xlsx","wav","wmv","zip","vsd"];a("#page a").each(function(){var t=a(this).attr("href").toLowerCase(),e=a(this).children("img").length,i=null,n=null,d=null,p=null;if("#"!=t.charAt(0)&&0==e&&"/"!=t.charAt(0)){var o=t.split("/");if(i=o[2],i!=l){var c='';a(this).addClass("external").prepend(c)}n=o[o.length-1]||"";var r=n.split(".");r[1]&&a.each(s,function(t,e){e==r[1]&&(p=a(''),d=r[1],p.append("."+d))}),null!=p&&a(this).append(p)}}),a("#page img").each(function(){alt=a(this).attr("alt"),alt?(alt=alt.toLowerCase(),(alt.indexOf(".jpg")>=0||alt.indexOf(".png")>=0||alt.indexOf(".gif")>=0)&&(a(this).addClass("accessibility-fail"),t(this))):(a(this).addClass("accessibility-fail"),t(this))}),a("#page table").each(function(){a(this).addClass("table")}),window.onload=function(){if(placeholderSupport="placeholder"in document.createElement("input"),0!=placeholderSupport){var a=document.getElementById("main");a.classList.add("supports-placeholder")}e()},window.onresize=function(){e()}});
\ No newline at end of file
diff --git a/mega-footer.php b/mega-footer.php
index 27393ff..ec4d4e4 100644
--- a/mega-footer.php
+++ b/mega-footer.php
@@ -1,3 +1,7 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/style.css b/style.css
index 719206f..bb61e78 100755
--- a/style.css
+++ b/style.css
@@ -130,10 +130,6 @@ Text Domain: cs
max-width: 100%;
}
-#footer .glyphicon {
- display: none;
-}
-
img {
height: auto;
max-width: 100%;
@@ -172,6 +168,10 @@ img {
/* NAV
--------------------------------------------------------------*/
+.navbar-collapse {
+ max-height: none;
+}
+
/*
#primary-nav {
background-color: #ccc;
@@ -231,8 +231,25 @@ img {
padding: 1em;
}
+#footers {
+ margin-top: 1.5em;
+}
+
+body.sticky #footers {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+}
+
+#mega-footer {
+ background-color: black;
+}
+
#footer {
- margin: 1.5em 0;
+ padding: 1.5em 0;
+ background-color: black;
+ color: #666;
}
#footer ul {
@@ -248,6 +265,10 @@ img {
margin-right: 0;
}
+#footer .glyphicon {
+ display: none;
+}
+
code {
white-space: normal;
}
@@ -341,6 +362,10 @@ code {
list-style-type: none;
}
+.comment-list ol {
+ list-style-type: none;
+}
+
.comment {
padding: 1em;
border-top: 1px solid #ccc;
diff --git a/style.scss b/style.scss
index f601900..b08287d 100644
--- a/style.scss
+++ b/style.scss
@@ -147,10 +147,6 @@ url('../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf') for
-#footer .glyphicon {
- display:none;
-}
-
@@ -213,6 +209,11 @@ img {
/* NAV
--------------------------------------------------------------*/
+
+.navbar-collapse {
+ max-height:none;
+ }
+
/*
#primary-nav {
background-color: #ccc;
@@ -282,19 +283,38 @@ img {
-#footer {
- margin:1.5em 0;
+#footers {
+ margin-top:1.5em;
}
- #footer ul {
- padding:0;
+ body.sticky #footers {
+ position:absolute;
+ bottom:0;
+ left:0;
+ width:100%;
}
- #footer li {
- display:inline;
- margin-right:1em;
+
+ #mega-footer {
+ background-color:black;
+ }
+
+ #footer {
+ padding:1.5em 0;
+ background-color:black;
+ color:#666;
+ }
+ #footer ul {
+ padding:0;
}
- #footer li:last-child {
- margin-right:0;
+ #footer li {
+ display:inline;
+ margin-right:1em;
}
+ #footer li:last-child {
+ margin-right:0;
+ }
+ #footer .glyphicon {
+ display:none;
+ }
@@ -421,6 +441,9 @@ code {
padding:0;
list-style-type:none;
}
+ .comment-list ol {
+ list-style-type:none;
+ }
.comment {
padding:$contentPadding;