From a971a884394894b5e05722bba5111335171116fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Mon, 20 Mar 2023 13:41:11 -0400 Subject: [PATCH 1/3] docs: Update themes docs (cherry picked from commit b338eff8b0f08bb2b6c91f1734f7cea80b45fca1) --- doc/import_external_docs.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/import_external_docs.ps1 b/doc/import_external_docs.ps1 index e359f88ad886..809e5cd31883 100644 --- a/doc/import_external_docs.ps1 +++ b/doc/import_external_docs.ps1 @@ -3,7 +3,7 @@ Set-PSDebug -Trace 1 $external_docs = @( @("https://github.com/unoplatform/uno.wasm.bootstrap", "uno.wasm.bootstrap", "4abadfc93ffeddc82420cc28af04cd7f6b2693ab"), - @("https://github.com/unoplatform/uno.themes", "uno.themes", "3763223a6337c318743879cda31eb9c226327e7f"), + @("https://github.com/unoplatform/uno.themes", "uno.themes", "3d12f341f3ce9ecd7738e163a3a0904e9b94466f"), @("https://github.com/unoplatform/uno.toolkit.ui", "uno.toolkit.ui", "e6bd3390e8b21ab649294ee591d7f134f8d56197"), @("https://github.com/unoplatform/uno.check", "uno.check", "5dec33b3cb4c26f578c8d6bd7a84000bf265a14e"), @("https://github.com/unoplatform/uno.xamlmerge.task", "uno.xamlmerge.task", "7e8ffef206e87dfea90c53805c45e93a7d8c0b46"), From 6c527be6df3a4946a674edc4d621f0bdcf7ac5aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Mon, 20 Mar 2023 14:08:57 -0400 Subject: [PATCH 2/3] docs: Update resizetizer (cherry picked from commit 77eb2c23bc09cfb02593a87a42ac9fb38c710f44) # Conflicts: # doc/import_external_docs.ps1 --- doc/import_external_docs.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/import_external_docs.ps1 b/doc/import_external_docs.ps1 index 809e5cd31883..d61defa92e59 100644 --- a/doc/import_external_docs.ps1 +++ b/doc/import_external_docs.ps1 @@ -8,7 +8,11 @@ $external_docs = @("https://github.com/unoplatform/uno.check", "uno.check", "5dec33b3cb4c26f578c8d6bd7a84000bf265a14e"), @("https://github.com/unoplatform/uno.xamlmerge.task", "uno.xamlmerge.task", "7e8ffef206e87dfea90c53805c45e93a7d8c0b46"), @("https://github.com/unoplatform/figma-docs", "figma-docs", "a740582020509f9947fbf991628075a4717bff0a"), +<<<<<<< HEAD @("https://github.com/unoplatform/uno.resizetizer", "uno.resizetizer", "e23dfa53da77e48510173e99a29c260b08b826f5"), +======= + @("https://github.com/unoplatform/uno.resizetizer", "uno.resizetizer", "f650e844cb66a7dafa084a7e778f14f4fd3ce8a2"), +>>>>>>> 77eb2c23bc (docs: Update resizetizer) @("https://github.com/unoplatform/uno.uitest", "uno.uitest", "555453c2985ef2745fe44503c5809a6168d063c2"), @("https://github.com/unoplatform/uno.extensions", "uno.extensions", "b9c8b0234bfb907527acb501e55cdcd16b7b9130") ) From 8df1b65f50cb4c9f40453271601564f4d3b846bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Tue, 21 Mar 2023 13:28:42 -0400 Subject: [PATCH 3/3] chore: Adjust themes commit --- doc/import_external_docs.ps1 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/import_external_docs.ps1 b/doc/import_external_docs.ps1 index d61defa92e59..57d84ad36d26 100644 --- a/doc/import_external_docs.ps1 +++ b/doc/import_external_docs.ps1 @@ -3,16 +3,12 @@ Set-PSDebug -Trace 1 $external_docs = @( @("https://github.com/unoplatform/uno.wasm.bootstrap", "uno.wasm.bootstrap", "4abadfc93ffeddc82420cc28af04cd7f6b2693ab"), - @("https://github.com/unoplatform/uno.themes", "uno.themes", "3d12f341f3ce9ecd7738e163a3a0904e9b94466f"), + @("https://github.com/unoplatform/uno.themes", "uno.themes", "36020096cbed81be67385d25feaa711620f42778"), @("https://github.com/unoplatform/uno.toolkit.ui", "uno.toolkit.ui", "e6bd3390e8b21ab649294ee591d7f134f8d56197"), @("https://github.com/unoplatform/uno.check", "uno.check", "5dec33b3cb4c26f578c8d6bd7a84000bf265a14e"), @("https://github.com/unoplatform/uno.xamlmerge.task", "uno.xamlmerge.task", "7e8ffef206e87dfea90c53805c45e93a7d8c0b46"), @("https://github.com/unoplatform/figma-docs", "figma-docs", "a740582020509f9947fbf991628075a4717bff0a"), -<<<<<<< HEAD @("https://github.com/unoplatform/uno.resizetizer", "uno.resizetizer", "e23dfa53da77e48510173e99a29c260b08b826f5"), -======= - @("https://github.com/unoplatform/uno.resizetizer", "uno.resizetizer", "f650e844cb66a7dafa084a7e778f14f4fd3ce8a2"), ->>>>>>> 77eb2c23bc (docs: Update resizetizer) @("https://github.com/unoplatform/uno.uitest", "uno.uitest", "555453c2985ef2745fe44503c5809a6168d063c2"), @("https://github.com/unoplatform/uno.extensions", "uno.extensions", "b9c8b0234bfb907527acb501e55cdcd16b7b9130") )