summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--plugins/layouts/flexible/flexible.inc8
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 82f97e6..231514e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -31,6 +31,7 @@ Add two new Page Wizards to more easily create some of the most commonly used Pa
#932632 by mikeytown2: Fix notice in .install file.
#927840: Add clear-block to dashboard HTML to ensure themes do not do weird things to it.
#941806: Fix incorrect link to configure mini panel on block config page.
+#869766: Fix occasional problem with flexible layout pushing the entire layout to the left in certain fixed-width only configurations.
Panels 6.x-3.7 (2010-Jul-26)
==============
diff --git a/plugins/layouts/flexible/flexible.inc b/plugins/layouts/flexible/flexible.inc
index 9fb53cb..5ca3187 100644
--- a/plugins/layouts/flexible/flexible.inc
+++ b/plugins/layouts/flexible/flexible.inc
@@ -869,19 +869,23 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
// If there is any total remaining, we need to offset the splitter
// by this much too.
if ($left_total) {
+ // Add this even if it's 0 so we can handle removals.
+ $css["$owner_id-inside"]['padding-left'] = '0px';
if ($renderer->admin || count($middle)) {
$css["$owner_id-middle"]['margin-left'] = $left_total . 'px';
// IE hack
$css["* html $owner_id-left"]['left'] = $left_total . "px";
+ // Make this one very specific to the admin CSS so that preview
+ // does not stomp it.
+ $css[".panel-flexible-admin $owner_id-inside"]['padding-left'] = '0px';
}
else {
$css["$owner_id-inside"]['margin-left'] = '-' . $left_total . 'px';
+ $css["$owner_id-inside"]['padding-left'] = $left_total . 'px';
// IE hack
$css["* html $owner_id-inside"]['left'] = $left_total . "px";
}
}
- // Add this even if it's 0 so we can handle removals.
- $css["$owner_id-inside"]['padding-left'] = '0px';
if ($right_total) {
$css["$owner_id-middle"]['margin-right'] = $right_total . 'px';
}