豆豆友情提示:这是一个非官方 GitHub 代理镜像,主要用于网络测试或访问加速。请勿在此进行登录、注册或处理任何敏感信息。进行这些操作请务必访问官方网站 github.com。 Raw 内容也通过此代理提供。
Skip to content

Commit 1de96f5

Browse files
authored
Add support for markdown > alerts via markdig (#10173)
Add support for markdown > alerts via markdig
1 parent 916b471 commit 1de96f5

File tree

7 files changed

+38
-2
lines changed

7 files changed

+38
-2
lines changed

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<PackageVersion Include="LibGit2Sharp" Version="0.26.0" />
3434
<PackageVersion Include="Lucene.Net.Contrib" Version="3.0.3" />
3535
<PackageVersion Include="Lucene.Net" Version="3.0.3" />
36-
<PackageVersion Include="Markdig.Signed" Version="0.30.2" />
36+
<PackageVersion Include="Markdig.Signed" Version="0.37.0" />
3737
<PackageVersion Include="MicroBuild.Core" Version="0.3.0" />
3838
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
3939
<PackageVersion Include="Microsoft.ApplicationInsights.TraceListener" Version="2.21.0" />

src/Bootstrap/dist/css/bootstrap.css

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Bootstrap/less/alerts.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@
7272
.alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);
7373
}
7474

75+
.alert-primary {
76+
.alert-variant(@alert-primary-bg; @alert-primary-border; @alert-primary-text);
77+
}
7578

7679
.alert-brand-a {
7780
a {

src/Bootstrap/less/variables.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,9 @@
648648
@alert-danger-text: #000;
649649
@alert-danger-border: #fde7e9;
650650

651+
@alert-primary-bg: #EFD9FD;
652+
@alert-primary-text: #000;
653+
@alert-primary-border: #EFD9FD;
651654

652655
//== Progress bars
653656
//

src/NuGetGallery/Content/gallery/css/fabric.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
/*
88
Your use of the content in the files referenced here is subject to the terms of the license at http://aka.ms/fabric-assets-license
99
*/
10+
.markdown-alert > p {
11+
color: unset !important;
12+
}
13+
1014
@keyframes ms-motion-fadeIn {
1115
from {
1216
opacity: 0;

src/NuGetGallery/Services/MarkdownService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ private RenderedMarkdownResult GetHtmlFromMarkdownMarkdig(string markdownString,
231231
.UseTaskLists()
232232
.UseEmojiAndSmiley()
233233
.UseAutoLinks()
234+
.UseAlertBlocks()
234235
.UseReferralLinks("noopener noreferrer nofollow")
235236
.UseAutoIdentifiers()
236237
.UseEmphasisExtras(EmphasisExtraOptions.Strikethrough)

tests/NuGetGallery.Facts/Services/MarkdownServiceFacts.cs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void ConvertsMarkdownToHtmlWithoutImageDisaplyed(bool isMarkdigMdRenderin
151151
}
152152

153153
[Fact]
154-
public void TestToHtmlWithPipeTable()
154+
public void TestToHtmlWithPipeTable()
155155
{
156156
var originalMd = @"a | b
157157
-- | -
@@ -263,6 +263,20 @@ public void TestToHtmlWithAutoIdentifiers(string originalMd, string expectedHtml
263263
var readMeResult = _markdownService.GetHtmlFromMarkdown(originalMd);
264264
Assert.Equal(expectedHtml, readMeResult.Content);
265265
}
266+
267+
[Theory]
268+
[InlineData("> [!NOTE]\n> This is a note", "<div class=\"markdown-alert markdown-alert-note alert alert-primary\">\n<p class=\"mb-0\">This is a note</p>\n</div>")]
269+
[InlineData("> [!TIP]\n> This is a tip", "<div class=\"markdown-alert markdown-alert-tip alert alert-success\">\n<p class=\"mb-0\">This is a tip</p>\n</div>")]
270+
[InlineData("> [!IMPORTANT]\n> This is a important", "<div class=\"markdown-alert markdown-alert-important alert alert-info\">\n<p class=\"mb-0\">This is a important</p>\n</div>")]
271+
[InlineData("> [!WARNING]\n> This is a warning", "<div class=\"markdown-alert markdown-alert-warning alert alert-warning\">\n<p class=\"mb-0\">This is a warning</p>\n</div>")]
272+
[InlineData("> [!CAUTION]\n> This is a caution", "<div class=\"markdown-alert markdown-alert-caution alert alert-danger\">\n<p class=\"mb-0\">This is a caution</p>\n</div>")]
273+
public void TestToHtmlWithAlertBlocks(string originalMd, string expectedHtml)
274+
{
275+
_featureFlagService.Setup(x => x.IsMarkdigMdRenderingEnabled()).Returns(true);
276+
var readMeResult = _markdownService.GetHtmlFromMarkdown(originalMd);
277+
Assert.Equal(expectedHtml, readMeResult.Content);
278+
Assert.False(readMeResult.ImagesRewritten);
279+
}
266280
}
267281
}
268282
}

0 commit comments

Comments
 (0)