diff --git a/inc/roots-actions.php b/inc/roots-actions.php index 021cbaf..24d67c3 100644 --- a/inc/roots-actions.php +++ b/inc/roots-actions.php @@ -1,7 +1,6 @@ \n"; - echo "\t"; - } -} - function roots_1140_head() { global $roots_options; $roots_css_framework = $roots_options['css_framework']; @@ -80,7 +67,7 @@ function roots_foundation_head() { $roots_css_framework = $roots_options['css_framework']; $template_uri = get_template_directory_uri(); if ($roots_css_framework === 'foundation') { - echo "\t\n"; + echo "\t\n"; echo "\t\n"; echo "\t\n"; echo "\t\n"; @@ -91,7 +78,7 @@ function roots_foundation_head() { echo "\t\n"; echo "\t\n"; + echo "\t\n"; } } @@ -99,35 +86,35 @@ function roots_bootstrap_head() { global $roots_options; $roots_css_framework = $roots_options['css_framework']; $roots_bootstrap_js = $roots_options['bootstrap_javascript']; - $roots_bootstrap_less_js = $roots_options['bootstrap_less_javascript']; + $roots_bootstrap_less_js = $roots_options['bootstrap_less_javascript']; $template_uri = get_template_directory_uri(); if ($roots_css_framework === 'bootstrap_less') { - echo "\t\n"; - } + echo "\t\n"; + } if ($roots_bootstrap_js === true) { $roots_options['bootstrap_less_javascript'] = false; - + echo "\t\n"; echo "\t\n"; - echo "\t\n"; + echo "\t\n"; echo "\t\n"; echo "\t\n"; echo "\t\n"; echo "\t\n"; - echo "\t\n"; + echo "\t\n"; } if ($roots_bootstrap_less_js === true) { $roots_options['bootstrap_javascript'] = false; - + echo "\t\n"; echo "\t\n"; - echo "\t\n"; + echo "\t\n"; echo "\t\n"; echo "\t\n"; echo "\t\n"; echo "\t\n"; - echo "\t\n"; - } + echo "\t\n"; + } } function roots_get_stylesheets() { @@ -169,8 +156,8 @@ function roots_get_stylesheets() { $styles .= stylesheet_link_tag('/foundation/orbit.css', 1); $styles .= stylesheet_link_tag('/foundation/reveal.css', 1); $styles .= stylesheet_link_tag('/foundation/mobile.css', 1); - $styles .= stylesheet_link_tag('/foundation/app.css', 1); - break; + $styles .= stylesheet_link_tag('/foundation/app.css', 1); + break; case 'less' : $styles .= stylesheet_link_tag('/less/less.css'); break; @@ -179,7 +166,7 @@ function roots_get_stylesheets() { break; case 'bootstrap_less' : $styles .= stylesheet_link_tag_boostrap_less('/bootstrap/lib/bootstrap.less'); - break; + break; } if (class_exists('RGForms')) { @@ -202,7 +189,7 @@ function roots_get_stylesheets() { break; case 'foundation' : $styles .= "\t\n"; - break; + break; } echo $styles; diff --git a/inc/roots-options.php b/inc/roots-options.php index 3f1a234..3883032 100644 --- a/inc/roots-options.php +++ b/inc/roots-options.php @@ -172,16 +172,15 @@ function roots_get_default_theme_options($default_framework = '') { if ($default_framework == '') { $default_framework = apply_filters('roots_default_css_framework', 'blueprint'); } $default_framework_settings = $roots_css_frameworks[$default_framework]; $default_theme_options = array( - 'css_framework' => $default_framework, - 'container_class' => $default_framework_settings['classes']['container'], - 'main_class' => $default_framework_settings['classes']['main'], - 'sidebar_class' => $default_framework_settings['classes']['sidebar'], - 'google_analytics_id' => '', - 'root_relative_urls' => true, - 'clean_menu' => true, - 'fout_b_gone' => false, - 'bootstrap_javascript' => false, - 'bootstrap_less_javascript' => false + 'css_framework' => $default_framework, + 'container_class' => $default_framework_settings['classes']['container'], + 'main_class' => $default_framework_settings['classes']['main'], + 'sidebar_class' => $default_framework_settings['classes']['sidebar'], + 'google_analytics_id' => '', + 'root_relative_urls' => true, + 'clean_menu' => true, + 'bootstrap_javascript' => false, + 'bootstrap_less_javascript' => false ); return apply_filters('roots_default_theme_options', $default_theme_options); @@ -298,17 +297,6 @@ function roots_theme_options_render_page() { - - -
- -
- - - @@ -362,16 +350,6 @@ function roots_theme_options_validate($input) { $output['clean_menu'] = $input['clean_menu']; } - if (isset($input['fout_b_gone'])) { - if ($input['fout_b_gone'] === 'yes') { - $input['fout_b_gone'] = true; - } - if ($input['fout_b_gone'] === 'no') { - $input['fout_b_gone'] = false; - } - $output['fout_b_gone'] = $input['fout_b_gone']; - } - if (isset($input['bootstrap_javascript'])) { if ($input['bootstrap_javascript'] === 'yes') { $input['bootstrap_javascript'] = true; diff --git a/js/libs/foutbgone.min.js b/js/libs/foutbgone.min.js deleted file mode 100644 index f94f76d..0000000 --- a/js/libs/foutbgone.min.js +++ /dev/null @@ -1,70 +0,0 @@ -/** - * WebINK's Fout-B-Gone is a single object that offers various methods for using and - * managing custom Web Fonts added to webpages through the @font-face CSS rule. - * - * Note: This is a work in progress and other useful font-related methods may be added in the future - * - * Current methods: - * - * fbg.hideFOUT -- automatically gets rid of undesirable flash-of-unstyled-text - * that occurs with some browsers, such as FF 3.6 and IE9 - * - * fbg.isFontFaceSupported -- returns true or false indicating if browser supports @font-face - * This is the code written by Diego Perini as reported by Paul Irish on - * 2010.11.02 at http://paulirish.com/2009/font-face-feature-detection - * We've included this check here in the form of a method for convenience; - * it is not necessary for other fbg methods. - * - * - * @author Jay Vilhena - * @version 0.1 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - */ -/***************************************************************************************/ -var fbg=new function() -{var self=this;var test_frequency=20;var giveup=3000;var latency=100;this.rfu=null;var init=null;var onWinLoad=null;this.hideFOUT=null;this.isFontFaceSupported=null;this.onFontFaceFailed=null;init=function() -{};onWinLoad=function(callback) -{if(window.addEventListener)addEventListener('load',callback,false);else attachEvent('onload',callback);};this.hideFOUT=function(when,delay) -{if(navigator.appName!='Microsoft Internet Explorer'&&!/Firefox\/3/.test(navigator.userAgent)) -return;delay=delay||latency;var fontnams=[];var fontruls=[];var selectrs=[];var iscompliant=true;for(var i=0;iFinal: '+spn.offsetWidth;},1000);});}};this.isFontFaceSupported=function() -{var -sheet,doc=document,head=doc.head||doc.getElementsByTagName('head')[0]||docElement,style=doc.createElement("style"),impl=doc.implementation||{hasFeature:function(){return false;}};style.type='text/css';head.insertBefore(style,head.firstChild);sheet=style.sheet||style.styleSheet;var supportAtRule=impl.hasFeature('CSS2','')?function(rule){if(!(sheet&&rule))return false;var result=false;try{sheet.insertRule(rule,0);result=!(/unknown/i).test(sheet.cssRules[0].cssText);sheet.deleteRule(sheet.cssRules.length-1);}catch(e){} -return result;}:function(rule){if(!(sheet&&rule))return false;sheet.cssText=rule;return sheet.cssText.length!==0&&!(/unknown/i).test(sheet.cssText)&&sheet.cssText.replace(/\r+|\n+/g,'').indexOf(rule.split(' ')[0])===0;};return supportAtRule('@font-face { font-family: "font"; src: "font.ttf"; }');};init();}(); \ No newline at end of file