From b508a285a598b3bbaa87a8f652be3b880e0b1c92 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Wed, 16 Jun 2010 07:21:25 +0000
Subject: [PATCH] Merge both files to reduce request to server.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36374 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_knowledge_box.css.xml                | 10 ++--
 .../erp5_knowledge_box_top_newpage.css.xml    | 53 -------------------
 bt5/erp5_knowledge_pad/bt/revision            |  2 +-
 3 files changed, 8 insertions(+), 57 deletions(-)
 delete mode 100644 bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box_top_newpage.css.xml

diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml
index 1dd1ddf66e..a0468ed448 100644
--- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml
+++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml
@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts76670303.39</string> </value>
+            <value> <string>ts76672293.43</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -27,7 +27,11 @@
         </item>
         <item>
             <key> <string>data</string> </key>
-            <value> <string>#page_wrapper {\n
+            <value> <string>#gadget_area_wrapper {\n
+  margin-top: 0.5em;\n
+}\n
+\n
+#page_wrapper {\n
   text-align: left;\n
   margin: 0em;\n
   padding: 0em;\n
@@ -584,7 +588,7 @@ div.block div.worklist_list ul li a:hover{\n
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>9618</int> </value>
+            <value> <int>9665</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box_top_newpage.css.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box_top_newpage.css.xml
deleted file mode 100644
index 36bf9bc483..0000000000
--- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box_top_newpage.css.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="File" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_Cacheable__manager_id</string> </key>
-            <value> <string>http_cache</string> </value>
-        </item>
-        <item>
-            <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts14209525.03</string> </value>
-        </item>
-        <item>
-            <key> <string>__name__</string> </key>
-            <value> <string>erp5_knowledge_box_top_newpage.css</string> </value>
-        </item>
-        <item>
-            <key> <string>content_type</string> </key>
-            <value> <string>text/css</string> </value>
-        </item>
-        <item>
-            <key> <string>data</string> </key>
-            <value> <string>#gadget_area_wrapper {\n
-  margin-top: 0.5em;\n
-}\n
-\n
-#portal .portal-column {\n
-  width: 32.9%;\n
-}</string> </value>
-        </item>
-        <item>
-            <key> <string>precondition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>size</string> </key>
-            <value> <long>89</long> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_knowledge_pad/bt/revision b/bt5/erp5_knowledge_pad/bt/revision
index a1a25e0f23..1fc188de73 100644
--- a/bt5/erp5_knowledge_pad/bt/revision
+++ b/bt5/erp5_knowledge_pad/bt/revision
@@ -1 +1 @@
-524
\ No newline at end of file
+525
\ No newline at end of file
-- 
2.30.9