Browse Source

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

pull/2808/head
AkinCam 6 years ago
parent
commit
d01fa3af8d
  1. 4
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs
  2. 12
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Styles/vs.css
  3. 2
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Styles/vs.min.css
  4. 12
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Styles/vs.scss

4
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.Cli.ProjectModification
var moduleName = ParseModuleName(module);
var migrationName = "Added_" + moduleName + "_Module" + GetUniquePostFix();
CmdHelper.RunCmd("cd \"" + Path.GetDirectoryName(csprojFile) + "\" & dotnet ef migrations add " + migrationName + GetStartupProjectOption(startupProject));
CmdHelper.RunCmd("cd \"" + Path.GetDirectoryName(csprojFile) + "\" && dotnet ef migrations add " + migrationName + GetStartupProjectOption(startupProject));
if (updateDatabase)
{
@ -22,7 +22,7 @@ namespace Volo.Abp.Cli.ProjectModification
protected void UpdateDatabase(string csprojFile, string startupProject)
{
CmdHelper.RunCmd("cd \"" + Path.GetDirectoryName(csprojFile) + "\" & dotnet ef database update" + GetStartupProjectOption(startupProject));
CmdHelper.RunCmd("cd \"" + Path.GetDirectoryName(csprojFile) + "\" && dotnet ef database update" + GetStartupProjectOption(startupProject));
}
protected virtual string ParseModuleName(string fullModuleName)

12
modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Styles/vs.css

@ -137,17 +137,17 @@
.docs-page .docs-sidebar .docs-top .navbar-logo .navbar-brand strong {
font-weight: 300;
text-transform: uppercase;
font-size: .9rem;
opacity: .6; }
font-size: .7em;
letter-spacing: 1px; }
.docs-page .docs-sidebar .docs-top .navbar-logo .go-back-site {
color: #000;
opacity: .15;
transition: .4s;
font-size: .75rem;
opacity: .65;
transition: .2s;
font-size: .8em;
font-weight: 300; }
.docs-page .docs-sidebar .docs-top .navbar-logo .go-back-site:hover {
text-decoration: none;
opacity: .5; }
opacity: 1; }
.docs-page .docs-sidebar .docs-top .navbar-logo .navbar-logo-desc {
font-size: .85em; }
.docs-page .docs-sidebar .docs-top .navbar-logo .navbar-logo-desc strong {

2
modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Styles/vs.min.css

File diff suppressed because one or more lines are too long

12
modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Styles/vs.scss

@ -233,21 +233,21 @@ body {
strong {
font-weight: 300;
text-transform: uppercase;
font-size: .9rem;
opacity: .6;
font-size: .7em;
letter-spacing: 1px;
}
}
.go-back-site {
color: #000;
opacity: .15;
transition: .4s;
font-size: .75rem;
opacity: .65;
transition: .2s;
font-size: .8em;
font-weight: 300;
&:hover {
text-decoration: none;
opacity: .5;
opacity: 1;
}
}

Loading…
Cancel
Save