Skip to content

Commit 2fe0cc5

Browse files
SieboldianusSieboldianus
committed
Merge commit '9ebb6fc' into feat-admonition-cleaned
2 parents d638b06 + 9ebb6fc commit 2fe0cc5

15 files changed

Lines changed: 114 additions & 13 deletions

‎assets/scss/_admonition.scss‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*admonition styles */
2+
3+
.admonition-icon {
4+
fill: $text;
5+
width: 20px;
6+
margin: 6px;
7+
margin-left: -27px;
8+
position: absolute;
9+
top: 10px;
10+
}
11+
12+
13+
.note {
14+
border-left-width: 35px;
15+
border-left-style: solid;
16+
position: relative;
17+
border-color: $admonition-note;
18+
display: block;
19+
}
20+
21+
.warning {
22+
border-left-width: 35px;
23+
border-left-style: solid;
24+
position: relative;
25+
border-color: $admonition-warning;
26+
display: block;
27+
}
28+
29+
.tip {
30+
border-left-width: 35px;
31+
border-left-style: solid;
32+
position: relative;
33+
border-color: $admonition-tip;
34+
display: block;
35+
}
36+
37+
.admonition-content {
38+
display: block;
39+
margin: 0px;
40+
padding: .125em 1em;
41+
margin-top: 2em;
42+
margin-bottom: 2em;
43+
overflow-x: auto;
44+
background-color: $highlight-grey;
45+
}

‎assets/scss/_predefined.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ $light-grey: #494f5c;
66
$dark-grey: #3B3E48;
77
$highlight-grey: #7d828a;
88
$midnightblue: #2c3e50;
9+
$admonition-note :#F8E45C;
10+
$admonition-tip : #0594CB;
11+
$admonition-warning :#ff725c;
912

1013
// Fonts
1114
//

‎assets/scss/style.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
@import "normalize.scss";
33
@import "syntax.scss";
44
@import "animate.scss";
5+
@import "admonition.scss";
56

67
/* Webkit Scrollbar Customize */
78
::-webkit-scrollbar {

‎layouts/_default/baseof.html‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
{{- partial "favicons.html" }}
1414
<title>{{.Title}}</title>
1515
{{ range .AlternativeOutputFormats -}}
16-
{{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Title | safeHTML }}
16+
{{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Title | safeHTML }}
1717
{{ end -}}
1818
{{ $style := resources.Get "scss/style.scss" | resources.ExecuteAsTemplate "css/style.css" . | toCSS | minify | fingerprint -}}
19-
<link rel="stylesheet" href="{{ $style.Permalink }}" {{ printf "integrity=%q" $style.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous">
19+
<link rel="stylesheet" href="{{ $style.Permalink }}"
20+
{{ printf "integrity=%q" $style.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous">
2021
{{- block "head" . -}}{{- end }}
2122
{{- range .Site.Params.customCSS }}
2223
<link rel="stylesheet" href="{{ . | absURL }}">
@@ -30,21 +31,21 @@
3031
{{ block "header" . -}}{{ end -}}
3132
{{ block "main" . -}}{{ end -}}
3233
{{ block "footer" . -}}{{ end }}
33-
3434
{{ $main := resources.Get "js/main.js" -}}
3535
{{ if .Site.Params.code_copy_button | default true -}}
36-
{{ $codeCopy := resources.Get "js/code-copy.js" -}}
37-
{{ $script := slice $main $codeCopy | resources.Concat "js/bundle.js" | minify | fingerprint -}}
38-
<script src="{{ $script.Permalink }}" {{ printf "integrity=%q" $script.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous"></script>
36+
{{ $codeCopy := resources.Get "js/code-copy.js" -}}
37+
{{ $script := slice $main $codeCopy | resources.Concat "js/bundle.js" | minify | fingerprint -}}
38+
<script src="{{ $script.Permalink }}" {{ printf "integrity=%q" $script.Data.Integrity | safeHTMLAttr }}
39+
crossorigin="anonymous"></script>
3940
{{ else -}}
40-
{{ $script := $main | minify | fingerprint -}}
41-
<script src="{{ $script.Permalink }}" {{ printf "integrity=%q" $script.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous"></script>
41+
{{ $script := $main | minify | fingerprint -}}
42+
<script src="{{ $script.Permalink }}" {{ printf "integrity=%q" $script.Data.Integrity | safeHTMLAttr }}
43+
crossorigin="anonymous"></script>
4244
{{ end }}
43-
4445
{{- partial "analytics.html" . }}
4546
{{- if templates.Exists "partials/extra-foot.html" -}}
4647
{{ partial "extra-foot.html" . }}
4748
{{- end }}
4849
</body>
4950

50-
</html>
51+
</html>

‎layouts/partials/svg/exclamation.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎layouts/partials/svg/lightbulb.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎layouts/partials/svg/sticky-note.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎layouts/posts/single.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ <h1>{{ .Title }}</h1>
4949
</footer>
5050
</article>
5151
{{- if .Params.toc }}
52-
<aside id="toc">
52+
<aside id="toc" class="show-toc">
5353
<div class="toc-title">{{ i18n "tableOfContents" }}</div>
5454
{{ .TableOfContents }}
5555
</aside>

‎layouts/shortcodes/note.html‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{{ $_hugo_config := `{ "version": 1 }` }}
2+
3+
<aside class="admonition note">
4+
<!-- <h2 id="{{if .Get 0}}{{.Get 0 | urlize}}{{else}}note{{end}}">{{if .Get 0}}{{.Get 0 | markdownify}}{{else}}Note{{end}}</h2> -->
5+
<!-- <h3>Note</h3> -->
6+
<div class="admonition-icon">
7+
{{partial "svg/sticky-note.svg" }}
8+
</div>
9+
<div class="admonition-content">
10+
{{- .Inner -}}
11+
</div>
12+
</aside>

‎layouts/shortcodes/tip.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{ $_hugo_config := `{ "version": 1 }` }}
2+
<aside class="admonition tip">
3+
<!-- <h2 id="{{if .Get 0}}{{.Get 0 | urlize}}{{else}}tip{{end}}">{{if .Get 0}}{{.Get 0 | markdownify}}{{else}}Tip{{end}}</h2> -->
4+
<!-- <h3>Tip</h3> -->
5+
<div class="admonition-icon">
6+
{{partial "svg/lightbulb.svg" }}
7+
</div>
8+
<div class="admonition-content">
9+
{{- .Inner -}}
10+
</div>
11+
</aside>

0 commit comments

Comments
 (0)