Mooeypoo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/349102 )
Change subject: RCFilters UI: Unify li bullets with and without highlights ...................................................................... RCFilters UI: Unify li bullets with and without highlights Make sure that the placement of the texts under the bullets is the same whether the highlight is on or off. Otherwise, the list is shifting a bit to the right to make room for highlight 'bullets' when we press the highlight key. Bonus: Make sure the highlight container is only appended to each bullet once, even if the process is called for more than once on the same content. Bug: T163275 Change-Id: I4c2cf6176d5129dd2bc37d2f58ed84e85aca8560 --- M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js 2 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/02/349102/1 diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less index 402f0ad..3337a03 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less @@ -12,12 +12,15 @@ } } + ul { + // Each li's margin-left should be the width of the highlights + // element + the margin + margin-left: ~'calc( ( @{result-circle-diameter} + @{result-circle-margin} ) * 5 + @{result-circle-general-margin} )'; + } + &-highlighted { ul { list-style: none; - // Each li's margin-left should be the width of the highlights - // element + the margin - margin-left: ~'calc( ( @{result-circle-diameter} + @{result-circle-margin} ) * 5 + @{result-circle-general-margin} )'; li { list-style: none; diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js index c7e6961..f4a1807 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js @@ -148,6 +148,11 @@ .prop( 'data-color', 'none' ) ); + if ( $( '.mw-rcfilters-ui-changesListWrapperWidget-highlights' ).length ) { + // Already set up + return; + } + mw.rcfilters.HighlightColors.forEach( function ( color ) { $highlights.append( $( '<div>' ) -- To view, visit https://gerrit.wikimedia.org/r/349102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c2cf6176d5129dd2bc37d2f58ed84e85aca8560 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mooeypoo <mor...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits