From d798a5ad6cb057a07100522b76816acc9ae0ecc1 Mon Sep 17 00:00:00 2001 From: Nardog Date: Sun, 11 Feb 2024 00:42:48 +0000 Subject: [PATCH] Update toolbar group hiding logic Accommodate upstream change in WikiEditor (Iff6d806). Bug: T357222 Change-Id: I10e06d129677e7ac40199a31e4bad7914dda993c --- modules/jquery.codeEditor.less | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/modules/jquery.codeEditor.less b/modules/jquery.codeEditor.less index 0902e36a..8164f961 100644 --- a/modules/jquery.codeEditor.less +++ b/modules/jquery.codeEditor.less @@ -2,10 +2,14 @@ /* stylelint-disable selector-class-pattern */ -.group-codeeditor-format, -.group-codeeditor-style, -.codeEditor-ui-toolbar .group-insert, -.codeEditor-ui-toolbar .group-format, +.wikiEditor-ui-toolbar .group-codeeditor-style { + border-right: 0; +} + +.wikiEditor-ui-toolbar:not( .codeEditor-ui-toolbar ) .group-codeeditor-format, +.wikiEditor-ui-toolbar:not( .codeEditor-ui-toolbar ) .group-codeeditor-style, +.codeEditor-ui-toolbar .group-insert.group, +.codeEditor-ui-toolbar .group-format.group, .codeEditor-ui-toolbar .tabs span.tab-advanced, .codeEditor-ui-toolbar .tabs span.tab-characters, .codeEditor-ui-toolbar .tabs span.tab-help, @@ -13,21 +17,12 @@ display: none; } -.codeEditor-ui-toolbar .group-codeeditor-format, -.codeEditor-ui-toolbar .group-codeeditor-style { - display: block; -} - .wikiEditor-ui .ace_editor { /* Same as mw-editfont-monospace, repeated for higher specificity */ font-size: 13px; font-family: monospace, monospace; } -.wikiEditor-ui-toolbar .group-codeeditor-style { - border-right: 0; -} - .ace_editor textarea, .ace_editor input { /* Inherit directionality from editor, not sitedir (T186329) */