147524 2015-08-01 00:40:59 -0700 Web Inspector: Replace "unknown-mac" CSS class with "el-capitan" 2015-08-04 14:53:20 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 nvasilyev nvasilyev commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1114000 0 nvasilyev 2015-08-01 00:40:59 -0700 "unknown-mac" CSS class was introduced in https://bugs.webkit.org/show_bug.cgi?id=145419, before El Capitan announcement. It shouldn't be called "unknown" anymore. 1114001 1 258000 nvasilyev 2015-08-01 00:44:28 -0700 Created attachment 258000 Patch 1114018 2 258000 timothy 2015-08-01 03:04:22 -0700 Comment on attachment 258000 Patch Great! 1114019 3 258000 timothy 2015-08-01 03:06:33 -0700 Comment on attachment 258000 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258000&action=review > Source/WebInspectorUI/UserInterface/Views/Toolbar.css:161 > +body.el-capitan .toolbar .search-bar > input[type="search"] { All these rules that don't use :not(.el-cap) will need to change before the next release. Let's fix that in a follow up. 1114021 4 258000 commit-queue 2015-08-01 03:55:36 -0700 Comment on attachment 258000 Patch Clearing flags on attachment: 258000 Committed r187715: <http://trac.webkit.org/changeset/187715> 1114022 5 commit-queue 2015-08-01 03:55:41 -0700 All reviewed patches have been landed. Closing bug. 1114024 6 258000 nvasilyev 2015-08-01 05:25:47 -0700 Comment on attachment 258000 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258000&action=review >> Source/WebInspectorUI/UserInterface/Views/Toolbar.css:161 >> +body.el-capitan .toolbar .search-bar > input[type="search"] { > > All these rules that don't use :not(.el-cap) will need to change before the next release. Let's fix that in a follow up. I'm not following. What will they need to change for? 1114031 7 258000 timothy 2015-08-01 09:32:39 -0700 Comment on attachment 258000 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258000&action=review >>> Source/WebInspectorUI/UserInterface/Views/Toolbar.css:161 >>> +body.el-capitan .toolbar .search-bar > input[type="search"] { >> >> All these rules that don't use :not(.el-cap) will need to change before the next release. Let's fix that in a follow up. > > I'm not following. What will they need to change for? When the system isn't el-capitan for the next release, they will be unknown-mac again, these styles will revert to the old look. That is why most of these rules are about styling the old (body:not(.el-capitan)), so all future releases keep the new look. 1114155 8 nvasilyev 2015-08-03 02:47:09 -0700 We currently have 2 versions in our CSS: — body:not(.el-capitan) for OS X <10.11 — body.el-capitan for OS X 10.11 There is a problem that 10.12, or anything >10.11 for that matter, currently gets "unknown-mac" class and falls into body:not(.el-capitan) selector. We don't want that; we want 10.12 to have El Capitan styles until we introduce a new version. WebInspector.Platform.version.name is currently used to add a corresponding class name to <body>. What if we do something like this instead: if (WebInspector.Platform.version.release <= 10) document.body.classList.add("legacy"); else if (WebInspector.Platform.version.release >= 11) document.body.classList.add("latest-mac"); CSS selectors: — body.legacy — body.latest-mac It would eliminate the need for :not() selector. Later, when we need to have a new (third) UI version, we would: — Keep .legacy CSS rules unchanged — Rename all .latest-mac to .el-capipan — Write all new rules under .latest-mac prefix What do you think? 1114788 9 timothy 2015-08-04 14:53:20 -0700 That is fine with me. 258000 2015-08-01 00:44:28 -0700 2015-08-01 03:55:36 -0700 Patch patch.txt text/plain 8988 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQxZTUyMjcuLmYyYjIzMGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE1LTA4LTAxICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlcGxh Y2UgInVua25vd24tbWFjIiBDU1MgY2xhc3Mgd2l0aCAiZWwtY2FwaXRhbiIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzUyNAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNl L1BsYXRmb3JtLmpzOgorICAgICAgICBObyBuZWVkIHRvIHJlcGVhdCBXZWJJbnNwZWN0b3IuUGxh dGZvcm0udmVyc2lvbi5yZWxlYXNlIGZvciBldmVyeSBwb3NzaWJsZSBjYXNlLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9Ub29sYmFyLmNzczoKKyAgICAgICAgKGJvZHk6bm90KC5l bC1jYXBpdGFuKSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lcik6CisgICAgICAgIChib2R5 Om5vdCguZWwtY2FwaXRhbikgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFy Y2giXSk6CisgICAgICAgIChib2R5Om5vdCguZWwtY2FwaXRhbikgLnRvb2xiYXIgLnNlYXJjaC1i YXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTpmb2N1cyk6CisgICAgICAgIChib2R5Om5vdCguZWwt Y2FwaXRhbikgLnRvb2xiYXIgLml0ZW0uYnV0dG9uOmFjdGl2ZSk6CisgICAgICAgIChib2R5Lndp bmRvdy1pbmFjdGl2ZTpub3QoLmVsLWNhcGl0YW4pIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFp bmVyKToKKyAgICAgICAgKGJvZHkuZWwtY2FwaXRhbiAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRh aW5lcik6CisgICAgICAgIChib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBp bnB1dFt0eXBlPSJzZWFyY2giXSk6CisgICAgICAgIChib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIg LnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTpmb2N1cyk6CisgICAgICAgIChAbWVk aWEgKC13ZWJraXQtbWluLWRldmljZS1waXhlbC1yYXRpbzogMikpOgorICAgICAgICAoYm9keS5l bC1jYXBpdGFuIC50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUpOgorICAgICAgICAoYm9keS5l bC1jYXBpdGFuLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lcik6 CisgICAgICAgIChib2R5Om5vdCgudW5rbm93bi1tYWMpIC50b29sYmFyIC5kYXNoYm9hcmQtY29u dGFpbmVyKTogRGVsZXRlZC4KKyAgICAgICAgKGJvZHk6bm90KC51bmtub3duLW1hYykgLnRvb2xi YXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSk6IERlbGV0ZWQuCisgICAgICAg IChib2R5Om5vdCgudW5rbm93bi1tYWMpIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlw ZT0ic2VhcmNoIl06Zm9jdXMpOiBEZWxldGVkLgorICAgICAgICAoYm9keTpub3QoLnVua25vd24t bWFjKSAudG9vbGJhciAuaXRlbS5idXR0b246YWN0aXZlKTogRGVsZXRlZC4KKyAgICAgICAgKGJv ZHkud2luZG93LWluYWN0aXZlOm5vdCgudW5rbm93bi1tYWMpIC50b29sYmFyIC5kYXNoYm9hcmQt Y29udGFpbmVyKTogRGVsZXRlZC4KKyAgICAgICAgKGJvZHkudW5rbm93bi1tYWMgLnRvb2xiYXIg LmRhc2hib2FyZC1jb250YWluZXIpOiBEZWxldGVkLgorICAgICAgICAoYm9keS51bmtub3duLW1h YyAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdKTogRGVsZXRlZC4K KyAgICAgICAgKGJvZHkudW5rbm93bi1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0 eXBlPSJzZWFyY2giXTpmb2N1cyk6IERlbGV0ZWQuCisgICAgICAgIChib2R5LnVua25vd24tbWFj IC50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUpOiBEZWxldGVkLgorICAgICAgICAoYm9keS51 bmtub3duLW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIp OiBEZWxldGVkLgorCiAyMDE1LTA3LTMxICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBpbmhlcml0ZWQgQ1NTIHJ1bGVzIGRpc2FwcGVh ciBmcm9tIFN0eWxlcyBzaWRlYmFyIHdoaWxlIGVkaXRpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvUGxhdGZvcm0uanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1BsYXRmb3JtLmpzCmluZGV4IDM5ZDQ5OTUu LmUzZGRjZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvUGxhdGZvcm0uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9QbGF0Zm9ybS5qcwpAQCAtNDIsMjIgKzQyLDIyIEBAIFdlYkluc3BlY3Rvci5QbGF0 Zm9ybSA9IHsKICAgICB2YXIgb3NWZXJzaW9uTWF0Y2ggPSAvIE1hYyBPUyBYIChcZCspXyhcZCsp Ly5leGVjKG5hdmlnYXRvci5hcHBWZXJzaW9uKTsKICAgICBpZiAob3NWZXJzaW9uTWF0Y2ggJiYg b3NWZXJzaW9uTWF0Y2hbMV0gPT09ICIxMCIpIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRm b3JtLnZlcnNpb24uYmFzZSA9IDEwOworICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVy c2lvbi5yZWxlYXNlID0gcGFyc2VJbnQob3NWZXJzaW9uTWF0Y2hbMl0pOwogICAgICAgICBzd2l0 Y2gob3NWZXJzaW9uTWF0Y2hbMl0pIHsKKyAgICAgICAgICAgIGNhc2UgIjExIjoKKyAgICAgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5uYW1lID0gImVsLWNhcGl0YW4i OworICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSAiMTAiOgogICAgICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLm5hbWUgPSAieW9zZW1pdGUi OwotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2Ug PSAxMDsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgIjkiOgogICAg ICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLm5hbWUgPSAibWF2ZXJp Y2tzIjsKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxl YXNlID0gOTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgIjgiOgog ICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLm5hbWUgPSAibW91 bnRhaW4tbGlvbiI7Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNp b24ucmVsZWFzZSA9IDg7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBkZWZh dWx0OgogICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLm5hbWUg PSAidW5rbm93bi1tYWMiOwotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52 ZXJzaW9uLnJlbGVhc2UgPSBwYXJzZUludChvc1ZlcnNpb25NYXRjaFsyXSk7CiAgICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Ub29sYmFyLmNzcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rvb2xiYXIuY3NzCmluZGV4IGM3NDA0MzUuLjE4 ZmI1YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Rvb2xiYXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Rvb2xiYXIuY3NzCkBAIC0xMTQsOSArMTE0LDkgQEAgYm9keS5tYWMtcGxhdGZvcm06 bm90KC5kb2NrZWQpIC50b29sYmFyIHsKICAgICBtYXJnaW4tbGVmdDogNHB4OwogfQogCi1ib2R5 Om5vdCgudW5rbm93bi1tYWMpIC50b29sYmFyIC5pdGVtLmJ1dHRvbiwKLWJvZHk6bm90KC51bmtu b3duLW1hYykgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwKLWJv ZHk6bm90KC51bmtub3duLW1hYykgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgeworYm9k eTpub3QoLmVsLWNhcGl0YW4pIC50b29sYmFyIC5pdGVtLmJ1dHRvbiwKK2JvZHk6bm90KC5lbC1j YXBpdGFuKSAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdLAorYm9k eTpub3QoLmVsLWNhcGl0YW4pIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKICAgICBi YWNrZ3JvdW5kLWNvbG9yOiBoc2woMCwgMCUsIDk5JSk7CiAgICAgYm9yZGVyOiAxcHggc29saWQg dHJhbnNwYXJlbnQ7CiAgICAgYm9yZGVyLXRvcC1jb2xvcjogaHNsKDAsIDAlLCAxMDAlKTsKQEAg LTEyNCwzMSArMTI0LDMxIEBAIGJvZHk6bm90KC51bmtub3duLW1hYykgLnRvb2xiYXIgLmRhc2hi b2FyZC1jb250YWluZXIgewogICAgIGJvcmRlci1yYWRpdXM6IDRweDsKIH0KIAotYm9keTpub3Qo LnVua25vd24tbWFjKSAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJd IHsKK2JvZHk6bm90KC5lbC1jYXBpdGFuKSAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5 cGU9InNlYXJjaCJdIHsKICAgICBib3gtc2hhZG93OiAwIDAgMCA3cHggaHNsYSgyMTEsIDk2JSwg NDglLCAwKTsKICAgICB0cmFuc2l0aW9uOiBib3gtc2hhZG93IC4yNXMgY3ViaWMtYmV6aWVyKDAu MTY1LCAwLjg0MCwgMC40NDAsIDEpIC8qIGVhc2VPdXRRdWFydCAqLzsKIH0KIAotYm9keTpub3Qo LnVua25vd24tbWFjKSAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJd OmZvY3VzIHsKK2JvZHk6bm90KC5lbC1jYXBpdGFuKSAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlu cHV0W3R5cGU9InNlYXJjaCJdOmZvY3VzIHsKICAgICBib3gtc2hhZG93OiBoc2xhKDAsIDAlLCAw JSwgMC4xNSkgMCAxcHggMCwgMCAwIDAgM3B4IGhzbGEoMjExLCA5NiUsIDQ4JSwgMC40KTsKIH0K IAotYm9keTpub3QoLnVua25vd24tbWFjKSAudG9vbGJhciAuaXRlbS5idXR0b246YWN0aXZlIHsK K2JvZHk6bm90KC5lbC1jYXBpdGFuKSAudG9vbGJhciAuaXRlbS5idXR0b246YWN0aXZlIHsKICAg ICBib3JkZXItdG9wLWNvbG9yOiBoc2woMCwgMCUsIDk0JSk7CiAgICAgYmFja2dyb3VuZC1jb2xv cjogaHNsKDAsIDAlLCA4OSUpOwogfQogCi1ib2R5LndpbmRvdy1pbmFjdGl2ZTpub3QoLnVua25v d24tbWFjKSAudG9vbGJhciAuaXRlbS5idXR0b24sCi1ib2R5LndpbmRvdy1pbmFjdGl2ZTpub3Qo LnVua25vd24tbWFjKSAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJd LAotYm9keS53aW5kb3ctaW5hY3RpdmU6bm90KC51bmtub3duLW1hYykgLnRvb2xiYXIgLmRhc2hi b2FyZC1jb250YWluZXIgeworYm9keS53aW5kb3ctaW5hY3RpdmU6bm90KC5lbC1jYXBpdGFuKSAu dG9vbGJhciAuaXRlbS5idXR0b24sCitib2R5LndpbmRvdy1pbmFjdGl2ZTpub3QoLmVsLWNhcGl0 YW4pIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCitib2R5Lndp bmRvdy1pbmFjdGl2ZTpub3QoLmVsLWNhcGl0YW4pIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFp bmVyIHsKICAgICBib3JkZXI6IDFweCBzb2xpZCBoc2woMCwgMCUsIDg2JSk7CiAgICAgYmFja2dy b3VuZC1jb2xvcjogaHNsKDAsIDAlLCA5NiUpOwogICAgIGJveC1zaGFkb3c6IG5vbmU7CiB9CiAK LWJvZHkudW5rbm93bi1tYWMgLnRvb2xiYXIgLml0ZW0uYnV0dG9uLAotYm9keS51bmtub3duLW1h YyAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdLAotYm9keS51bmtu b3duLW1hYyAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7Citib2R5LmVsLWNhcGl0YW4g LnRvb2xiYXIgLml0ZW0uYnV0dG9uLAorYm9keS5lbC1jYXBpdGFuIC50b29sYmFyIC5zZWFyY2gt YmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCitib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLmRh c2hib2FyZC1jb250YWluZXIgewogICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVu dChoc2woMCwgMCUsIDk5JSksIGhzbCgwLCAwJSwgOTQlKSk7CiAgICAgYm94LXNoYWRvdzogaHNs YSgwLCAwJSwgMCUsIDAuMykgMCAxcHggMXB4IC0xcHg7CiAKQEAgLTE1OCwzMyArMTU4LDMzIEBA IGJvZHkudW5rbm93bi1tYWMgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgewogICAgIGJv cmRlci1ib3R0b20tY29sb3I6IGhzbCgwLCAwJSwgNzYlKTsKIH0KIAotYm9keS51bmtub3duLW1h YyAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdIHsKK2JvZHkuZWwt Y2FwaXRhbiAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdIHsKICAg ICBib3gtc2hhZG93OiBoc2xhKDAsIDAlLCAwJSwgMC4zKSAwIDFweCAxcHggLTFweCwgMCAwIDAg N3B4IGhzbGEoMjExLCA5NiUsIDQ4JSwgMCk7CiAgICAgdHJhbnNpdGlvbjogYm94LXNoYWRvdyAu MjVzIGN1YmljLWJlemllcigwLjE2NSwgMC44NDAsIDAuNDQwLCAxKSAvKiBlYXNlT3V0UXVhcnQg Ki87CiB9CiAKLWJvZHkudW5rbm93bi1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0 eXBlPSJzZWFyY2giXTpmb2N1cyB7Citib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLnNlYXJjaC1i YXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTpmb2N1cyB7CiAgICAgYm94LXNoYWRvdzogaHNsYSgw LCAwJSwgMCUsIDAuMTUpIDAgMXB4IDAsIDAgMCAwIDNweCBoc2xhKDIxMSwgOTYlLCA0OCUsIDAu NCk7CiB9CiAKIEBtZWRpYSAoLXdlYmtpdC1taW4tZGV2aWNlLXBpeGVsLXJhdGlvOiAyKSB7Ci0g ICAgYm9keS51bmtub3duLW1hYyAudG9vbGJhciAuaXRlbS5idXR0b24sCi0gICAgYm9keS51bmtu b3duLW1hYyAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdLAotICAg IGJvZHkudW5rbm93bi1tYWMgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgeworICAgIGJv ZHkuZWwtY2FwaXRhbiAudG9vbGJhciAuaXRlbS5idXR0b24sCisgICAgYm9keS5lbC1jYXBpdGFu IC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCisgICAgYm9keS5l bC1jYXBpdGFuIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKICAgICAgICAgYm9yZGVy OiAwLjVweCBzb2xpZCBoc2woMCwgMCUsIDc4JSk7CiAgICAgICAgIGJvcmRlci10b3AtY29sb3I6 IGhzbCgwLCAwJSwgODAlKTsKICAgICAgICAgYm9yZGVyLWJvdHRvbS1jb2xvcjogaHNsKDAsIDAl LCA2NSUpOwogICAgIH0KIH0KIAotYm9keS51bmtub3duLW1hYyAudG9vbGJhciAuaXRlbS5idXR0 b246YWN0aXZlIHsKK2JvZHkuZWwtY2FwaXRhbiAudG9vbGJhciAuaXRlbS5idXR0b246YWN0aXZl IHsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQoaHNsKDAsIDAlLCA4OSUp LCBoc2woMCwgMCUsIDg2JSkpOwogICAgIGJveC1zaGFkb3c6IGhzbGEoMCwgMCUsIDAlLCAwLjMp IDAgMXB4IDFweCAtMXB4LCBpbnNldCAwIDFweCAxcHggLTFweCB3aGl0ZTsKIH0KIAotYm9keS51 bmtub3duLW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLml0ZW0uYnV0dG9uLAotYm9keS51 bmtub3duLW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0 eXBlPSJzZWFyY2giXSwKLWJvZHkudW5rbm93bi1tYWMud2luZG93LWluYWN0aXZlIC50b29sYmFy IC5kYXNoYm9hcmQtY29udGFpbmVyIHsKK2JvZHkuZWwtY2FwaXRhbi53aW5kb3ctaW5hY3RpdmUg LnRvb2xiYXIgLml0ZW0uYnV0dG9uLAorYm9keS5lbC1jYXBpdGFuLndpbmRvdy1pbmFjdGl2ZSAu dG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdLAorYm9keS5lbC1jYXBp dGFuLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiAgICAg b3BhY2l0eTogMC42NTsKICAgICBib3JkZXItY29sb3I6IGhzbGEoMCwgMCUsIDAlLCAwLjE1KTsK ICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKQEAgLTE5Miw5ICsxOTIsOSBAQCBi b2R5LnVua25vd24tbWFjLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRh aW5lciB7CiB9CiAKIEBtZWRpYSAoLXdlYmtpdC1taW4tZGV2aWNlLXBpeGVsLXJhdGlvOiAyKSB7 Ci0gICAgYm9keS51bmtub3duLW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLml0ZW0uYnV0 dG9uLAotICAgIGJvZHkudW5rbm93bi1tYWMud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5zZWFy Y2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCi0gICAgYm9keS51bmtub3duLW1hYy53aW5k b3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgeworICAgIGJvZHkuZWwt Y2FwaXRhbi53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLml0ZW0uYnV0dG9uLAorICAgIGJvZHku ZWwtY2FwaXRhbi53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0 eXBlPSJzZWFyY2giXSwKKyAgICBib2R5LmVsLWNhcGl0YW4ud2luZG93LWluYWN0aXZlIC50b29s YmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKICAgICAgICAgYm94LXNoYWRvdzogaW5zZXQgMCAw IDFweCAwIGhzbGEoMCwgMCUsIDAlLCAwLjEpOwogICAgIH0KIH0K