From 8dc0cdbc5b7aeb9b0c4b7d41999b6beb3cf482be Mon Sep 17 00:00:00 2001
From: OnkelTem <OnkelTem@239962.no-reply.drupal.org>
Date: Mon, 13 Aug 2012 22:56:48 +0400
Subject: [PATCH] Issue 1728518 by OnkelTem: Flexible layout incorrectly
 treats canvas paddings

---
 plugins/layouts/flexible/flexible.inc |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/layouts/flexible/flexible.inc b/plugins/layouts/flexible/flexible.inc
index 93a7c93..9e33ae9 100644
--- a/plugins/layouts/flexible/flexible.inc
+++ b/plugins/layouts/flexible/flexible.inc
@@ -318,11 +318,11 @@ function panels_flexible_create_renderer($admin, $css_id, $content, $settings, &
   }
 
   // Get the separation values out of the canvas settings.
-  $renderer->column_separation = !empty($settings['items']['canvas']['column_separation']) ? $settings['items']['canvas']['column_separation'] : '0.5em';
+  $renderer->column_separation = !empty($settings['items']['canvas']['column_separation']) ? $settings['items']['canvas']['column_separation'] : '0em';
 
-  $renderer->region_separation = !empty($settings['items']['canvas']['region_separation']) ? $settings['items']['canvas']['region_separation'] : '0.5em';
+  $renderer->region_separation = !empty($settings['items']['canvas']['region_separation']) ? $settings['items']['canvas']['region_separation'] : '0em';
 
-  $renderer->row_separation = !empty($settings['items']['canvas']['row_separation']) ? $settings['items']['canvas']['row_separation'] : '0.5em';
+  $renderer->row_separation = !empty($settings['items']['canvas']['row_separation']) ? $settings['items']['canvas']['row_separation'] : '0em';
 
   // Make some appended classes so it's easier to reference them.
 
@@ -747,47 +747,47 @@ function panels_flexible_render_css_group($renderer, $list, $owner_id, $type, $i
   $css = array();
 
   // Start off with some generic CSS to properly pad regions
-  $css['.' . $renderer->item_class['region']] = array(
+  $css[$owner_id . ' .' . $renderer->item_class['region']] = array(
     'padding' => '0',
   );
 
-  $css['.' . $renderer->item_class['region'] . '-inside'] = array(
+  $css[$owner_id . ' .' . $renderer->item_class['region'] . '-inside'] = array(
     'padding-right' => $renderer->region_separation,
     'padding-left' => $renderer->region_separation,
   );
 
-  $css['.' . $renderer->item_class['region'] . '-inside-first'] = array(
+  $css[$owner_id . ' .' . $renderer->item_class['region'] . '-inside-first'] = array(
     'padding-left' => '0',
   );
 
-  $css['.' . $renderer->item_class['region'] . '-inside-last'] = array(
+  $css[$owner_id . ' .' . $renderer->item_class['region'] . '-inside-last'] = array(
     'padding-right' => '0',
   );
 
-  $css['.' . $renderer->item_class['column']] = array(
+  $css[$owner_id . ' .' . $renderer->item_class['column']] = array(
     'padding' => '0',
   );
 
-  $css['.' . $renderer->item_class['column'] . '-inside'] = array(
+  $css[$owner_id . ' .' . $renderer->item_class['column'] . '-inside'] = array(
     'padding-right' => $renderer->column_separation,
     'padding-left' => $renderer->column_separation,
   );
 
-  $css['.' . $renderer->item_class['column'] . '-inside-first'] = array(
+  $css[$owner_id . ' .' . $renderer->item_class['column'] . '-inside-first'] = array(
     'padding-left' => '0',
   );
 
-  $css['.' . $renderer->item_class['column'] . '-inside-last'] = array(
+  $css[$owner_id . ' .' . $renderer->item_class['column'] . '-inside-last'] = array(
     'padding-right' => '0',
   );
 
   // And properly pad rows too
-  $css['.' . $renderer->item_class['row']] = array(
+  $css[$owner_id . ' .' . $renderer->item_class['row']] = array(
     'padding' => '0 0 ' . $renderer->row_separation . ' 0',
     'margin' => '0',
   );
 
-  $css['.' . $renderer->item_class['row'] . '-last'] = array(
+  $css[$owner_id . ' .' . $renderer->item_class['row'] . '-last'] = array(
     'padding-bottom' => '0',
   );
 
-- 
1.7.9.5