Merge "Fix \n handling for HTMLUsersMultiselectField"

[lhc/web/wiklou.git] / resources / src / mediawiki.rcfilters / styles / mw.rcfilters.ui.FilterTagMultiselectWidget.less

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 66e6d96..5ce7988 100644 (file)
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
@@ -4,6 +4,7 @@
        .oo-ui-tagMultiselectWidget-input input {
                // Make sure this uses the interface direction, not the content direction
                direction: ltr;
+               border-bottom-right-radius: 0;
        }
 
        &.oo-ui-widget-enabled .oo-ui-tagMultiselectWidget-handle {
@@ -11,23 +12,52 @@
                border-bottom: 0;
                background-color: #f8f9fa;
                border-radius: 2px 2px 0 0;
-               padding: 0.3em 0.6em 0.6em 0.6em;
+               padding: 0.6em;
                margin-top: 1.6em;
        }
 
-       .mw-rcfilters-ui-table {
-               margin-top: 0.3em;
+       &-wrapper {
+               .mw-rcfilters-ui-table {
+                       margin-top: 0.3em;
+               }
+
+               &-content {
+                       &-title {
+                               font-weight: bold;
+                               color: #54595d;
+                       }
+
+                       &-savedQueryTitle {
+                               color: #72777d;
+                               margin-left: 1em;
+                       }
+               }
        }
 
-       &-wrapper-content {
-               &-title {
-                       font-weight: bold;
-                       color: #54595d;
+       &-views {
+               &-input {
+                       width: 100%;
                }
 
-               &-savedQueryTitle {
-                       color: #72777d;
-                       margin-left: 1em;
+               &-select {
+                       width: 1em;
+
+                       &-widget.oo-ui-widget {
+                               display: block;
+                               text-align: right;
+
+                               // Override OOUI rules
+                               &.oo-ui-buttonSelectWidget .oo-ui-buttonOptionWidget:first-child a.oo-ui-buttonElement-button,
+                               .oo-ui-buttonOptionWidget a.oo-ui-buttonElement-button {
+                                       border-radius: 0;
+                                       border-left: 0;
+                               }
+
+                               &.oo-ui-buttonSelectWidget .oo-ui-buttonOptionWidget:last-child a.oo-ui-buttonElement-button {
+                                       border-bottom-right-radius: 2px;
+                               }
+
+                       }
                }
        }
 
@@ -37,6 +67,11 @@
 
        &-cell-filters {
                width: 100%;
+
+               div.oo-ui-tagMultiselectWidget-group {
+                       margin-top: 0.2em;
+                       display: block;
+               }
        }
 
        &-cell-reset {