From dbaea9f2b7a4974e8e1cf10bb8618202dc8ecaf8 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 4 Feb 2016 17:18:17 -0500 Subject: [PATCH] More work with three columns firefox chrome --- functions.php | 2 +- js/app.js | 30 +++++++++++++++--------------- js/custom/pageSetup.js | 30 +++++++++++++++--------------- style.css | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/functions.php b/functions.php index da7a84b..09dc77d 100644 --- a/functions.php +++ b/functions.php @@ -62,7 +62,7 @@ function glm_site_scripts() 'glm_foundation', get_template_directory_uri() . '/js/app.js', 'jquery', - '1.0.14', + '1.0.15', true ); wp_enqueue_script('jquery-ui-datepicker'); diff --git a/js/app.js b/js/app.js index e4f6640..b687d16 100644 --- a/js/app.js +++ b/js/app.js @@ -60,23 +60,23 @@ $(document).ready(function () { // adjusting nav menu columns and li width $menu1 - .css("max-height", "260px"); - //.css("-webkit-columns", "3") - //.css("-webkit-column-gap", "11px") - //.css("-moz-columns", "3") - //.css("-moz-column-gap", "11px") - //.css("column", "3") + .css("max-height", "290px") + .css("-webkit-columns", "3") + .css("-webkit-column-gap", "11px") + .css("-moz-columns", "3") + .css("-moz-column-gap", "11px") + .css("column", "3") //.css("column-width", "300px") - //.css("column-gap", "11px"); - //if ( !$.browser.msie ) { - //$menu1 - //.css("column-count", "3") - //.children("li.menu-item") + .css("column-gap", "11px"); + if ( !$.browser.msie ) { + $menu1 + .css("column-count", "3") + .children("li.menu-item"); //.css("width", "300px"); - //} else { - //$menu1 - //.css("column-count", "3"); - //} + } else { + $menu1 + .css("column-count", "3"); + } $menu2 .css("columns", "2") .css("column-count", "2") diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js index 5e6390f..81e0a06 100644 --- a/js/custom/pageSetup.js +++ b/js/custom/pageSetup.js @@ -51,23 +51,23 @@ $(document).ready(function () { // adjusting nav menu columns and li width $menu1 - .css("max-height", "260px"); - //.css("-webkit-columns", "3") - //.css("-webkit-column-gap", "11px") - //.css("-moz-columns", "3") - //.css("-moz-column-gap", "11px") - //.css("column", "3") + .css("max-height", "290px") + .css("-webkit-columns", "3") + .css("-webkit-column-gap", "11px") + .css("-moz-columns", "3") + .css("-moz-column-gap", "11px") + .css("column", "3") //.css("column-width", "300px") - //.css("column-gap", "11px"); - //if ( !$.browser.msie ) { - //$menu1 - //.css("column-count", "3") - //.children("li.menu-item") + .css("column-gap", "11px"); + if ( !$.browser.msie ) { + $menu1 + .css("column-count", "3") + .children("li.menu-item"); //.css("width", "300px"); - //} else { - //$menu1 - //.css("column-count", "3"); - //} + } else { + $menu1 + .css("column-count", "3"); + } $menu2 .css("columns", "2") .css("column-count", "2") diff --git a/style.css b/style.css index c25affc..8babb9c 100644 --- a/style.css +++ b/style.css @@ -3,5 +3,5 @@ Theme Name: OtsegoCounty Author: Gaslight Media Author URI: http://www.gaslightmedia.com Description: A theme for OtsegoCounty -Version: 1.0.14 +Version: 1.0.15 */ -- 2.17.1