Merge commit '438c4c897688d6c1aca6a1c0320ad4837ba99db1' into v3.x

CHANGELOG.md

@@ -1,3 +1,28 @@
+#### v3.3.6 (2023-08-22)
+
+##### Chores
+
+*  up deps (db55f18a)
+*  incrementing version number - v3.3.4 (a67f84ea)
+*  incrementing version number - v3.3.3 (f94d239b)
+*  incrementing version number - v3.3.2 (ec9dac97)
+*  incrementing version number - v3.3.1 (151cc68f)
+*  incrementing version number - v3.3.0 (fc1ad70f)
+*  incrementing version number - v3.2.3 (b06d3e63)
+*  incrementing version number - v3.2.2 (758ecfcd)
+*  incrementing version number - v3.2.1 (20145074)
+*  incrementing version number - v3.2.0 (9ecac38e)
+*  incrementing version number - v3.1.7 (0b4e81ab)
+*  incrementing version number - v3.1.6 (b3a3b130)
+*  incrementing version number - v3.1.5 (ec19343a)
+*  incrementing version number - v3.1.4 (2452783c)
+*  incrementing version number - v3.1.3 (3b4e9d3f)
+*  incrementing version number - v3.1.2 (40fa3489)
+*  incrementing version number - v3.1.1 (40250733)
+*  incrementing version number - v3.1.0 (0cb386bd)
+*  incrementing version number - v3.0.1 (26f6ea49)
+*  incrementing version number - v3.0.0 (224e08cd)
+
 #### v3.3.4 (2023-08-20)
 
 ##### Chores

public/src/admin/appearance/skins.js

@@ -18,10 +18,11 @@ define('admin/appearance/skins', [
 					$('.custom-skin-settings [data-type="list"] [data-theme]').each((i, el) => {
 						$(el).attr('data-theme', $(el).attr('data-theme').toLowerCase());
 					});
-					Skins.render(bsData);
+					highlightSelectedTheme(app.config.bootswatchSkin);
 				}
 			});
 			settings.load('custom-skins', $('.custom-skin-settings'));
+			Skins.render(bsData);
 		});
 
 		$('#save-custom-skins').on('click', function () {
@@ -89,10 +90,7 @@ define('admin/appearance/skins', [
 		}, function (html) {
 			themeContainer.html(html);
 
-			if (app.config.bootswatchSkin) {
-				const skin = app.config.bootswatchSkin;
-				highlightSelectedTheme(skin);
-			}
+			highlightSelectedTheme(app.config.bootswatchSkin);
 		});
 	};