+
Skip to content

fix richtext editor #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 31, 2021
Merged

fix richtext editor #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Mix.Cms.Lib/Models/Common/SearchPostQueryModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public SearchPostQueryModel()
public SearchPostQueryModel(HttpRequest request, string culture): base(request, culture)
{
PostType = request.Query.TryGetValue("postType", out var postType)
? postType : MixDatabaseNames.ADDITIONAL_COLUMN_POST;
? postType : string.Empty;
Category = request.Query.TryGetValue(MixRequestQueryKeywords.Category, out var category)
? category: string.Empty;
Tag = request.Query.TryGetValue(MixRequestQueryKeywords.Tag, out var tag)
Expand Down
28 changes: 15 additions & 13 deletions src/Mix.Cms.Web/Views/Shared/_LayoutPortal_Angular.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<link rel="icon" type="image/png" sizes="16x16"
href="@(MixService.GetConfig<string>("Favicon", ViewBag.culture) ?? "/mix-app/css/portal/img/mixcore-logo-green.svg")">

<!-- <link rel="stylesheet" href="~/mix-app/css/portal.min.css" /> -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Trumbowyg/2.25.1/ui/trumbowyg.min.css" integrity="sha512-nwpMzLYxfwDnu68Rt9PqLqgVtHkIJxEPrlu3PfTfLQKVgBAlTKDmim1JvCGNyNRtyvCx1nNIVBfYm8UZotWd4Q==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<link rel="stylesheet" href="~/mix-app/css/portal-extend.css" />
<link rel="stylesheet" href="~/mix-app/css/app-vendor.min.css" />
<link rel="stylesheet" href="~/mix-app/css/app-vendor-scss.min.css" />
Expand All @@ -31,7 +31,7 @@
--primary-color-hue : {{globalSettings.portalThemeSettings.primaryColorHue}};
--primary-color-saturation : {{globalSettings.portalThemeSettings.primaryColorSaturation}}%;
--primary-color-brightness : {{globalSettings.portalThemeSettings.primaryColorBrightness}}%;

--second-color-hue : {{globalSettings.portalThemeSettings.secondColorHue}};
--second-color-saturation : {{globalSettings.portalThemeSettings.secondColorSaturation}}%;
--second-color-brightness : {{globalSettings.portalThemeSettings.secondColorBrightness}}%;
Expand All @@ -49,22 +49,24 @@
</style>
@RenderBody()

<script src="~/mix-app/js/framework.min.js"></script>
<script src="~/mix-app/js/shared.min.js"></script>

<!-- <script src="~/mix-app/js/portal.min.js"></script> -->
<script src="https://cdn.jsdelivr.net/npm/@@popperjs/core@2.9.2/dist/umd/popper.min.js" integrity="sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p" crossorigin="anonymous"></script>
@* <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script> *@
@* <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> *@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" referrerpolicy="no-referrer"></script>
@* <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-notify/0.2.0/js/bootstrap-notify.min.js"></script>
*@
@* <script src="https://cdnjs.cloudflare.com/ajax/libs/Trumbowyg/2.20.0/trumbowyg.min.js"></script> *@
@* <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-notify/0.2.0/js/bootstrap-notify.min.js"></script>*@
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="js/vendor/jquery-3.3.1.min.js"><\/script>')</script>
@*<script src="https://cdnjs.cloudflare.com/ajax/libs/Trumbowyg/2.25.1/trumbowyg.min.js" integrity="sha512-t4CFex/T+ioTF5y0QZnCY9r5fkE8bMf9uoNH2HNSwsiTaMQMO0C9KbKPMvwWNdVaEO51nDL3pAzg4ydjWXaqbg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>*@
<script src="https://cdn.jsdelivr.net/npm/@@popperjs/core@2.9.2/dist/umd/popper.min.js" integrity="sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p" crossorigin="anonymous"></script>

@*<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
<script src="https://cdn.jsdelivr.net/npm/quill-image-resize-module@3.0.0/image-resize.min.js"></script>*@


<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
<script src="https://cdn.jsdelivr.net/npm/quill-image-resize-module@3.0.0/image-resize.min.js"></script>

<script src="~/mix-app/js/framework.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-drag-and-drop-lists/2.1.0/angular-drag-and-drop-lists.min.js"></script>
<script src="~/mix-app/js/shared.min.js"></script>
<script src="~/mix-app/js/app-portal-required.min.js"></script>
<script src="~/mix-app/js/app-portal.min.js?v="></script>
<script src="~/mix-app/js/app-shared.min.js?v="></script>
Expand Down
2 changes: 1 addition & 1 deletion src/Mix.Cms.Web/wwwroot/mix-app/css/app-client.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src/Mix.Cms.Web/wwwroot/mix-app/css/app-vendor-scss.min.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Wed Aug 11 2021 22:38:25 GMT+0700 (Indochina Time) */fb-login {
/* Tue Aug 31 2021 16:58:07 GMT+0700 (Indochina Time) */fb-login {
background-color: aqua; }

medias .modal {
Expand Down Expand Up @@ -32,10 +32,6 @@ mix-module-data-table .preview-container {
upload-croppie .cr-boundary {
overflow: hidden; }

.table-data td.preview {
max-width: 120px;
overflow: hidden; }

main-side-bar-dynamic .sw-sidebar .sw-toc-item {
position: relative; }
main-side-bar-dynamic .sw-sidebar .sw-toc-item .sw-toc-link .sw-toc-link {
Expand All @@ -60,3 +56,7 @@ main-side-bar-dynamic .sw-sidebar .sw-toc-sub-link .btn-group {
#modal-content-filter .modal-lg,
#modal-content-filter .modal-xl {
max-width: 80vw; } }

.table-data td.preview {
max-width: 120px;
overflow: hidden; }
4 changes: 2 additions & 2 deletions src/Mix.Cms.Web/wwwroot/mix-app/css/app-vendor.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Mix.Cms.Web/wwwroot/mix-app/js/app-portal-required.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载