Foxtrott has submitted this change and it was merged.

Change subject: Fix styles for Special pages
......................................................................


Fix styles for Special pages

Bug: 72872
Change-Id: Ib733822cb7a43bec948167d23c39a9f3d5620fae
---
M Chameleon.php
M styles/core.less
M styles/screen.less
A styles/specialpages.less
M styles/variables.less
5 files changed, 107 insertions(+), 18 deletions(-)

Approvals:
  Foxtrott: Verified; Looks good to me, approved



diff --git a/Chameleon.php b/Chameleon.php
index 99f14e1..855abb4 100644
--- a/Chameleon.php
+++ b/Chameleon.php
@@ -47,7 +47,7 @@
        }
 
        // define the skin's version
-       define( 'CHAMELEON_VERSION', '1.1-alpha' );
+       define( 'CHAMELEON_VERSION', '1.1.1-alpha' );
 
        // set credits
        $GLOBALS[ 'wgExtensionCredits' ][ 'skin' ][ ] = array(
diff --git a/styles/core.less b/styles/core.less
index 4507b20..1f19ac4 100644
--- a/styles/core.less
+++ b/styles/core.less
@@ -31,6 +31,7 @@
 @import "./forms.less";
 @import "./thumbnails.less";
 @import "./screen.less";
+@import "./specialpages.less";
 @import "./print.less";
 
 /**
diff --git a/styles/screen.less b/styles/screen.less
index 653dd8a..4ddc30d 100644
--- a/styles/screen.less
+++ b/styles/screen.less
@@ -293,22 +293,6 @@
                        }
                }
        }
-
-       .ns-special & { // reset styles for special pages
-               ul {
-                       padding-left: inherit;
-                       text-indent: inherit;
-                       margin: 2ex 0;
-
-                       li:before {
-                               content: none;
-                       }
-               }
-
-               li {
-                       margin: .5ex 0;
-               }
-       }
 }
 
 .catlinks {
@@ -382,6 +366,11 @@
        font-size: 100%;
 }
 
+.skin-chameleon .mw-specialpages-table {
+       margin-bottom: 0;
+       margin-top: 0;
+}
+
 /* Forms */
 fieldset {
        border: 1px solid #2f6fab;
diff --git a/styles/specialpages.less b/styles/specialpages.less
new file mode 100644
index 0000000..7fc9992
--- /dev/null
+++ b/styles/specialpages.less
@@ -0,0 +1,99 @@
+/**
+ * MediaWiki Special Pages
+ *
+ * This file is part of the MediaWiki skin Chameleon.
+ *
+ * @copyright 2013 - 2014, Stephan Gambke
+ * @license   GNU General Public License, version 3 (or any later version)
+ *
+ * The Chameleon skin is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the 
Free
+ * Software Foundation, either version 3 of the License, or (at your option) 
any
+ * later version.
+ *
+ * The Chameleon skin is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for 
more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author Stephan Gambke
+ * @since 1.1.1
+ * @ingroup Skins
+ */
+
+// Styles for all Special Pages
+.ns-special .mw-body {
+       label {
+               display: inline;
+               font-weight: normal;
+       }
+}
+
+.mw-special-ChangeEmail,
+.mw-special-PasswordReset {
+       .mw-body label {
+               font-weight: bold;
+       }
+}
+
+// reset ul styles for some special pages
+.mw-special-Search,
+.mw-special-Uncategorizedimages,
+.mw-special-Newimages,
+.mw-special-Mostimages,
+.mw-special-Allpages,
+.mw-special-Preferences {
+       .mw-body {
+               ul {
+                       padding-left: inherit;
+                       text-indent: inherit;
+                       margin: 2ex 0;
+
+                       li:before {
+                               content: none;
+                       }
+               }
+       }
+}
+
+.mw-special-Preferences {
+
+       #preferences td {
+               padding-left: 0.5em;
+               padding-right: 0.5em;
+       }
+
+       .htmlform-tip {
+               font-size: x-small;
+       }
+
+       #preftoc {
+               margin-bottom: 0;
+       }
+
+       #mw-htmlform-i18n td {
+               padding-bottom: 1ex;
+       }
+
+       .prefsection td.mw-label {
+               width: 25%;
+       }
+}
+
+.mw-special-ResetTokens {
+       #mw-content-text table {
+               margin-top: 2ex;
+
+               td {
+                       padding-left: 1ex;
+                       padding-right: 1ex;
+               }
+
+               td.mw-label {
+                       width: 15%;
+               }
+       }
+}
diff --git a/styles/variables.less b/styles/variables.less
index 908835e..3db2cb0 100644
--- a/styles/variables.less
+++ b/styles/variables.less
@@ -35,7 +35,7 @@
 // list parameters
 @list-bullet-size: 0.7ex;
 @list-bullet-color: @gray-light;
-@list-level-indent: 2.5ex;
+@list-level-indent: 3.5ex;
 
 @thumbnail-caption-padding: 3px;
 

-- 
To view, visit https://gerrit.wikimedia.org/r/171991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib733822cb7a43bec948167d23c39a9f3d5620fae
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/chameleon
Gerrit-Branch: master
Gerrit-Owner: Foxtrott <[email protected]>
Gerrit-Reviewer: Foxtrott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to