Foxtrott has submitted this change and it was merged.
Change subject: Limit fix of padding of mw-ui-input and -button to
Special:Search
......................................................................
Limit fix of padding of mw-ui-input and -button to Special:Search
Also some minor restructuring of styles.
Bug: 73509
Followup: Id57e514abb1910d6059
Change-Id: I943ba03dc116fa2247a5b49613f08a60ff7993df
---
M resources/styles/core.less
M resources/styles/forms.less
M resources/styles/images.less
M resources/styles/screen.less
D resources/styles/thumbnails.less
5 files changed, 73 insertions(+), 101 deletions(-)
Approvals:
Foxtrott: Verified; Looks good to me, approved
diff --git a/resources/styles/core.less b/resources/styles/core.less
index dd0a3be..89a190d 100644
--- a/resources/styles/core.less
+++ b/resources/styles/core.less
@@ -29,7 +29,6 @@
@import "utils";
@import "images";
@import "forms";
-@import "thumbnails";
@import "screen";
@import "specialpages";
@import "print";
diff --git a/resources/styles/forms.less b/resources/styles/forms.less
index 6f03ffd..73dbe25 100644
--- a/resources/styles/forms.less
+++ b/resources/styles/forms.less
@@ -31,3 +31,9 @@
border: none;
margin: 0;
}
+
+.skin-chameleon.mw-special-Search {
+ .mw-ui-input, .mw-ui-button {
+ padding: 0.5em 1em;
+ }
+}
diff --git a/resources/styles/images.less b/resources/styles/images.less
index 21b764d..3712b2a 100644
--- a/resources/styles/images.less
+++ b/resources/styles/images.less
@@ -35,3 +35,70 @@
}
}
+.thumbinner {
+ .thumbnail;
+
+ overflow: hidden;
+}
+
+/* Default styles when there's no .mw-content-ltr or .mw-content-rtl,
overridden below */
+.thumbcaption {
+ .thumbnail > .caption;
+ text-align: left;
+}
+
+div.magnify {
+ float: right;
+ margin-left: 0.3em;
+ margin-right: 0;
+
+ a {
+ .glyphicon;
+ .glyphicon-zoom-in;
+
+ color: lighten( @thumbnail-caption-color, 15% );
+ top: 4px;
+
+ &:hover {
+ text-decoration: none;
+ color: @thumbnail-caption-color;
+ }
+
+ * {
+ display: none;
+ }
+
+ /* Don't annoy people who copy-paste everything too much */
+ .user-select(none);
+ }
+}
+
+
+/* Directionality-specific styles for thumbnails - their positioning depends
on content language */
+
+/* @noflip */
+.mw-content-ltr{
+ .thumbcaption {
+ text-align: left;
+ }
+
+ div.magnify {
+ float: right;
+ margin-left: 0.3em;
+ margin-right: 0;
+ }
+}
+
+/* @noflip */
+.mw-content-rtl{
+ .thumbcaption {
+ text-align: right;
+ }
+
+ div.magnify {
+ float: left;
+ margin-left: 0;
+ margin-right: 0.3em;
+ .scale(-1, 1); // flip magnifying glass
+ }
+}
diff --git a/resources/styles/screen.less b/resources/styles/screen.less
index fd9bbdb..458b387 100644
--- a/resources/styles/screen.less
+++ b/resources/styles/screen.less
@@ -442,9 +442,3 @@
table.mw-recentchanges-table {
width: 100%;
}
-
-.skin-chameleon {
- .mw-ui-input, .mw-ui-button {
- padding: 0.5em 1em;
- }
-}
diff --git a/resources/styles/thumbnails.less b/resources/styles/thumbnails.less
deleted file mode 100644
index fa60d05..0000000
--- a/resources/styles/thumbnails.less
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * MediaWiki Thumbnails
- *
- * 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.0
- * @ingroup Skins
- */
-
-
-.thumbinner {
- .thumbnail;
-
- overflow: hidden;
-}
-
-/* Default styles when there's no .mw-content-ltr or .mw-content-rtl,
overridden below */
-.thumbcaption {
- .thumbnail > .caption;
- text-align: left;
-}
-
-div.magnify {
- float: right;
- margin-left: 0.3em;
- margin-right: 0;
-
- a {
- .glyphicon;
- .glyphicon-zoom-in;
-
- color: lighten( @thumbnail-caption-color, 15% );
- top: 4px;
-
- &:hover {
- text-decoration: none;
- color: @thumbnail-caption-color;
- }
-
- * {
- display: none;
- }
-
- /* Don't annoy people who copy-paste everything too much */
- .user-select(none);
- }
-}
-
-
-/* Directionality-specific styles for thumbnails - their positioning depends
on content language */
-
-/* @noflip */
-.mw-content-ltr{
- .thumbcaption {
- text-align: left;
- }
-
- div.magnify {
- float: right;
- margin-left: 0.3em;
- margin-right: 0;
- }
-}
-
-/* @noflip */
-.mw-content-rtl{
- .thumbcaption {
- text-align: right;
- }
-
- div.magnify {
- float: left;
- margin-left: 0;
- margin-right: 0.3em;
- .scale(-1, 1); // flip magnifying glass
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/174083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I943ba03dc116fa2247a5b49613f08a60ff7993df
Gerrit-PatchSet: 2
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
