Merge "Upgrade skin.json schema to manifest_version 2"

skin.json

@@ -22,55 +22,85 @@
 		}
 	},
 	"config": {
-		"MinervaCountErrors": false,
+		"MinervaCountErrors": {
-		"MinervaDownloadNamespaces": [
+			"value": false
-			0
+		},
-		],
+		"MinervaDownloadNamespaces": {
-		"MinervaEnableSiteNotice": false,
+			"value": [
-		"MinervaCustomLogos": [],
+				0
-		"MinervaApplyKnownTemplateHacks": false,
+			]
-		"MinervaPageActions": [
+		},
-			"edit",
+		"MinervaEnableSiteNotice": {
-			"talk",
+			"value": false
-			"watch",
+		},
-			"switch-language"
+		"MinervaCustomLogos": {
-		],
+			"value": []
-		"MinervaAlwaysShowLanguageButton": true,
+		},
+		"MinervaApplyKnownTemplateHacks": {
+			"value": false
+		},
+		"MinervaPageActions": {
+			"value": [
+				"edit",
+				"talk",
+				"watch",
+				"switch-language"
+			]
+		},
+		"MinervaAlwaysShowLanguageButton": {
+			"value": true
+		},
 		"MinervaTalkAtTop": {
-			"base": false,
+			"value": {
-			"beta": false,
+				"base": false,
-			"loggedin": true
+				"beta": false,
+				"loggedin": true
+			}
 		},
 		"MinervaAdvancedMainMenu": {
-			"base": false,
+			"value": {
-			"beta": false,
+				"base": false,
-			"amc": true
+				"beta": false,
+				"amc": true
+			}
 		},
 		"MinervaPersonalMenu": {
-			"base": false,
+			"value": {
-			"beta": false,
+				"base": false,
-			"amc": true
+				"beta": false,
+				"amc": true
+			}
 		},
 		"MinervaHistoryInPageActions": {
-			"base": false,
+			"value": {
-			"beta": false,
+				"base": false,
-			"loggedin": true
+				"beta": false,
+				"loggedin": true
+			}
 		},
 		"MinervaOverflowInPageActions": {
-			"base": false,
+			"value": {
-			"beta": false,
+				"base": false,
-			"amc": true
+				"beta": false,
+				"amc": true
+			}
 		},
 		"MinervaShowCategoriesButton": {
-			"base": false,
+			"value": {
-			"beta": true,
+				"base": false,
-			"amc": true
+				"beta": true,
+				"amc": true
+			}
 		},
 		"MinervaPageIssuesNewTreatment": {
-			"base": true,
+			"value": {
-			"beta": true
+				"base": true,
+				"beta": true
+			}
 		},
-		"MinervaABSamplingRate": 0
+		"MinervaABSamplingRate": {
+			"value": 0
+		}
 	},
 	"ValidSkinNames": {
 		"minerva": "MinervaNeue"
@@ -117,7 +147,6 @@
 		"ResourceLoaderGetConfigVars": [
 			"MinervaHooks::onResourceLoaderGetConfigVars"
 		]
-
 	},
 	"MessagesDirs": {
 		"MinervaNeue": [
@@ -212,8 +241,12 @@
 			]
 		}
 	},
-	"EventLoggingSchemas": {
+	"attributes": {
-		"WebClientError": 18340282
+		"EventLogging": {
+			"Schemas": {
+				"WebClientError": 18340282
+			}
+		}
 	},
 	"ResourceModules": {
 		"skins.minerva.base.styles": {
@@ -396,9 +429,18 @@
 			"selectorWithVariant": ".mw-ui-icon-minerva-{name}-{variant}:before",
 			"defaultColor": "#54595d",
 			"variants": {
-				"lowColor": { "color": "#fc3", "global": true },
+				"lowColor": {
-				"mediumColor": { "color": "#ff5d01", "global": true },
+					"color": "#fc3",
-				"highColor": { "color": "#d33", "global": true }
+					"global": true
+				},
+				"mediumColor": {
+					"color": "#ff5d01",
+					"global": true
+				},
+				"highColor": {
+					"color": "#d33",
+					"global": true
+				}
 			},
 			"images": {
 				"issue-generic": "resources/skins.minerva.icons.page.issues.default.color/issue-generic.svg"
@@ -475,13 +517,13 @@
 			"images": {
 				"recentchanges": {
 					"file": {
-						"ltr":"resources/skins.minerva.mainMenu.advanced.icons/recentChanges-ltr.svg",
+						"ltr": "resources/skins.minerva.mainMenu.advanced.icons/recentChanges-ltr.svg",
 						"rtl": "resources/skins.minerva.mainMenu.advanced.icons/recentChanges-rtl.svg"
 					}
 				},
 				"specialpages": {
 					"file": {
-						"ltr":"resources/skins.minerva.mainMenu.advanced.icons/specialpages-ltr.svg",
+						"ltr": "resources/skins.minerva.mainMenu.advanced.icons/specialpages-ltr.svg",
 						"rtl": "resources/skins.minerva.mainMenu.advanced.icons/specialpages-rtl.svg"
 					}
 				},
@@ -502,7 +544,7 @@
 				"contributions": {
 					"file": {
 						"ltr": "resources/skins.minerva.mainMenu.icons/contributions-ltr.svg",
-						"rtl":  "resources/skins.minerva.mainMenu.icons/contributions-rtl.svg"
+						"rtl": "resources/skins.minerva.mainMenu.icons/contributions-rtl.svg"
 					}
 				},
 				"login": {
@@ -640,7 +682,6 @@
 			],
 			"packageFiles": [
 				"resources/skins.minerva.options/index.js",
-
 				"resources/skins.minerva.options/categories.js"
 			]
 		}
@@ -678,5 +719,5 @@
 	"ServiceWiringFiles": [
 		"includes/ServiceWiring.php"
 	],
-	"manifest_version": 1
+	"manifest_version": 2
 }