Skip to content

Commit a2622a8

Browse files
caleblloydcaleblloyd
authored
Merge pull request #122 from caleblloyd/f_docs_layout
Update Docs Layout
2 parents 8d36b47 + 1d31eb0 commit a2622a8

File tree

20 files changed

+246
-130
lines changed

20 files changed

+246
-130
lines changed

‎docs/content/api/db-command.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ date: 2016-10-16
44
menu:
55
main:
66
parent: api
7-
next: /api/result-set
8-
prev: /api/db-connection
97
title: DbCommand
108
weight: 20
119
---

‎docs/content/api/db-connection.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ date: 2016-10-16
44
menu:
55
main:
66
parent: api
7-
next: /api/db-command
87
title: DbConnection
98
weight: 10
109
---

‎docs/content/api/result-set.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ date: 2016-10-16
44
menu:
55
main:
66
parent: api
7-
prev: /api/db-command
8-
next: /api/transaction
97
title: Result Set
108
weight: 30
119
---

‎docs/content/api/transaction.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ date: 2016-10-16
44
menu:
55
main:
66
parent: api
7-
prev: /api/result-set
87
title: Transaction
98
weight: 40
109
---

‎docs/content/home.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Home
1414

1515
Here is some C# code
1616

17-
```C#
17+
```csharp
1818
using System.Threading.Tasks;
1919
using Microsoft.AspNetCore.Mvc;
2020
using MySqlConnector.Performance.Models;

‎docs/content/overview/configuration.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ date: 2016-10-16
44
menu:
55
main:
66
parent: getting started
7-
next: /overview/source-directory
8-
prev: /overview/installing
97
title: Configuration
108
weight: 30
119
---

‎docs/content/overview/installing.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ date: 2016-10-16
55
menu:
66
main:
77
parent: getting started
8-
next: /overview/configuration
9-
prev: /overview/introduction
108
title: Installing
119
weight: 20
1210
---

‎docs/content/overview/introduction.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ linktitle: Introduction
55
menu:
66
main:
77
parent: getting started
8-
next: /overview/installing
98
title: Introduction
109
weight: 10
1110
---

‎docs/content/tutorials/best-practices.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
lastmod: 2016-10-16
3+
date: 2016-10-16
4+
menu:
5+
main:
6+
parent: tutorials
7+
title: Best Practices
8+
weight: 10
9+
---
10+
11+
Best Practices
12+
=============
13+
14+
Best Practices

‎docs/content/tutorials/migrating-from-connector-net.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
lastmod: 2016-10-16
3+
date: 2016-10-16
4+
menu:
5+
main:
6+
parent: tutorials
7+
title: Migrating from Connector/Net
8+
weight: 20
9+
---
10+
11+
Migrating from Connector/Net
12+
=============
13+
14+
Migrating from Connector/Net

‎docs/content/tutorials/net-core-mvc.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ date: 2016-10-16
44
menu:
55
main:
66
parent: tutorials
7-
title: Use with .NET Core MVC
8-
weight: 10
7+
title: Use with .NET MVC
8+
weight: 30
99
---
1010

11-
.NET Core MVC
11+
Use with .NET MVC
1212
=============
1313

14-
.NET Core MVC
14+
Use with .NET MVC

‎docs/layouts/partials/footer.html

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,43 @@
1+
{{ $cur := . }}
12
</div>
23
<!-- col -->
34
</div>
45
<!-- row -->
6+
<div class="row" id="prevNext">
7+
<div class="col-md-9 col-md-offset-3">
8+
{{ range $i, $el := .Site.Menus.main }}
9+
{{ $.Scratch.Set "tempPrev" "" }}
10+
{{ $.Scratch.Set "parent" "" }}
11+
{{ range .Children }}
12+
{{ if ne ($.Scratch.Get "parent") "" }}
13+
<div class="pull-right">
14+
<a href="{{.URL}}">
15+
{{.Name}} <i class="fa fa-angle-right"></i>
16+
</a>
17+
</div>
18+
{{ $.Scratch.Set "parent" "" }}
19+
{{ end }}
20+
{{ if $cur.IsMenuCurrent "main" . }}
21+
{{ $.Scratch.Set "parent" $el }}
22+
{{ if ne ($.Scratch.Get "tempPrev") "" }}
23+
<div class="pull-left">
24+
<a href="{{($.Scratch.Get "tempPrev").URL}}">
25+
<i class="fa fa-angle-left"></i> {{($.Scratch.Get "tempPrev").Name}}
26+
</a>
27+
</div>
28+
{{ end }}
29+
{{ end }}
30+
{{ $.Scratch.Set "tempPrev" . }}
31+
{{ end }}
32+
{{ end }}
33+
<div class="clearfix"></div>
34+
</div>
535
</div>
636
<!-- container -->
737

