Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 0 insertions, 25 deletions

diff --git a/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.styles.css b/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.styles.css
deleted file mode 100644
index cc80c169..00000000
--- a/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.styles.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * CSS for WikiEditor
- */
-
-form#editform {
-	margin: 0;
-	padding: 0;
-}
-
-#wpSummary,
-#wpSummaryLabel {
-	margin-bottom: 1em;
-}
-
-#wpTextbox1 {
-	line-height: 1.5em;
-	resize: vertical;
-}
-
-/* Hide the old toolbar until the wikiEditor toolbar is deemed not supported,
- * hide the WikiEditor toolbar until it's css has loaded */
-.wikiEditor-oldToolbar,
-.wikiEditor-ui-toolbar {
-	display: none;
-}