From 9ac8ee39c8523e1f0299343728b835e8ff2e48c2 Mon Sep 17 00:00:00 2001 From: Nuget Ninja Date: Mon, 4 Mar 2024 03:43:45 +0000 Subject: [PATCH 1/4] Auto csproj fix and update by bot. --- src/Moonglade.Auth/Moonglade.Auth.csproj | 2 +- .../Moonglade.Data.MySql.csproj | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Moonglade.Auth/Moonglade.Auth.csproj b/src/Moonglade.Auth/Moonglade.Auth.csproj index 7d1de1f65..49fe3b60c 100644 --- a/src/Moonglade.Auth/Moonglade.Auth.csproj +++ b/src/Moonglade.Auth/Moonglade.Auth.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Moonglade.Data.MySql/Moonglade.Data.MySql.csproj b/src/Moonglade.Data.MySql/Moonglade.Data.MySql.csproj index ff7d14d37..c0fe9df37 100644 --- a/src/Moonglade.Data.MySql/Moonglade.Data.MySql.csproj +++ b/src/Moonglade.Data.MySql/Moonglade.Data.MySql.csproj @@ -1,18 +1,18 @@ - - Library - net8.0 - Moonglade.Data.MySql - Moonglade.Data.MySql - false - false - enable - enable - - - - - - - + + Library + net8.0 + Moonglade.Data.MySql + Moonglade.Data.MySql + false + false + enable + enable + + + + + + + \ No newline at end of file From 73ac9b365bf574faa80a790b83f1e0349dd74fba Mon Sep 17 00:00:00 2001 From: Edi Wang Date: Fri, 8 Mar 2024 11:51:02 +0800 Subject: [PATCH 2/4] fix a few dark mode UI issue --- src/Moonglade.Web/wwwroot/js/app/theme.module.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Moonglade.Web/wwwroot/js/app/theme.module.js b/src/Moonglade.Web/wwwroot/js/app/theme.module.js index ce6858d0d..1bbf0bd21 100644 --- a/src/Moonglade.Web/wwwroot/js/app/theme.module.js +++ b/src/Moonglade.Web/wwwroot/js/app/theme.module.js @@ -14,6 +14,8 @@ export function useDarkMode() { $('.card').addClass('text-white bg-dark'); $('.list-group-item, .card-body').addClass('bg-moca-dark text-light'); + $('.post-publish-info').removeClass('text-muted').addClass('text-secondary'); + $('.post-content img.img-thumbnail').addClass('bg-dark border-secondary'); $('.post-content table.table').addClass('table-dark'); @@ -23,7 +25,7 @@ export function useDarkMode() { $('.post-summary-tags .btn-accent').removeClass('btn-accent').addClass('btn-dark'); $('.aside-widget').removeClass('bg-white').addClass('border-dark'); - $('.aside-widget .card-subtitle').removeClass('text-muted').addClass('text-light-emphasis'); + $('.card-subtitle').removeClass('text-muted'); isDarkMode = true; $('.lightswitch').addClass('bg-dark text-light border-secondary'); @@ -45,6 +47,8 @@ export function useLightMode() { $('.card').removeClass('text-white bg-dark'); $('.list-group-item, .card-body').removeClass('bg-moca-dark text-light'); + $('.post-publish-info').removeClass('text-secondary').addClass('text-muted'); + $('.post-content img.img-thumbnail').removeClass('bg-dark border-secondary'); $('.post-content table.table').removeClass('table-dark'); @@ -54,7 +58,7 @@ export function useLightMode() { $('.post-summary-tags .btn-dark').removeClass('btn-dark').addClass('btn-accent'); $('.aside-widget').addClass('bg-white').removeClass('border-dark'); - $('.aside-widget .card-subtitle').addClass('text-muted').removeClass('text-light-emphasis'); + $('.card-subtitle').addClass('text-muted'); isDarkMode = false; $('.lightswitch').removeClass('bg-dark text-light border-secondary'); From fa997d5bfcc5f454be4a144784bf15612142c331 Mon Sep 17 00:00:00 2001 From: Edi Wang Date: Fri, 8 Mar 2024 11:54:57 +0800 Subject: [PATCH 3/4] patch tinymce --- src/Moonglade.Web/Pages/Admin/EditPost.cshtml | 2 +- src/Moonglade.Web/wwwroot/js/app/admin.editor.module.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Moonglade.Web/Pages/Admin/EditPost.cshtml b/src/Moonglade.Web/Pages/Admin/EditPost.cshtml index 222410573..45030e18a 100644 --- a/src/Moonglade.Web/Pages/Admin/EditPost.cshtml +++ b/src/Moonglade.Web/Pages/Admin/EditPost.cshtml @@ -28,7 +28,7 @@ switch (ec) { case EditorChoice.Html: - + break; case EditorChoice.Markdown: diff --git a/src/Moonglade.Web/wwwroot/js/app/admin.editor.module.js b/src/Moonglade.Web/wwwroot/js/app/admin.editor.module.js index 4d4c5b15a..83bfd1149 100644 --- a/src/Moonglade.Web/wwwroot/js/app/admin.editor.module.js +++ b/src/Moonglade.Web/wwwroot/js/app/admin.editor.module.js @@ -109,7 +109,7 @@ export function loadTinyMCE(textareaSelector) { branding: false, promotion: false, block_formats: 'Paragraph=p; Header 2=h2; Header 3=h3; Header 4=h4; Preformatted=pre', - plugins: 'advlist autolink autosave link image lists charmap preview anchor pagebreak searchreplace wordcount visualblocks visualchars code fullscreen insertdatetime media nonbreaking save table directionality template codesample emoticons', + plugins: 'advlist autolink autosave link image lists charmap preview anchor pagebreak searchreplace wordcount visualblocks visualchars code fullscreen insertdatetime media nonbreaking save table directionality codesample emoticons', toolbar: 'undo redo | blocks | bold italic underline strikethrough | forecolor backcolor | paste pastetext removeformat | hr link image codesample | charmap emoticons table media | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | code | fullscreen', save_onsavecallback: function () { $('#btn-save').trigger('click'); From 16a6ca4bf4ea0566ee303213c66604db19057c37 Mon Sep 17 00:00:00 2001 From: Edi Wang Date: Fri, 8 Mar 2024 11:55:23 +0800 Subject: [PATCH 4/4] bump version --- src/Directory.Build.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 3ae9fbd55..65fe58562 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,8 +3,8 @@ Edi Wang edi.wang (C) 2024 edi.wang@outlook.com - 14.3.0.0 - 14.3.0.0 - 14.3.0.0 + 14.3.1.0 + 14.3.1.0 + 14.3.1 \ No newline at end of file