imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8526 from abpframework/auto-merge/rel-4-3/277

Browse Source 
Merge branch dev with rel-4.3
pull/8551/head^2
Mehmet Erim 5 years ago committed by GitHub
parent c58f3a2d14 96ef1f1122
commit 28545ebc0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
Directory.Build.props
Unescape View File

@ -23,7 +23,7 @@
<xUnitRunnerVisualstudioPackageVersion>2.4.3</xUnitRunnerVisualstudioPackageVersion>
<!-- Mongo2Go https://www.nuget.org/packages/Mongo2Go -->
<Mongo2GoPackageVersion>3.0.0</Mongo2GoPackageVersion>
<Mongo2GoPackageVersion>3.1.1</Mongo2GoPackageVersion>
</PropertyGroup>
</Project>

3
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml
Unescape View File

@ -33,6 +33,7 @@
@section styles {
<abp-style-bundle>
<abp-style type="typeof(TuiEditorStyleContributor)"/>
<abp-style src="/Pages/CmsKit/BlogPosts/create.css"/>
</abp-style-bundle>
}
@ -61,7 +62,7 @@
<abp-form-content />
<div class="content-editor"
<div class="content-editor cms-kit-editor"
id="ContentEditor"
data-input-id="@Html.IdFor(x => x.ViewModel.Content)"
data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">

3
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml
Unescape View File

@ -33,6 +33,7 @@
@section styles {
<abp-style-bundle>
<abp-style type="typeof(TuiEditorStyleContributor)"/>
<abp-style src="/Pages/CmsKit/BlogPosts/update.css"/>
</abp-style-bundle>
}
@ -59,7 +60,7 @@
<abp-form-content />
<div class="content-editor"
<div class="content-editor cms-kit-editor"
id="ContentEditor"
data-input-id="@Html.IdFor(x => x.ViewModel.Content)"
data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">

3
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.css
Unescape View File

@ -0,0 +1,3 @@
.cms-kit-editor {
height: 65vh !important;
}

2
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js
Unescape View File

@ -231,7 +231,7 @@
useCommandShortcut: true,
initialValue: initialValue,
previewStyle: 'tab',
height: "95vh",
height: "100%",
minHeight: "25em",
initialEditType: 'markdown',
language: $editorContainer.data("language"),

3
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.css
Unescape View File

@ -0,0 +1,3 @@
.cms-kit-editor {
height: 65vh !important;
}

2
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js
Unescape View File

@ -178,7 +178,7 @@
useCommandShortcut: true,
initialValue: initialValue,
previewStyle: 'tab',
height: "95vh",
height: "100%",
minHeight: "25em",
initialEditType: 'markdown',
language: $editorContainer.data("language"),

7
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml
Unescape View File

@ -29,6 +29,7 @@
@section styles {
<abp-style-bundle>
<abp-style type="typeof(TuiEditorStyleContributor)" />
<abp-style src="/Pages/CmsKit/Pages/create.css"/>
</abp-style-bundle>
}
@ -45,7 +46,7 @@
<abp-tabs tab-style="Tab">
<abp-tab title="@L["Content"]">
<div class="content-editor"
<div class="content-editor cms-kit-editor"
id="ContentEditor"
data-input-id="@Html.IdFor(x => x.ViewModel.Content)"
data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">
@ -53,11 +54,11 @@
</abp-tab>
<abp-tab title="@L["Script"]">
<abp-input asp-for="ViewModel.Script" suppress-label="true" />
<abp-input asp-for="ViewModel.Script" suppress-label="true" class="cms-kit-editor" />
</abp-tab>
<abp-tab title="@L["Style"]">
<abp-input asp-for="ViewModel.Style" suppress-label="true"/>
<abp-input asp-for="ViewModel.Style" suppress-label="true" class="cms-kit-editor"/>
</abp-tab>
</abp-tabs>

7
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml
Unescape View File

@ -30,6 +30,7 @@
@section styles {
<abp-style-bundle>
<abp-style type="typeof(TuiEditorStyleContributor)" />
<abp-style src="/Pages/CmsKit/Pages/update.css" />
</abp-style-bundle>
}
@ -49,7 +50,7 @@
<abp-tabs tab-style="Tab">
<abp-tab title="@L["Content"]">
<div class="content-editor"
<div class="content-editor cms-kit-editor"
id="ContentEditor"
data-input-id="@Html.IdFor(x => x.ViewModel.Content)"
data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">
@ -57,11 +58,11 @@
</abp-tab>
<abp-tab title="@L["Script"]">
<abp-input asp-for="ViewModel.Script" suppress-label="true" />
<abp-input asp-for="ViewModel.Script" suppress-label="true" class="cms-kit-editor" />
</abp-tab>
<abp-tab title="@L["Style"]">
<abp-input asp-for="ViewModel.Style" suppress-label="true"/>
<abp-input asp-for="ViewModel.Style" suppress-label="true" class="cms-kit-editor"/>
</abp-tab>
</abp-tabs>

3
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.css
Unescape View File

@ -0,0 +1,3 @@
.cms-kit-editor {
height: 65vh !important;
}

2
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js
Unescape View File

@ -90,7 +90,7 @@
useCommandShortcut: true,
initialValue: initialValue,
previewStyle: 'tab',
height: "95vh",
height: "100%",
minHeight: "25em",
initialEditType: 'markdown',
language: $editorContainer.data("language"),

3
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.css
Unescape View File

@ -0,0 +1,3 @@
.cms-kit-editor {
height: 65vh !important;
}

2
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js
Unescape View File

@ -61,7 +61,7 @@
useCommandShortcut: true,
initialValue: initialValue,
previewStyle: 'tab',
height: "95vh",
height: "100%",
minHeight: "25em",
initialEditType: 'markdown',
language: $editorContainer.data("language"),

2
templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj
Unescape View File

@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="Mongo2Go" Version="3.0.0" />
<PackageReference Include="Mongo2Go" Version="3.1.1" />
</ItemGroup>
</Project>

2
templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj
Unescape View File

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="Mongo2Go" Version="3.0.0" />
<PackageReference Include="Mongo2Go" Version="3.1.1" />
<ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.MongoDB\MyCompanyName.MyProjectName.MongoDB.csproj" />
<ProjectReference Include="..\MyCompanyName.MyProjectName.TestBase\MyCompanyName.MyProjectName.TestBase.csproj" />
</ItemGroup>

Write Preview
Loading…
Cancel
Save