Mooeypoo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373716 )
Change subject: RCFilters: Minimize vertical spacing; get rid of legend and
<br>s
......................................................................
RCFilters: Minimize vertical spacing; get rid of legend and <br>s
Bug: T174121
Change-Id: I2249bf3d313232fe2f0dff6e34c5140885a13735
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
2 files changed, 17 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/16/373716/1
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index c667bac..ec5ea3a 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -41,6 +41,14 @@
display: none;
}
}
+
+ fieldset.rcoptions {
+ padding: 0;
+
+ .rcshowhide span {
+ display: block;
+ }
+ }
}
.rcfilters-container {
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
index ad99e22..1b85503 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
@@ -142,17 +142,23 @@
this.$element.find( 'hr' ).detach();
}
+ // Get rid of all <br>s, which are inside rcshowhide
+ // If we still have content in rcshowhide, the <br>s are
+ // gone. Instead, the CSS now has a rule to mark all <span>s
+ // inside .rcshowhide with display:block; to simulate newlines
+ // where they're actually needed.
+ this.$element.find( 'br' ).detach();
if ( !this.$element.find( '.rcshowhide' ).contents().length ) {
this.$element.find( '.rcshowhide' ).detach();
- // If we're hiding rcshowhide, the '<br>'s are around
it,
- // there's no need for them either.
- this.$element.find( 'br' ).detach();
}
if ( this.$element.find( '.cloption' ).text().trim() === '' ) {
this.$element.find( '.cloption-submit' ).detach();
}
+ // Get rid of the legend
+ this.$element.find( 'legend' ).detach();
+
this.$element.find(
'.rclistfrom, .rcnotefrom, .rcoptions-listfromreset'
).detach();
--
To view, visit https://gerrit.wikimedia.org/r/373716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2249bf3d313232fe2f0dff6e34c5140885a13735
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
