Update to Bootstrap 3.0.0

This commit is contained in:
Ben Word
2013-08-19 18:46:52 -05:00
44 changed files with 1747 additions and 812 deletions

View File

@@ -21,10 +21,10 @@ define('POST_EXCERPT_LENGTH', 40);
function roots_main_class() {
if (roots_display_sidebar()) {
// Classes on pages with the sidebar
$class = 'col-sm-8 col-md-8 col-lg-8';
$class = 'col-sm-8';
} else {
// Classes on full width pages
$class = 'col-lg-12';
$class = 'col-sm-12';
}
return $class;
@@ -34,7 +34,7 @@ function roots_main_class() {
* .sidebar classes
*/
function roots_sidebar_class() {
return 'col-sm-4 col-md-4 col-lg-4';
return 'col-sm-4';
}
/**

View File

@@ -30,7 +30,7 @@ class Roots_Sidebar {
private function check_conditional_tag($conditional_tag) {
if (is_array($conditional_tag)) {
return call_user_func_array($conditional_tag[0], $conditional_tag[1]);
return $conditional_tag[0]($conditional_tag[1]);
} else {
return $conditional_tag();
}