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

Updating Bootstrap to v.2.0.0

Browse Source 
roots-actions.php:  added responsive css framework file
roots-options.php: changed default css classes for bootstrap v2.0.0
roots-scripts.php: updated less to v1.2.1, changed the load order and
added new scripts for bootstrap v2.0.0

Added all of the new css, js, less asset files and updated all of the
previous ones for bootstrap v2.0.0
This commit is contained in:
Corey Wagehoft
2012-02-01 10:18:39 -06:00
parent 923828bc06
commit d045e1be56
41 changed files with 4171 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
inc/roots-actions.php
View File

@@ -59,6 +59,7 @@ function roots_get_stylesheets() {
break;
case 'bootstrap' :
$styles .= stylesheet_link_tag('/bootstrap/bootstrap.css');
$styles .= stylesheet_link_tag('/bootstrap/bootstrap-responsive.css');
break;
case 'bootstrap_less' :
$styles .= stylesheet_link_tag('/bootstrap/lib/bootstrap.less', 0, true, 'stylesheet/less');

12
inc/roots-options.php
View File

@@ -142,9 +142,9 @@ $roots_css_frameworks = array(
'label' => __('Bootstrap', 'roots'),
'classes' => array(
'container' => 'row',
'main' => 'span11',
'sidebar' => 'span5',
'fullwidth' => 'span16'
'main' => 'span9',
'sidebar' => 'span3',
'fullwidth' => 'span12'
)
),
'bootstrap_less' => array(
@@ -152,9 +152,9 @@ $roots_css_frameworks = array(
'label' => __('Bootstrap w/ Less', 'roots'),
'classes' => array(
'container' => 'row',
'main' => 'span11',
'sidebar' => 'span5',
'fullwidth' => 'span16'
'main' => 'span9',
'sidebar' => 'span3',
'fullwidth' => 'span12'
)
),
'none' => array(

30
inc/roots-scripts.php
View File

@@ -38,29 +38,37 @@ function roots_scripts() {
$roots_bootstrap_less_js = $roots_options['bootstrap_less_javascript'];
$template_uri = get_template_directory_uri();
if (roots_current_framework() === 'bootstrap_less') {
wp_register_script('bootstrap-less', ''.$template_uri.'/js/bootstrap/less-1.1.3.min.js', false, null, false);
wp_register_script('bootstrap-less', ''.$template_uri.'/js/bootstrap/less-1.2.1.min.js', false, null, false);
wp_enqueue_script('bootstrap-less');
}
if ($roots_bootstrap_js === true || $roots_bootstrap_less_js === true) {
$roots_options['bootstrap_less_javascript'] = false;
$roots_options['bootstrap_javascript'] = false;
wp_register_script('bootstrap-transition', ''.$template_uri.'/js/bootstrap/bootstrap-transition.js', false, null, false);
wp_register_script('bootstrap-alert', ''.$template_uri.'/js/bootstrap/bootstrap-alert.js', false, null, false);
wp_register_script('bootstrap-modal', ''.$template_uri.'/js/bootstrap/bootstrap-modal.js', false, null, false);
wp_register_script('bootstrap-alerts', ''.$template_uri.'/js/bootstrap/bootstrap-alerts.js', false, null, false);
wp_register_script('bootstrap-twipsy', ''.$template_uri.'/js/bootstrap/bootstrap-twipsy.js', false, null, false);
wp_register_script('bootstrap-popover', ''.$template_uri.'/js/bootstrap/bootstrap-popover.js', false, null, false);
wp_register_script('bootstrap-dropdown', ''.$template_uri.'/js/bootstrap/bootstrap-dropdown.js', false, null, false);
wp_register_script('bootstrap-scrollspy', ''.$template_uri.'/js/bootstrap/bootstrap-scrollspy.js', false, null, false);
wp_register_script('bootstrap-tabs', ''.$template_uri.'/js/bootstrap/bootstrap-tabs.js', false, null, false);
wp_register_script('bootstrap-buttons', ''.$template_uri.'/js/bootstrap/bootstrap-buttons.js', false, null, false);
wp_register_script('bootstrap-tab', ''.$template_uri.'/js/bootstrap/bootstrap-tab.js', false, null, false);
wp_register_script('bootstrap-tooltip', ''.$template_uri.'/js/bootstrap/bootstrap-tooltip.js', false, null, false);
wp_register_script('bootstrap-popover', ''.$template_uri.'/js/bootstrap/bootstrap-popover.js', false, null, false);
wp_register_script('bootstrap-button', ''.$template_uri.'/js/bootstrap/bootstrap-button.js', false, null, false);
wp_register_script('bootstrap-collapse', ''.$template_uri.'/js/bootstrap/bootstrap-collapse.js', false, null, false);
wp_register_script('bootstrap-carousel', ''.$template_uri.'/js/bootstrap/bootstrap-carousel.js', false, null, false);
wp_register_script('bootstrap-typehead', ''.$template_uri.'/js/bootstrap/bootstrap-typehead.js', false, null, false);
wp_enqueue_script('bootstrap-modal');
wp_enqueue_script('bootstrap-alert');
wp_enqueue_script('bootstrap-modal');
wp_enqueue_script('bootstrap-alerts');
wp_enqueue_script('bootstrap-twipsy');
wp_enqueue_script('bootstrap-popover');
wp_enqueue_script('bootstrap-dropdown');
wp_enqueue_script('bootstrap-scrollspy');
wp_enqueue_script('bootstrap-tabs');
wp_enqueue_script('bootstrap-buttons');
wp_enqueue_script('bootstrap-tab');
wp_enqueue_script('bootstrap-tooltip');
wp_enqueue_script('bootstrap-popover');
wp_enqueue_script('bootstrap-button');
wp_enqueue_script('bootstrap-collapse');
wp_enqueue_script('bootstrap-carousel');
wp_enqueue_script('bootstrap-typehead');
}
}
}