Browse Source

Merge pull request #16517 from abpframework/auto-merge/rel-7-2/1934

Merge branch dev with rel-7.2
pull/16525/head
Masum ULU 3 years ago
committed by GitHub
parent
commit
d07bef21fe
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      docs/en/Tutorials/Part-8.md
  2. 4
      docs/en/UI/Angular/Theme-Configurations.md
  3. 14
      docs/en/docs-nav.json
  4. 2
      docs/zh-Hans/Tutorials/Part-8.md

2
docs/en/Tutorials/Part-8.md

@ -102,7 +102,7 @@ namespace Acme.BookStore.Authors;
public class GetAuthorListDto : PagedAndSortedResultRequestDto
{
public string Filter { get; set; }
public string? Filter { get; set; }
}
````

4
docs/en/UI/Angular/Theme-Configurations.md

@ -69,7 +69,7 @@ Theme packages no longer import styles as CSS modules as of ABP version 6.0. The
},
```
## Lepton X
## Lepton X [commercial](https://docs.abp.io/en/commercial)
```json
{
"input": "node_modules/@volosoft/ngx-lepton-x/assets/css/dark.css",
@ -174,7 +174,7 @@ Theme packages no longer import styles as CSS modules as of ABP version 6.0. The
```
## Theme Lepton
## Theme Lepton [commercial](https://docs.abp.io/en/commercial)
```json
{
"input": "node_modules/@volo/abp.ng.theme.lepton/dist/global/styles/lepton1.min.css",

14
docs/en/docs-nav.json

@ -16,7 +16,7 @@
},
{
"text": "Getting Started",
"path":"Getting-Started-Overall.md",
"path": "Getting-Started-Overall.md",
"items": [
{
"text": "Web Application - Layered Architecture",
@ -1166,6 +1166,10 @@
"text": "Overall",
"path": "UI/Angular/Theming.md"
},
{
"text": "Configuration",
"path": "UI/Angular/Theme-Configurations.md"
},
{
"text": "The Basic Theme",
"path": "UI/Angular/Basic-Theme.md"
@ -1405,8 +1409,8 @@
"path": "Modules/IdentityServer.md",
"items": [
{
"text": "IdentityServer Migration Guide",
"path": "Migration-Guides/IdentityServer4-Step-by-Step.md"
"text": "IdentityServer Migration Guide",
"path": "Migration-Guides/IdentityServer4-Step-by-Step.md"
}
]
},
@ -1438,7 +1442,7 @@
},
{
"text": "Common",
"items":[
"items": [
{
"text": "Database Tables",
"path": "Modules/Database-Tables.md"
@ -1515,4 +1519,4 @@
"path": "Contribution/Index.md"
}
]
}
}

2
docs/zh-Hans/Tutorials/Part-8.md

@ -107,7 +107,7 @@ namespace Acme.BookStore.Authors
{
public class GetAuthorListDto : PagedAndSortedResultRequestDto
{
public string Filter { get; set; }
public string? Filter { get; set; }
}
}
````

Loading…
Cancel
Save