framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Library changes

Browse Source
This commit is contained in:
Foxaii
2013-07-28 13:23:38 +01:00
parent 3bde5dbf77
commit cd20e417d2
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/config.php
View File

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

10
lib/nav.php
View File

@@ -30,7 +30,7 @@ class Roots_Nav_Walker extends Walker_Nav_Menu {
elseif (stristr($item_html, 'li class="divider')) { elseif (stristr($item_html, 'li class="divider')) {
$item_html = preg_replace('/<a[^>]*>.*?<\/a>/iU', '', $item_html); $item_html = preg_replace('/<a[^>]*>.*?<\/a>/iU', '', $item_html);
} }
elseif (stristr($item_html, 'li class="nav-header')) { elseif (stristr($item_html, 'li class="dropdown-header')) {
$item_html = preg_replace('/<a[^>]*>(.*)<\/a>/iU', '$1', $item_html); $item_html = preg_replace('/<a[^>]*>(.*)<\/a>/iU', '$1', $item_html);
} }
@@ -42,11 +42,7 @@ class Roots_Nav_Walker extends Walker_Nav_Menu {
$element->is_dropdown = ((!empty($children_elements[$element->ID]) && (($depth + 1) < $max_depth || ($max_depth === 0)))); $element->is_dropdown = ((!empty($children_elements[$element->ID]) && (($depth + 1) < $max_depth || ($max_depth === 0))));
if ($element->is_dropdown) { if ($element->is_dropdown) {
if ($depth === 0) { $element->classes[] = 'dropdown';
$element->classes[] = 'dropdown';
} elseif ($depth === 1) {
$element->classes[] = 'dropdown-submenu';
}
} }
parent::display_element($element, $children_elements, $max_depth, $depth, $args, $output); parent::display_element($element, $children_elements, $max_depth, $depth, $args, $output);
@@ -85,7 +81,7 @@ function roots_nav_menu_args($args = '') {
} }
if (current_theme_supports('bootstrap-top-navbar')) { if (current_theme_supports('bootstrap-top-navbar')) {
$roots_nav_menu_args['depth'] = 3; $roots_nav_menu_args['depth'] = 2;
} }
if (!$args['walker']) { if (!$args['walker']) {

1
lib/scripts.php
View File

@@ -15,7 +15,6 @@
*/ */
function roots_scripts() { function roots_scripts() {
wp_enqueue_style('roots_bootstrap', get_template_directory_uri() . '/assets/css/bootstrap.css', false, null); wp_enqueue_style('roots_bootstrap', get_template_directory_uri() . '/assets/css/bootstrap.css', false, null);
wp_enqueue_style('roots_bootstrap_responsive', get_template_directory_uri() . '/assets/css/bootstrap-responsive.css', array('roots_bootstrap'), null);
wp_enqueue_style('roots_app', get_template_directory_uri() . '/assets/css/app.css', false, null); wp_enqueue_style('roots_app', get_template_directory_uri() . '/assets/css/app.css', false, null);
// jQuery is loaded using the same method from HTML5 Boilerplate: // jQuery is loaded using the same method from HTML5 Boilerplate: