X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=resources%2Fsrc%2Fmediawiki.rcfilters%2Fstyles%2Fmw.rcfilters.ui.ChangesListWrapperWidget.less;h=4338b0b746c569845e4902a1dc8e83af9cda0f42;hb=825d66bfa44c5dae2b78e2fe4f3b16f16aff4a12;hp=324c90073b33411665c52d0758cbd032fea7ea2e;hpb=079a0c4caac91f2ca908a8127b37d377643fc7dc;p=lhc%2Fweb%2Fwiklou.git 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 324c90073b..4338b0b746 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less @@ -6,6 +6,7 @@ 60% { border-top-color: @colorProgressive; } + 100% { border-top-color: @colorGray12; } @@ -27,7 +28,6 @@ } &-results { - width: 35em; margin: 5em auto; &-noresult, @@ -58,6 +58,7 @@ .mw-changeslist-legend { background-color: @background-color-base; position: relative; // We want to keep the legend accessible when results are overlaid + z-index: 1; // Keep opacity-animated highlights from appearing on top of the legend border: 1px solid @colorGray12; } @@ -79,53 +80,53 @@ width: 100%; } } +} - &-highlights { - display: none; - padding: 0 @margin-circle 0 0; - text-align: right; - // The width is 5 circles times their diameter + individual margin - // and then plus the general margin - width: ~'calc( ( @{size-circle-result} + @{margin-circle-result} ) * 5 )'; - // And we want to shift the entire block to the left of the li - position: relative; - // Negative left margin of width + padding - margin-left: ~'calc( ( @{size-circle-result} + @{margin-circle-result} ) * -5 - @{margin-circle} )'; - - .mw-rcfilters-ui-changesListWrapperWidget-highlighted & { - display: inline-block; - } +.mw-rcfilters-ui-highlights { + display: none; + padding: 0 @margin-circle 0 0; + // The width is 5 circles times their diameter + individual margin + // and then plus the general margin + width: ~'calc( ( @{size-circle-result} + @{margin-circle-result} ) * 5 )'; + // And we want to shift the entire block to the left of the li + position: relative; + // Negative left margin of width + padding + margin-left: ~'calc( ( @{size-circle-result} + @{margin-circle-result} ) * -5 - @{margin-circle} )'; - // This needs to be very specific, since these are - // position rules that should apply to all overrides - .mw-rcfilters-ui-changesListWrapperWidget .mw-rcfilters-ui-changesListWrapperWidget-highlights > div&-circle { - vertical-align: middle; - .mw-rcfilters-circle( @size-circle-result, @size-circle-result, 0 ); - // This is to make the dots appear at the center of the - // text itself; it's a horrendous hack and blame JamesF for it. - margin-top: -2px; - margin-right: @margin-circle-result; - } + .mw-rcfilters-ui-changesListWrapperWidget-highlighted & { + display: inline-block; + } - &-color { - &-none { - .mw-rcfilters-circle-color( @highlight-none, true ); - display: inline-block; - - .mw-rcfilters-highlight-color-c1 &, - .mw-rcfilters-highlight-color-c2 &, - .mw-rcfilters-highlight-color-c3 &, - .mw-rcfilters-highlight-color-c4 &, - .mw-rcfilters-highlight-color-c5 & { - display: none; - } + // This needs to be very specific, since these are + // position rules that should apply to all overrides + .mw-rcfilters-ui-changesListWrapperWidget & > div { + vertical-align: middle; + .mw-rcfilters-circle( @size-circle-result, @size-circle-result, 0 ); + // This is to make the dots appear at the center of the + // text itself; it's a horrendous hack and blame JamesF for it. + margin-top: -2px; + margin-right: @margin-circle-result; + float: right; + } + + &-color { + &-none { + .mw-rcfilters-circle-color( @highlight-none, true ); + display: inline-block; + + .mw-rcfilters-highlight-color-c1 &, + .mw-rcfilters-highlight-color-c2 &, + .mw-rcfilters-highlight-color-c3 &, + .mw-rcfilters-highlight-color-c4 &, + .mw-rcfilters-highlight-color-c5 & { + display: none; } - .result-circle( c1 ); - .result-circle( c2 ); - .result-circle( c3 ); - .result-circle( c4 ); - .result-circle( c5 ); } + .result-circle( c1 ); + .result-circle( c2 ); + .result-circle( c3 ); + .result-circle( c4 ); + .result-circle( c5 ); } } @@ -190,3 +191,14 @@ .mw-rcfilters-highlight-color-c1.mw-rcfilters-highlight-color-c2.mw-rcfilters-highlight-color-c3.mw-rcfilters-highlight-color-c4.mw-rcfilters-highlight-color-c5 { .highlight-results( tint( mix( @highlight-c1, mix( @highlight-c2, mix( @highlight-c3, average( @highlight-c4, @highlight-c5 ), 20% ), 20% ), 20% ), 15% ) ); } + +@media screen and ( min-width: @width-breakpoint-tablet ) { + // center conflict message + // e.g. Special:RecentChanges?goodfaith=maybebad&hidepageedits=1&hidenewpages=1&hidecategorization=1&hideWikibase=1&limit=50&days=0.0833&enhanced=1&urlversion=2 + // More context in https://phabricator.wikimedia.org/T223363#5374874 + .mw-rcfilters-ui-changesListWrapperWidget { + &-results { + width: 35em; + } + } +}