Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 30 insertions, 0 deletions

diff --git a/modules/g2_import/css/g2_import.css b/modules/g2_import/css/g2_import.css
new file mode 100644
index 00000000..d53564d7
--- /dev/null
+++ b/modules/g2_import/css/g2_import.css
@@ -0,0 +1,30 @@
+#g-admin-g2-import-notes {
+  padding-bottom: 20px;
+}
+
+#g-admin-g2-import-details {
+  padding-top: 20px;
+}
+
+#g-admin-g2-import-details .g-warning {
+  margin-top: 4px;
+}
+
+#g-admin-g2-import-details .g-info {
+  padding: 2px;
+  border: 1px solid #999;
+  margin-bottom: 10px;
+}
+
+#g-admin-g2-import-notes p,
+#g-admin-g2-import-details .g-info p {
+  padding: 0;
+  margin: 0;
+}
+
+#g-admin-g2-import-notes ul li,
+#g-admin-g2-import .g-info ul li {
+  padding-left: 0;
+  margin-left: 20px;
+  list-style-type: disc;
+}