Merge "Move editoptions styling to mediawiki.skinning/interface.css"

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.css b/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
old mode 100644 (file)
new mode 100755 (executable)
index 7148b96..4209aa1
--- a/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
@@ -8,14 +8,6 @@
        display: block;
 }
 
-.editOptions {
-       background-color: #F0F0F0;
-       border: 1px solid silver;
-       border-top: none;
-       padding: 1em 1em 1.5em 1em;
-       margin-bottom: 2em;
-}
-
 /* Adjustments to edit form elements */
 .editCheckboxes {
        margin-bottom: 1em;

diff --git a/resources/src/mediawiki.skinning/interface.css b/resources/src/mediawiki.skinning/interface.css
old mode 100644 (file)
new mode 100755 (executable)
index 398a132..b57ee36
--- a/resources/src/mediawiki.skinning/interface.css
+++ b/resources/src/mediawiki.skinning/interface.css
@@ -15,6 +15,14 @@
        clear: both;
 }
 
+.editOptions {
+       background-color: #F0F0F0;
+       border: 1px solid silver;
+       border-top: none;
+       padding: 1em 1em 1.5em 1em;
+       margin-bottom: 2em;
+}
+
 .usermessage {
        background-color: #ffce7b;
        border: 1px solid #ffa500;