Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 27 insertions, 0 deletions

diff --git a/resources/src/jquery/jquery.makeCollapsible.css b/resources/src/jquery/jquery.makeCollapsible.css
new file mode 100644
index 00000000..0f471509
--- /dev/null
+++ b/resources/src/jquery/jquery.makeCollapsible.css
@@ -0,0 +1,27 @@
+/* See also jquery.makeCollapsible.js */
+.mw-collapsible-toggle {
+	float: right;
+	-moz-user-select: none;
+	-webkit-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+.mw-customtoggle,
+.mw-collapsible-toggle {
+	cursor: pointer;
+}
+
+/* collapse links in captions should be inline */
+caption .mw-collapsible-toggle {
+	float: none;
+}
+
+/* list-items go as wide as their parent element, don't float them inside list items */
+li .mw-collapsible-toggle {
+	float: none;
+}
+
+/* the added list item should have no list-style */
+.mw-collapsible-toggle-li {
+	list-style: none;
+}