Merge pull request #784 from EdiWang/master

Patch v14.3.1
EdiWang · Mar 8, 2024 · c23ee13 · c23ee13
2 parents d58e055 + 16a6ca4
commit c23ee13
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 24 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -3,8 +3,8 @@
  <Authors>Edi Wang</Authors>
  <Company>edi.wang</Company>
  <Copyright>(C) 2024 [email protected]</Copyright>
- <AssemblyVersion>14.3.0.0</AssemblyVersion>
- <FileVersion>14.3.0.0</FileVersion>
- <Version>14.3.0.0</Version>
+ <AssemblyVersion>14.3.1.0</AssemblyVersion>
+ <FileVersion>14.3.1.0</FileVersion>
+ <Version>14.3.1</Version>
  </PropertyGroup>
 </Project>
diff --git a/src/Moonglade.Auth/Moonglade.Auth.csproj b/src/Moonglade.Auth/Moonglade.Auth.csproj
@@ -16,7 +16,7 @@
  </ItemGroup>
  <ItemGroup>
  <FrameworkReference Include="Microsoft.AspNetCore.App" />
- <PackageReference Include="Microsoft.Identity.Web" Version="2.17.0" />
+ <PackageReference Include="Microsoft.Identity.Web" Version="2.17.1" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />

diff --git a/src/Moonglade.Data.MySql/Moonglade.Data.MySql.csproj b/src/Moonglade.Data.MySql/Moonglade.Data.MySql.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-  <OutputType>Library</OutputType>
-  <TargetFramework>net8.0</TargetFramework>
-  <AssemblyName>Moonglade.Data.MySql</AssemblyName>
-  <RootNamespace>Moonglade.Data.MySql</RootNamespace>
-  <IsTestProject>false</IsTestProject>
-  <IsPackable>false</IsPackable>
-  <ImplicitUsings>enable</ImplicitUsings>
-  <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <ItemGroup>
-  <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-  <ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />
-  </ItemGroup>
+ <PropertyGroup>
+ <OutputType>Library</OutputType>
+ <TargetFramework>net8.0</TargetFramework>
+ <AssemblyName>Moonglade.Data.MySql</AssemblyName>
+ <RootNamespace>Moonglade.Data.MySql</RootNamespace>
+ <IsTestProject>false</IsTestProject>
+ <IsPackable>false</IsPackable>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+ <ItemGroup>
+ <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.1" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />
+ </ItemGroup>
 </Project>
diff --git 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:
- <script src="https://cdnjs.cloudflare.com/ajax/libs/tinymce/6.8.2/tinymce.min.js" integrity="sha512-6JR4bbn8rCKvrkdoTJd/VFyXAN4CE9XMtgykPWgKiHjou56YDJxWsi90hAeMTYxNwUnKSQu9JPc3SQUg+aGCHw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/tinymce/6.8.3/tinymce.min.js" integrity="sha512-VCEWnpOl7PIhbYMcb64pqGZYez41C2uws/M/mDdGPy+vtEJHd9BqbShE4/VNnnZdr7YCPOjd+CBmYca/7WWWCw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
  break;
  case EditorChoice.Markdown:
  <partial name="_MonacoLoaderScript" />

diff --git 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');

diff --git 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');