838
<!-- js -->
939
<script type="text/javascript" src="vendor/jquery/js/jquery-2.1.4.min.js"></script>
1040
<script type="text/javascript" src="vendor/bootstrap/js/bootstrap.min.js"></script>
11-
<script type="text/javascript" src="vendor/highlightjs/js/highlight.pack.js"></script>
12-
<script>hljs.initHighlightingOnLoad();</script>
41+
<script type="text/javascript" src="vendor/prism/js/prism.js"></script>
1342
</body>
1443
</html>

‎docs/layouts/partials/header.html

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,36 +25,35 @@
2525
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
2626
<meta name="theme-color" content="#ffffff">
2727
<!--end icons-->
28-
28+
2929
{{ .Hugo.Generator }}
3030
{{ .Scratch.Add "title" "" }}{{ if isset .Site.Data.titles .Title }}{{ .Scratch.Set "title" (index .Site.Data.titles .Title).title }}{{ else }}{{ .Scratch.Set "title" .Title}}{{end}}
3131
<title>MySqlConnector - {{ .Scratch.Get "title" }}</title>
3232

3333
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css" />
3434
<link rel="stylesheet" type="text/css" href="vendor/font-awesome/css/font-awesome.min.css" />
35-
<link rel="stylesheet" type="text/css" href="vendor/highlightjs/css/monokai-sublime.css" />
35+
<link rel="stylesheet" type="text/css" href="vendor/prism/css/prism.css" />
3636
<link rel="stylesheet" type="text/css" href="css/style.css" rel="stylesheet" />
3737

3838
</head>
3939

4040
<body>
41-
41+
4242
<nav class="navbar navbar-default">
4343
<div class="container">
44-
<div class="navbar-header">
45-
<a class="navbar-brand" href="">
44+
<div class="col-xs-8 navbar-mysqlc-logo">
45+
<a href="">
4646
<img alt="MySqlConnector" src="img/icons/favicon-32x32.png" />
4747
</a>
48-
<a class="navbar-brand" href="">
48+
<a href="">
4949
MySqlConnector
5050
</a>
5151
</div>
52-
<div class="navbar-right navbar-text">
53-
<a id="github" href="https://github.com/mysql-net/MySqlConnector">
52+
<div class="col-xs-4 navbar-mysqlc-gh">
53+
<a href="https://github.com/mysql-net/MySqlConnector">
5454
<i class="fa fa-github"></i> View on GitHub
5555
</a>
5656
</div>
57-
</div>
5857
</nav>
5958

6059
<div class="container">

‎docs/layouts/partials/menu.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{ $cur := . }}
22
<div class="col-md-3">
33
<div class="list-group" id="navigation">
4-
4+
55
{{ range $i, $el := .Site.Menus.main }}
66
<a class="list-group-item{{ if or ($cur.IsMenuCurrent "main" .) ($cur.HasMenuCurrent "main" .) (and (eq $i 0) ($cur.IsHome)) }} active{{ end }}" href="{{ if .HasChildren }}#nav-{{ $i }}{{ else }}{{ .URL }}{{ end }}" data-parent="#navigation"{{ if .HasChildren }} data-toggle="collapse"{{end}}>
77
{{ .Pre }} <span>{{ .Name }}</span> {{ if .HasChildren }}<i class="fa fa-angle-down"></i>{{ end }}
@@ -16,7 +16,7 @@
1616
{{ end }}
1717
</div>
1818
{{ end }}
19-
19+
2020
{{ end }}
2121
</div>
2222
</div>

‎docs/static/css/style.css

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,29 @@
77
margin-right: 5px;
88
}
99

10+
.navbar-mysqlc-logo{
11+
padding: 10px 0 0 15px;
12+
}
13+
14+
.navbar-mysqlc-logo a{
15+
color: #777;
16+
font-size: 18px;
17+
padding: 0 12px 0 0;
18+
}
19+
20+
.navbar-mysqlc-logo a:hover{
21+
text-decoration: none;
22+
}
23+
24+
.navbar-mysqlc-gh {
25+
padding: 14px 15px 0 0;
26+
text-align: right;
27+
}
28+
29+
.navbar-mysqlc-gh a {
30+
color: #777;
31+
}
32+
1033
.submenu a {
1134
background: #f5f5f5;
1235
border-radius: 0;
@@ -24,8 +47,8 @@
2447
margin-left: 20px;
2548
}
2649

27-
#github{
28-
color: #777;
50+
#prevNext {
51+
margin-top: 20px;
2952
}
3053

3154
pre{

‎docs/static/vendor/highlightjs/css/monokai-sublime.css

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎docs/static/vendor/highlightjs/js/highlight.pack.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎docs/static/vendor/highlightjs/notes.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)