Browse Source

Merge branch 'dev' of https://github.com/abpframework/abp into dev

pull/2225/head
mehmet-erim 7 years ago
parent
commit
5a1914ff2e
  1. 2
      modules/docs/src/Volo.Docs.Web/Markdown/MarkdownDocumentToHtmlConverter.cs
  2. 4
      npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts

2
modules/docs/src/Volo.Docs.Web/Markdown/MarkdownDocumentToHtmlConverter.cs

@ -24,7 +24,7 @@ namespace Volo.Docs.Markdown
} }
private const string MdLinkFormat = "[{0}]({1}{2}/{3}/{4}{5}/{6})"; private const string MdLinkFormat = "[{0}]({1}{2}/{3}/{4}{5}/{6})";
private const string MarkdownLinkRegExp = @"\[(.*)\]\((.*\.md)\)"; private const string MarkdownLinkRegExp = @"\[(.*?)\]\((.*?\.md)\)";
private const string AnchorLinkRegExp = @"<a[^>]+href=\""(.*?)\""[^>]*>(.*)?</a>"; private const string AnchorLinkRegExp = @"<a[^>]+href=\""(.*?)\""[^>]*>(.*)?</a>";
public virtual string Convert(ProjectDto project, DocumentWithDetailsDto document, string version, public virtual string Convert(ProjectDto project, DocumentWithDetailsDto document, string version,

4
npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts

@ -184,6 +184,10 @@ export default `
color: #FFF !important; color: #FFF !important;
} }
.custom-checkbox > label {
cursor: pointer;
}
/* <animations */ /* <animations */
.fade-in-top { .fade-in-top {

Loading…
Cancel
Save