From dab4e9ed37b469375e272da04d6f50e6d68bb66d Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Tue, 7 Aug 2012 08:40:59 -0700
Subject: [PATCH] fix docs for dropdown/containerCss options

---
 index.html          | 8 ++++----
 select2-latest.html | 8 ++++----
 select2-master      | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index 1509874c..96ca994c 100755
--- a/index.html
+++ b/index.html
@@ -1154,14 +1154,14 @@ $("#tags").select2({
                 they will be converted into an object that has an <code>id</code> and <code>text</code> attribute equal
                 to the value of the <code>string</code>.
             </td></tr>
-            <tr><td>containerCss</td><td>function/string</td><td>
-                Inline css that will be added to select2's container
+            <tr><td>containerCss</td><td>function/object</td><td>
+                Inline css that will be added to select2's container. Either an object containing css property/value key pairs or a function that returns such an object.
             </td></tr>
             <tr><td>containerCssClass</td><td>function/string</td><td>
                 Css class that will be added to select2's container tag
             </td></tr>
-            <tr><td>dropdownCss</td><td>function/string</td><td>
-                Inline css that will be added to select2's dropdown container
+            <tr><td>dropdownCss</td><td>function/object</td><td>
+                Inline css that will be added to select2's dropdown container. Either an object containing css property/value key pairs or a function that returns such an object.
             </td></tr>
             <tr><td>dropdownCssClass</td><td>function/string</td><td>
                 Css class that will be added to select2's dropdown container
diff --git a/select2-latest.html b/select2-latest.html
index c66446c3..84f6f948 100755
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -1186,14 +1186,14 @@ $("#tags").select2({
                 they will be converted into an object that has an <code>id</code> and <code>text</code> attribute equal
                 to the value of the <code>string</code>.
             </td></tr>
-            <tr><td>containerCss</td><td>function/string</td><td>
-                Inline css that will be added to select2's container
+            <tr><td>containerCss</td><td>function/object</td><td>
+                Inline css that will be added to select2's container. Either an object containing css property/value key pairs or a function that returns such an object.
             </td></tr>
             <tr><td>containerCssClass</td><td>function/string</td><td>
                 Css class that will be added to select2's container tag
             </td></tr>
-            <tr><td>dropdownCss</td><td>function/string</td><td>
-                Inline css that will be added to select2's dropdown container
+            <tr><td>dropdownCss</td><td>function/object</td><td>
+                Inline css that will be added to select2's dropdown container. Either an object containing css property/value key pairs or a function that returns such an object.
             </td></tr>
             <tr><td>dropdownCssClass</td><td>function/string</td><td>
                 Css class that will be added to select2's dropdown container
diff --git a/select2-master b/select2-master
index d92a5726..220e50fd 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit d92a5726944689198ca229c581560531b154ad52
+Subproject commit 220e50fd92102a02f40c5cf88dd022eb923bd414