Permalink
Browse files

# [#29302] Moving Accordion fix to bootstrap-extended. Thanks Kyle.

  • Loading branch information...
1 parent 1e1dbea commit b5a9bcd3463dd84ea296989a112a8bf94461378c @kyleledbetter kyleledbetter committed with infograf768 Sep 25, 2012
View
3 administrator/templates/isis/css/template.css
@@ -5544,6 +5544,9 @@ fieldset.radio.btn-group {
.btn-group .chzn-results {
white-space: normal;
}
+.accordion-body.in:hover {
+ overflow: visible;
+}
@font-face {
font-family: 'IcoMoon';
src: url('../../../../media/jui/fonts/IcoMoon.eot');
View
2 installation/CHANGELOG
@@ -29,7 +29,7 @@ $ -> Language fix or change
25-Sep-2012 Jean-Marie Simonet
+$ Adding installation languages: es-ES, fa-IR
^# [#29301] Protostar Site Title and Description Params. Thanks Kyle
- +$ Adding installation languages: hu-HU + correcting some EOL
+ # [#29302] Moving Accordion fix to bootstrap-extended. Thanks Kyle.
24-Sep-2012 Mark Dexter
# [#29275] Update README.txt file for Joomla 3. Thanks Nick Savov.
View
11 libraries/cms/html/bootstrap.php
@@ -577,9 +577,9 @@ public static function endPanel()
}
/**
- * Loads CSS files needed by Bootstrap, including a secondary file that may contain Bootstrap CSS bug fixes
+ * Loads CSS files needed by Bootstrap
*
- * @param boolean $includeMainCss If true, main bootstrap.css file is loaded
+ * @param boolean $includeMainCss If true, main bootstrap.css files are loaded
* @param string $direction rtl or ltr direction. If empty, ltr is assumed
* @param array $attribs Optional array of attributes to be passed to JHtml::_('stylesheet')
*
@@ -592,16 +592,15 @@ public static function loadCss($includeMainCss = true, $direction = 'ltr', $attr
// Load Bootstrap main CSS
if ($includeMainCss)
{
- JHtml::_('stylesheet', 'media/jui/css/bootstrap.css', $attribs, false);
+ JHtml::_('stylesheet', 'media/jui/css/bootstrap.min.css', $attribs, false);
+ JHtml::_('stylesheet', 'media/jui/css/bootstrap-responsive.min.css', $attribs, false);
+ JHtml::_('stylesheet', 'media/jui/css/bootstrap-extended.css', $attribs, false);
}
// Load Bootstrap RTL CSS
if ($direction === 'rtl')
{
JHtml::_('stylesheet', 'media/jui/css/bootstrap-rtl.css', $attribs, false);
}
-
- // Load Bootstrap CSS fixes
- JHtml::_('stylesheet', 'media/cms/css/bootstrap.css', $attribs, false);
}
}
View
4 media/cms/css/bootstrap.css
@@ -1,4 +0,0 @@
-/* Fix for #29223: ref: http://stackoverflow.com/questions/10959068/twitter-bootstrap-accordion-and-button-dropdown-overflow-issue */
-.accordion-body.in:hover {
- overflow:visible;
-}
View
7 media/jui/css/bootstrap-extended.css
@@ -433,4 +433,11 @@ fieldset.radio.btn-group {
/* Auto Width */
.width-auto {
width: auto;
+}/* Chosen proper wrapping in Bootstrap btn-group */
+.btn-group .chzn-results {
+ white-space: normal;
+}
+/* Accordion overflow fix */
+.accordion-body.in:hover {
+ overflow:visible;
}
View
5 media/jui/less/bootstrap-extended.less
@@ -423,4 +423,9 @@ fieldset.radio.btn-group {
/* Chosen proper wrapping in Bootstrap btn-group */
.btn-group .chzn-results {
white-space: normal;
+}
+
+/* Accordion overflow fix */
+.accordion-body.in:hover {
+ overflow:visible;
}
View
3 templates/protostar/css/template.css
@@ -5544,6 +5544,9 @@ fieldset.radio.btn-group {
.btn-group .chzn-results {
white-space: normal;
}
+.accordion-body.in:hover {
+ overflow: visible;
+}
@font-face {
font-family: 'IcoMoon';
src: url('../../../media/jui/fonts/IcoMoon.eot');

0 comments on commit b5a9bcd

Please sign in to comment.