From af90386c67fd39bff0dff366dac66f914d0364d0 Mon Sep 17 00:00:00 2001
From: Jdlrobson <jrobson@wikimedia.org>
Date: Fri, 27 Oct 2023 21:59:46 +0000
Subject: [PATCH] Revert "Removing mw.ui.checkbox dependency"

This reverts commit 85d9a7b0ed6c382ea3df4bb84c5ae87ac456faef.

Reason for revert: Unexpected visual change flagged by Pixel.
We're now loading BOTH codex search and Codex
styles on page load (the latter via JavaScript). This results in
a visual regression in the sidebar as the message box for
languages switches from MediaWiki UI to Codex. I am not 100% sure
what the right approach is here, but we should pause to assess
given this new learning.

Possible options
1) Add checkbox styles to codex-search bundle
2) Load codex-styles on page load instead of codex-search
3) Delay the loading of the codex-styles until the overlay is
rendering
4) Wait until Codex has code splitting.

Change-Id: I633364fea54b048492c6bde10b4c4cc8ab99b9ae
---
 extension.json                                |   3 ++-
 resources/dist/index.js                       | Bin 47836 -> 47703 bytes
 resources/dist/index.js.map.json              | Bin 216563 -> 216430 bytes
 .../settingsDialog/settingsDialog.js          |   8 +++-----
 .../settingsDialog/settingsDialog.less        |   6 ++++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/extension.json b/extension.json
index 808dfd31c..ce262e7d3 100644
--- a/extension.json
+++ b/extension.json
@@ -198,10 +198,11 @@
 				"mediawiki.jqueryMsg",
 				"mediawiki.storage",
 				"mediawiki.Title",
+				"mediawiki.ui.checkbox",
 				"mediawiki.Uri",
 				"mediawiki.user",
 				"mediawiki.util",
-				"codex-styles"
+				"codex-search-styles"
 			]
 		}
 	},
diff --git a/resources/dist/index.js b/resources/dist/index.js
index 3147a01bcfdbf2d154dda30c86824d7ab533904c..b7e8d22ca40082a6f547389f3102daa90df87e0a 100644
GIT binary patch
delta 299
zcmccfmFfByrVZ;X7+oi?w`dcqu&u7OPAknzF3HT#QwY&W)hW@euGs8td4h@ARU>oq
zUT4Y8`ZjNw8C^HaI?M%8yPY3`sJZUzSy^+-bxSiR`}-c6eASPi%_b)?DK%&FTE7}g
zpaQK9Uk;{<)X4|=v?h1*2y$uagrwT$>E&ruY~DBFsWj03iEI*^_pIS$sdr7)OUutM
zNiFip%*)m&(bUv&2RZ~OngisAWR~QlY9PdlQu9($i!|~PBE=<%CB<bLB|4c%VwHKx
wp~b01!Ko!BnR)5O8hJ=^FtHMyB9JHx$g;^E8)bp6PTN?;!dS8S;nv?Q0IxJ@X8-^I

delta 427
zcmccqh3U>$rVZ;X7%L{Pw`db{wXLqTPAknzF3HT#QwY&W)hW@ecHQi4d4h?#LL+nX
zUT4Y8`ZjNw87nr+I?M%8yPY3`sJZUzS(%elDkcZ|9-6$*SD-#QC$YHLRvjp$o1BrF
zoSl?k5g(tKS5R7_ZWogmQ-Xjt#RZ9Z3J~=%N@yCA^Ydbq?9}p-iVLi5^g$}ob>}1|
zrRHF07lc>{mW)wSNXsvp<S#av)lYVFyq~Kj(7{XFeL0w1Qzswf)0!+dL5k6Jv*m=R
z(!gMt$R;tFqk?a8FDu7p-!-3so}28rLDae;RWBzqFFPc&BqvovQ&Yzs7&bt$qSU;U
z)FO?1gh+8oVo7nCMu|=)Ol<PR4brASwZ*9=C7F5Y#Xz|tm|Ut}L1KDpS!QZENH|eb
evsS}LCrc++r%cCLr(*NN4OJ{ar^Rgj%>n>?xtk6E

diff --git a/resources/dist/index.js.map.json b/resources/dist/index.js.map.json
index 4483de3ca94669cdfacac3ff1770387b72121290..33d61f816ed3ebf72ef8ab9dfeac326c4c1230dc 100644
GIT binary patch
delta 164
zcmex7oA=!;-VKwAIEtN%oOS#iizd%1TE%EE*|k{D&&b8mKi|nw$JH^Qz)2_9*)h<^
z(gny1^47_Ab_|Xv4*_yQ!gb7?9m4}m{dK$@9es5?9Zj8Fbc}o)Go3>!{ecRyoP%`?
zoE`HgA1sz)%xJz-y!}owW4aD&Zn<u0=5)6OjN7O0T*%1JWs{Sbl$xWEmR~ge;Q~gP
OcA(()oeP<))&Ky?DLDWD

delta 269
zcmaDii}&+v-VKwAILe)ioOS#i%O=k%TE$pC*|k{DFWc8KINilj$JH?;!$l|8*)i0|
z(gny1^VZ3Bb_|aw4*_x_!gb7?9TNjg{dK$@9es5?9W9+)bc}o)bDcvf{ecSdoP%`?
zoE?iNA1sz)%xS(;y!}owW4aD=a!SQ?j|Gg|wPNyON|0f4PGWJftvXO%H#s9UIXfx8
zB0fGdub{MK`mVW*GRiSZXi~}fc`-_MYI#Y;1=cqD#RZ9Z)Bi7E6jOv4gswa%F)1}C
aMoA$pzi7I_Tt?A$-Gz+Xbr&)@t^oj^++Uag

diff --git a/src/ui/templates/settingsDialog/settingsDialog.js b/src/ui/templates/settingsDialog/settingsDialog.js
index c9998c398..b31ee0950 100644
--- a/src/ui/templates/settingsDialog/settingsDialog.js
+++ b/src/ui/templates/settingsDialog/settingsDialog.js
@@ -72,15 +72,13 @@ export function renderSettingsDialog( model ) {
 			<main id='mwe-popups-settings-form'>
 				<form>
 					${choices.map( ( { id, name, description, isChecked } ) => `
-					<p class="cdx-checkbox">
+					<p class="mw-ui-checkbox">
 						<input
 							${isChecked ? 'checked' : ''}
 							value='${id}'
 							type='checkbox'
-							id='mwe-popups-settings-${id}'
-							class='cdx-checkbox__input'>
-						<span class="cdx-checkbox__icon">&nbsp;</span>
-						<label class="cdx-checkbox__label" for='mwe-popups-settings-${id}'>
+							id='mwe-popups-settings-${id}'>
+						<label for='mwe-popups-settings-${id}'>
 							<span>${name}</span>
 							${description}
 						</label>
diff --git a/src/ui/templates/settingsDialog/settingsDialog.less b/src/ui/templates/settingsDialog/settingsDialog.less
index 770a2bb0f..c7fb6dade 100644
--- a/src/ui/templates/settingsDialog/settingsDialog.less
+++ b/src/ui/templates/settingsDialog/settingsDialog.less
@@ -59,12 +59,14 @@
 				margin-right: 60px;
 			}
 
+			input {
+				margin-right: 10px;
+			}
+
 			label {
 				font-size: 13px;
 				line-height: 16px;
 				width: 300px;
-				margin-left: 10px;
-				flex-direction: column;
 
 				> span {
 					color: @color-emphasized;