Browse Source

Fixed issue with {{ExtraScript}} not being removed if no extra was needed. Fixes issue with wrapping ToC headers causing confusion (line height is now properly set). Tweaked theme a bit. Added LLBLGen Pro theme. Removed color duplicate from theme.css for navigation, it was defined in colors already.

tags/0.13
Frans Bouma 10 years ago
parent
commit
6d94ce5f3e
3 changed files with 70 additions and 74 deletions
  1. +67
    -68
      Themes/Default/Destination/css/theme.css
  2. +2
    -2
      src/DocNet/Properties/AssemblyInfo.cs
  3. +1
    -4
      src/DocNet/SimpleNavigationElement.cs

+ 67
- 68
Themes/Default/Destination/css/theme.css View File

@@ -647,6 +647,7 @@ div.figure p {

.table-bordered-all {
border: 1px solid;
box-shadow: 0px 0px 8px rgba(10,10,10,0.1);
}

.table-bordered-all td {
@@ -973,64 +974,64 @@ div.figure p {
list-style-image: none;
}

.menu-vertical ul.tocroot {
padding-left: 15px;
}
.menu-vertical ul.tocroot {
padding-left: 15px;
}

.menu-vertical ul.currentrelative {
margin-left: -15px;
margin-bottom: -4px;
padding-bottom: 4px;
padding-left: 15px;
}
.menu-vertical ul.currentrelative {
margin-left: -15px;
margin-bottom: -4px;
padding-bottom: 4px;
padding-left: 15px;
}

.menu-vertical ul.currentrelativeroot {
margin-left: -15px;
margin-bottom: -4px;
padding-bottom: 4px;
padding-left: 15px;
}
.menu-vertical ul.currentrelativeroot {
margin-left: -15px;
margin-bottom: -4px;
padding-bottom: 4px;
padding-left: 15px;
}

.menu-vertical ul.tocroot > li.current {
margin-left: -4px;
padding-left: 4px;
padding-bottom: 3px;
margin-bottom: 10px;
}
.menu-vertical ul.tocroot > li.current {
margin-left: -4px;
padding-left: 4px;
padding-bottom: 3px;
margin-bottom: 10px;
}

.menu-vertical ul.current {
padding-left: 10px;
margin-left: -10px;
padding-bottom: 3px;
}
.menu-vertical ul.current {
padding-left: 10px;
margin-left: -10px;
padding-bottom: 3px;
}

.menu-vertical li {
list-style: none;
line-height: initial;
line-height: 16px;
}

.menu-vertical li.tocentry {
padding-left: 15px;
}
.menu-vertical li.tocentry {
padding-left: 15px;
padding-top: 7px;
}

.menu-vertical li.tocrootentry {
padding-left: 15px;
}
.menu-vertical li.tocrootentry {
padding-left: 15px;
}

.menu-vertical li.current {
margin-top: 0px;
margin-bottom: 3px;
margin-left: 0;
padding-top: 0px;
}
.menu-vertical li.current {
margin-top: 7px;
margin-bottom: 3px;
margin-left: 0;
padding-top: 0px;
}

.menu-vertical li.current > a {
font-weight: bold;
border: none;
}
.menu-vertical li.current > a {
font-weight: bold;
border: none;
}

.menu-vertical a {
line-height: 20px;
position: relative;
border: none;
}
@@ -1048,7 +1049,6 @@ div.figure p {
}

.menu-vertical span.navigationgroup {
line-height: 23px;
font-weight: bold;
margin-bottom: 3px;
}
@@ -1060,7 +1060,6 @@ div.figure p {
width: 320px;
overflow: hidden;
min-height: 100%;
background: #343131;
z-index: 200;
height: 100%;
overflow-y: auto;
@@ -1077,32 +1076,32 @@ div.figure p {
*zoom: 1;
}

.nav-top:before, .nav-top:after {
display: table;
content: "";
}
.nav-top:before, .nav-top:after {
display: table;
content: "";
}

.nav-top:after {
clear: both;
}
.nav-top:after {
clear: both;
}

.nav-top a {
font-weight: bold;
}
.nav-top a {
font-weight: bold;
}

.nav-top img {
margin-right: 12px;
height: 45px;
width: 45px;
padding: 5px;
border-radius: 100%;
}
.nav-top img {
margin-right: 12px;
height: 45px;
width: 45px;
padding: 5px;
border-radius: 100%;
}

.nav-top i {
font-size: 30px;
float: left;
cursor: pointer;
}
.nav-top i {
font-size: 30px;
float: left;
cursor: pointer;
}

.nav-content-wrap {
margin-left: 320px;


+ 2
- 2
src/DocNet/Properties/AssemblyInfo.cs View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.10.0.0")]
[assembly: AssemblyFileVersion("0.10.0")]
[assembly: AssemblyVersion("0.10.1.0")]
[assembly: AssemblyFileVersion("0.10.1")]

+ 1
- 4
src/DocNet/SimpleNavigationElement.cs View File

@@ -107,10 +107,7 @@ namespace Docnet
sb.Replace("{{Path}}", relativePathToRoot);
sb.Replace("{{Breadcrumbs}}", activePath.CreateBreadCrumbsHTML(relativePathToRoot));
sb.Replace("{{ToC}}", activePath.CreateToCHTML(relativePathToRoot));
if(this.ExtraScriptProducerFunc != null)
{
sb.Replace("{{ExtraScript}}", this.ExtraScriptProducerFunc(this));
}
sb.Replace("{{ExtraScript}}", (this.ExtraScriptProducerFunc == null) ? string.Empty : this.ExtraScriptProducerFunc(this));

// the last action has to be replacing the content marker, so markers in the content which we have in the template as well aren't replaced
sb.Replace("{{Content}}", content);


Loading…
Cancel
Save