Commit 219209c8 authored by Jonathan Hunt's avatar Jonathan Hunt

#4 Update Bootstrap to 7.x-3.21.

parent 96f77c86
......@@ -209,8 +209,8 @@ multipliers[screen-md-max][] = 2x
multipliers[screen-lg-min][] = 1.5x
multipliers[screen-lg-min][] = 2x
; Information added by Drupal.org packaging script on 2018-04-18
version = "7.x-3.20"
; Information added by Drupal.org packaging script on 2018-07-20
version = "7.x-3.21"
core = "7.x"
project = "bootstrap"
datestamp = "1524091089"
datestamp = "1532095127"
......@@ -22,21 +22,19 @@ function bootstrap_icon_providers() {
* Implements hook_icon_bundles().
*/
function bootstrap_icon_bundles() {
$bundles = array();
if (_bootstrap_glyphicons_supported()) {
$bundles['bootstrap'] = array(
'render' => 'sprite',
'provider' => 'bootstrap',
'title' => t('Bootstrap'),
'version' => t('Icons by Glyphicons'),
'variations' => array(
'icon-white' => t('White'),
),
'settings' => array(
'tag' => 'span',
),
'icons' => _bootstrap_glyphicons(),
);
}
$bundles['bootstrap'] = array(
'render' => 'sprite',
'provider' => 'bootstrap',
'title' => t('Bootstrap'),
'version' => t('Icons by Glyphicons'),
'variations' => array(
'icon-white' => t('White'),
),
'settings' => array(
'tag' => 'span',
),
'icons' => _bootstrap_glyphicons(),
);
return $bundles;
}
......@@ -24,9 +24,12 @@ function bootstrap_file_managed_file(array $variables) {
$element = $variables['element'];
$attributes = array();
if (isset($element['#id'])) {
// For Webform use, do not add the id to the wrapper.
if (isset($element['#id']) && empty($element['#webform_component'])) {
$attributes['id'] = $element['#id'];
}
if (!empty($element['#attributes']['class'])) {
$attributes['class'] = (array) $element['#attributes']['class'];
}
......
<?php
/**
* @file
* Stub file for bootstrap_webform_managed_file().
*/
/**
* Returns HTML for a Webform managed file element.
*
* @param array $variables
* An associative array containing:
* - element: A render element representing the file.
*
* @return string
* The constructed HTML.
*
* @see theme_webform_managed_file()
* @see bootstrap_file_managed_file()
*
* @ingroup theme_functions
*/
function bootstrap_webform_managed_file(array $variables) {
// Render with Bootstrap's managed file theme function.
bootstrap_include('bootstrap', 'templates/file/file-managed-file.func.php');
return bootstrap_file_managed_file($variables);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment