jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378797 )
Change subject: Revert "Tweak UI for main filtering entry point"
......................................................................
Revert "Tweak UI for main filtering entry point"
This reverts commit feefb51581574f3144786d7f935f34ccc947efed.
Change-Id: I37dcaf5cd0c0fa63a53da06f06827731fb87de20
---
M languages/i18n/en.json
M resources/Resources.php
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
M
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
5 files changed, 5 insertions(+), 44 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index a3560d9..75e0c5c 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1383,7 +1383,7 @@
"rcfilters-restore-default-filters": "Restore default filters",
"rcfilters-clear-all-filters": "Clear all filters",
"rcfilters-show-new-changes": "View newest changes",
- "rcfilters-search-placeholder": "Main filter menu",
+ "rcfilters-search-placeholder": "Filter recent changes (browse or start
typing)",
"rcfilters-invalid-filter": "Invalid filter",
"rcfilters-empty-filter": "No active filters. All contributions are
shown.",
"rcfilters-filterlist-title": "Filters",
diff --git a/resources/Resources.php b/resources/Resources.php
index ae8436a..246d9f3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1928,7 +1928,7 @@
'oojs-ui.styles.icons-editing-styling',
'oojs-ui.styles.icons-interactions',
'oojs-ui.styles.icons-content',
- 'oojs-ui.styles.icons-interactions',
+ 'oojs-ui.styles.icons-layout',
'oojs-ui.styles.icons-media',
],
],
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
index a6b219b..b4e3b0e 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
@@ -85,35 +85,3 @@
.highlight-changesListWrapperWidget( tint( mix( @@c1var, mix(
@@c2var, average( @@c3var, @@c4var ), 25% ), 25% ), 25% ) );
}
}
-
-.input-placeholder-color( @color, @font-weight: bold ) {
- /* stylelint-disable selector-no-vendor-prefix */
- &::-webkit-input-placeholder { /* WebKit, Blink */
- color: @color;
- font-weight: @font-weight;
- }
- &:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
- color: @color;
- opacity: 1; // Firefox's placeholder defaults with a reduced
opacity
- font-weight: @font-weight;
- }
- &::-moz-placeholder { /* Mozilla Firefox 19+ */
- color: @color;
- opacity: 1;
- font-weight: @font-weight;
- }
- &:-ms-input-placeholder { /* Internet Explorer 10-11 */
- color: @color;
- font-weight: @font-weight;
- }
- &::-ms-input-placeholder { /* Microsoft Edge */
- color: @color;
- font-weight: @font-weight;
- }
- /* stylelint-enable */
- &::placeholder {
- color: @color;
- opacity: 1;
- font-weight: @font-weight;
- }
-}
diff --git
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
index 7e7b9c3..e7233a8 100644
---
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
+++
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
@@ -1,5 +1,4 @@
-@import 'mediawiki.ui/variables';
-@import 'mw.rcfilters.mixins.less';
+@import 'mediawiki.mixins';
.mw-rcfilters-ui-filterTagMultiselectWidget {
max-width: none;
@@ -9,8 +8,6 @@
direction: ltr;
border-bottom-right-radius: 0;
height: 2.5em;
-
- .input-placeholder-color( @colorGray5 );
}
&.oo-ui-widget-enabled .oo-ui-tagMultiselectWidget-handle {
@@ -81,10 +78,6 @@
.oo-ui-labelElement.oo-ui-optionWidget.oo-ui-buttonElement:first-child {
margin-left: 0;
-
- > .oo-ui-buttonElement-button {
- color: @colorGray5;
- }
}
}
}
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 0ef27eb..df3263a 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -70,7 +70,7 @@
]
},
input: {
- icon: 'add',
+ icon: 'menu',
placeholder: mw.msg(
'rcfilters-search-placeholder' )
}
}, config ) );
@@ -313,7 +313,7 @@
this.controller.trackFilterGroupings( 'filtermenu' );
}
- this.input.setIcon( isVisible ? 'search' : 'add' );
+ this.input.setIcon( isVisible ? 'search' : 'menu' );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/378797
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37dcaf5cd0c0fa63a53da06f06827731fb87de20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Petar.petkovic <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: TTO <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
