diff --git a/bootstrap.info b/bootstrap.info index d4626a6..b4cef06 100644 --- a/bootstrap.info +++ b/bootstrap.info @@ -13,7 +13,7 @@ regions[footer] = 'Footer' settings[toggle_name] = 0 settings[toggle_search] = 1 settings[cdn_bootstrap] = 1 -settings[cdn_bootstrap_version] = 2.3.2 +settings[cdn_bootstrap_version] = 3.0.0 ;Exclude ;javascript diff --git a/includes/theme.inc b/includes/theme.inc index d03126b..bf1d179 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -278,7 +278,7 @@ function bootstrap_css_alter(&$css) { // Add Bootstrap CDN file and overrides. if (theme_get_setting('cdn_bootstrap')){ // Add CDN. - $cdn = '//netdna.bootstrapcdn.com/twitter-bootstrap/'. theme_get_setting('cdn_bootstrap_version') .'/css/bootstrap-combined.min.css'; + $cdn = '//netdna.bootstrapcdn.com/bootstrap/'. theme_get_setting('cdn_bootstrap_version') .'/css/bootstrap.min.css'; $css[$cdn] = array( 'data' => $cdn, 'type' => 'external', @@ -343,7 +343,7 @@ function bootstrap_js_alter(&$js) { // Add CDN. if (theme_get_setting('cdn_bootstrap')) { - $cdn = '//netdna.bootstrapcdn.com/twitter-bootstrap/'. theme_get_setting('cdn_bootstrap_version') .'/js/bootstrap.min.js'; + $cdn = '//netdna.bootstrapcdn.com/bootstrap/'. theme_get_setting('cdn_bootstrap_version') .'/js/bootstrap.min.js'; $js[$cdn] = drupal_js_defaults(); $js[$cdn]['data'] = $cdn; $js[$cdn]['type'] = 'external'; diff --git a/theme-settings.php b/theme-settings.php index 3901230..ce26ac3 100644 --- a/theme-settings.php +++ b/theme-settings.php @@ -46,17 +46,9 @@ function bootstrap_form_system_theme_settings_alter(&$form, $form_state, $form_i '#type' => 'select', '#title' => t('Bootstrap version'), '#options' => array( - '2.3.2' => 'v2.3.2', - '2.3.1' => 'v2.3.1', - '2.3.0' => 'v2.3.0', - '2.2.2' => 'v2.2.2', - '2.2.1' => 'v2.2.1', - '2.2.0' => 'v2.2.0', - '2.1.1' => 'v2.1.1', - '2.1.0' => 'v2.1.0', + '3.0.0' => 'v3.0.0', ), '#default_value' => theme_get_setting('cdn_bootstrap_version'), ); - }