Skip to content

Commit 318d383

Browse files
TimHessTimHess
committed
copy css from mainsite, re-update highlightjs, fix menu
1 parent d3c92f8 commit 318d383

File tree

9 files changed

+784
-460
lines changed

9 files changed

+784
-460
lines changed

‎template/steeltoe/partials/affix.tmpl.partial

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
2-
<div class="sideaffix">
3-
<div id="close-sidebar">
4-
<a class="mobile-sidebar-close" onclick="showMobileSidebar(); return false;">X</a>
5-
</div>
6-
{{^_disableContribution}}
7-
<div class="contribution">
8-
<ul class="nav">
9-
{{#docurl}}
10-
<li>
11-
<a href="{{docurl}}" class="contribution-link">{{__global.improveThisDoc}}</a>
12-
</li>
13-
{{/docurl}}
14-
{{#sourceurl}}
15-
<li>
16-
<a href="{{sourceurl}}" class="contribution-link">{{__global.viewSource}}</a>
17-
</li>
18-
{{/sourceurl}}
19-
</ul>
20-
</div>
21-
{{/_disableContribution}}
22-
<nav class="bs-docs-sidebar affix" id="affix">
23-
</nav>
24-
</div>
1+
2+
<div class="sideaffix">
3+
<div id="close-sidebar">
4+
<a class="mobile-sidebar-close" onclick="showMobileSidebar(); return false;">X</a>
5+
</div>
6+
{{^_disableContribution}}
7+
<div class="contribution">
8+
<ul class="nav">
9+
{{#docurl}}
10+
<li>
11+
<a href="{{docurl}}" class="contribution-link">{{__global.improveThisDoc}}</a>
12+
</li>
13+
{{/docurl}}
14+
{{#sourceurl}}
15+
<li>
16+
<a href="{{sourceurl}}" class="contribution-link">{{__global.viewSource}}</a>
17+
</li>
18+
{{/sourceurl}}
19+
</ul>
20+
</div>
21+
{{/_disableContribution}}
22+
<nav class="bs-docs-sidebar affix" id="affix">
23+
</nav>
24+
</div>

‎template/steeltoe/partials/head.tmpl.partial

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<link rel="shortcut icon" href="{{{_appFaviconPath}}}{{^_appFaviconPath}}favicon.ico{{/_appFaviconPath}}">
3535

3636
<link rel="stylesheet" href="/styles/docfx.vendor.css">
37-
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
37+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/4.6.2/css/bootstrap.min.css" integrity="sha512-rt/SrQ4UNIaGfDyEXZtNcyWvQeOq0QLygHluFQcSjaGB04IxWhal71tKuzP6K8eYXYB6vJV4pHkXcmFGGQ1/0w==" crossorigin="anonymous" referrerpolicy="no-referrer" />
38+
<link rel="stylesheet" href="/styles/frommainsite.css" />
3839
<link rel="stylesheet" href="/styles/docfx.css">
39-
<link rel="stylesheet" href="{{#_rootHost}}{{_rootHost}}{{/_rootHost}}{{^_rootHost}}//steeltoe.io{{/_rootHost}}/css/site.css" />
4040
<link rel="stylesheet" href="/styles/main.css">
4141
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/styles/a11y-light.min.css">
4242

‎template/steeltoe/partials/navbar.tmpl.partial

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<span class="navbar-toggler-icon"></span>
55
</button>
66
<div class="collapse navbar-collapse" id="navbar">
7-
<ul class=" navbar-nav text-center">
7+
<ul class="navbar-nav text-center">
88
<li class="nav-item dropdown ml-xl-5 mr-xl-2">
9-
<a class="btn nav-link dropdown-toggle" href="#" id="why" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
9+
<a class="nav-link dropdown-toggle" href="#" id="why" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
1010
Why Steeltoe
1111
</a>
1212
<div class="dropdown-menu" aria-labelledby="why">
@@ -18,7 +18,7 @@
1818
</div>
1919
</li>
2020
<li class="nav-item dropdown mx-xl-2">
21-
<a class="btn nav-link dropdown-toggle" href="#" id="learn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
21+
<a class="nav-link dropdown-toggle" href="#" id="learn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
2222
Get Started
2323
</a>
2424
<div class="dropdown-menu" aria-labelledby="learn">
@@ -30,7 +30,7 @@
3030
</div>
3131
</li>
3232
<li class="nav-item dropdown mx-xl-2">
33-
<a class="btn nav-link dropdown-toggle" href="#" id="projects" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
33+
<a class="nav-link dropdown-toggle" href="#" id="projects" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
3434
Projects
3535
</a>
3636
<div class="dropdown-menu" aria-labelledby="projects">
@@ -47,10 +47,10 @@
4747
</div>
4848
</li>
4949
<li class="nav-item mx-xl-2">
50-
<a class="btn nav-link" href="{{#_rootHost}}{{_rootHost}}{{/_rootHost}}{{^_rootHost}}https://steeltoe.io{{/_rootHost}}/support" onClick="$(this).removeAttr('target')">Support</a>
50+
<a class="nav-link" href="{{#_rootHost}}{{_rootHost}}{{/_rootHost}}{{^_rootHost}}https://steeltoe.io{{/_rootHost}}/support" onClick="$(this).removeAttr('target')">Support</a>
5151
</li>
5252
<li class="nav-item mx-xl-2">
53-
<a class="btn nav-link" href="{{#_rootHost}}{{_rootHost}}{{/_rootHost}}{{^_rootHost}}https://steeltoe.io{{/_rootHost}}/community" onClick="$(this).removeAttr('target')">Community</a>
53+
<a class="nav-link" href="{{#_rootHost}}{{_rootHost}}{{/_rootHost}}{{^_rootHost}}https://steeltoe.io{{/_rootHost}}/community" onClick="$(this).removeAttr('target')">Community</a>
5454
</li>
5555
{{#_enableSearch}}
5656
<li class="nav-item ml-xl-2" onClick="$('.search-open').toggle();$('#search').toggle();">

‎template/steeltoe/partials/scripts.tmpl.partial

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<script src="/styles/docfx.vendor.js"></script>
22

3-
<script src="/styles/highlightjs-badge.min.js"></script>
4-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/highlight.min.js" crossorigin="anonymous"></script>
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/languages/bash.min.js" crossorigin="anonymous"></script>
6-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/languages/csharp.min.js" crossorigin="anonymous"></script>
7-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/languages/json.min.js" crossorigin="anonymous"></script>
8-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/languages/powershell.min.js" crossorigin="anonymous"></script>
9-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/languages/xml.min.js" crossorigin="anonymous"></script>
10-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/languages/yaml.min.js" icrossorigin="anonymous"></script>
11-
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct" crossorigin="anonymous"></script>
3+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.3/highlight.min.js" integrity="sha512-tL84mD+FR70jI7X8vYj5AfRqe0EifOaFUapjt1KvDaPLHgTlUZ2gQL/Tzvvn8HXuQm9oHYShJpNFdyJmH2yHrw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
4+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.3/languages/bash.min.js" integrity="sha512-Hg0ufGEvn0AuzKMU0psJ1iH238iUN6THh7EI0CfA0n1sd3yu6PYet4SaDMpgzN9L1yQHxfB3yc5ezw3PwolIfA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
5+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.3/languages/csharp.min.js" integrity="sha512-XEAR8fWA7XQhXnpFbCAngGSliIA99z3StbLuOlPa0XFp+WtVdSdgqPaPHF62W/DrhzFvCBmGIughaohXO0aDDA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
6+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.3/languages/json.min.js" integrity="sha512-37sW1XqaJmseHAGNg4N4Y01u6g2do6LZL8tsziiL5CMXGy04Th65OXROw2jeDeXLo5+4Fsx7pmhEJJw77htBFg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
7+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.3/languages/powershell.min.js" integrity="sha512-IC7cmpzlQ1USwqF55ri8lvo2jVDjtEOcWOHaqWZERWnmsf91v40WAE2eDWowLVBHuRg9K9WBQIcelaEOYciQ0w==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
8+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.3/languages/xml.min.js" integrity="sha512-0CjSoD/wLTBYgboRLU6i71o0LK21KZpkyu8bKCVUoP/2OFhYnPxYWqcATFpDtjikyuoxIhCYFgNJeh8w7rggTg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
9+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.3/languages/yaml.min.js" integrity="sha512-w1UGeHQBy7zjHSSPA6To4w12xvKFANmA9yzShsF0k8wLoXYIVgDSTbGL+P8RwEW3ZFnibJsJsKcacTLOcyT7rQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
10+
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/4.6.2/js/bootstrap.min.js" integrity="sha512-7rusk8kGPFynZWu26OKbTeI+QPoYchtxsmPeBqkHIEXJxeun4yJ4ISYe7C6sz9wdxeE1Gk3VxsIWgCZTc+vX3g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
1211

12+
<script src="/styles/highlightjs-badge.min.js"></script>
1313
<script src="/styles/docfx.js"></script>
1414
<script src="/styles/main1.js"></script>

‎template/steeltoe/styles/docfx.css

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -246,71 +246,6 @@ article section {
246246
.breadcrumb > li + li:before {
247247
content: "\00a0/";
248248
}
249-
#autocollapse.collapsed .navbar-header {
250-
float: none;
251-
}
252-
#autocollapse.collapsed .navbar-toggle {
253-
display: block;
254-
}
255-
#autocollapse.collapsed .navbar-collapse {
256-
border-top: 1px solid transparent;
257-
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
258-
}
259-
#autocollapse.collapsed .navbar-collapse.collapse {
260-
display: none !important;
261-
}
262-
#autocollapse.collapsed .navbar-nav {
263-
float: none !important;
264-
margin: 7.5px -15px;
265-
}
266-
#autocollapse.collapsed .navbar-nav > li {
267-
float: none;
268-
}
269-
#autocollapse.collapsed .navbar-nav > li > a {
270-
padding-top: 10px;
271-
padding-bottom: 10px;
272-
}
273-
#autocollapse.collapsed .collapse.in,
274-
#autocollapse.collapsed .collapsing {
275-
display: block !important;
276-
}
277-
#autocollapse.collapsed .collapse.in .navbar-right,
278-
#autocollapse.collapsed .collapsing .navbar-right {
279-
float: none !important;
280-
}
281-
#autocollapse .form-group {
282-
width: 100%;
283-
}
284-
#autocollapse .form-control {
285-
width: 100%;
286-
}
287-
#autocollapse .navbar-header {
288-
margin-left: 0;
289-
margin-right: 0;
290-
}
291-
#autocollapse .navbar-brand {
292-
margin-left: 0;
293-
}
294-
.collapse.in,
295-
.collapsing {
296-
text-align: center;
297-
}
298-
.collapsing .navbar-form {
299-
margin: 0 auto;
300-
max-width: 400px;
301-
padding: 10px 15px;
302-
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
303-
}
304-
.collapsed .collapse.in .navbar-form {
305-
margin: 0 auto;
306-
max-width: 400px;
307-
padding: 10px 15px;
308-
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
309-
}
310-
.navbar .navbar-nav {
311-
display: inline-block;
312-
}
313-
314249

315250
.docs-search {
316251
background: white;

‎template/steeltoe/styles/docfx.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ $(function () {
8282
// Enable highlight.js
8383
function highlight() {
8484
$('pre code').each(function (i, block) {
85-
hljs.highlightBlock(block);
85+
hljs.highlightElement(block);
8686
});
8787
$('pre code[highlight-lines]').each(function (i, block) {
8888
if (block.innerHTML === "") return;

0 commit comments

Comments
 (0)