diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/changelog/css/combo.css | 5 | ||||
| -rw-r--r-- | docs/changelog/template.html | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/docs/changelog/css/combo.css b/docs/changelog/css/combo.css index 1a41b8c9d..f02c12ded 100644 --- a/docs/changelog/css/combo.css +++ b/docs/changelog/css/combo.css @@ -889,9 +889,12 @@ nav ul li:hover, nav ul li.active { } } +<<<<<<< HEAD body { background-image: url("https://ishtar-archeo.net/changelog/img/iggdrasil.png"); background-repeat: no-repeat; background-position: calc(100% - 20px) 20px; margin: 40px; -}
\ No newline at end of file +} +======= +>>>>>>> 82f929c25 (Generate html CHANGELOG) diff --git a/docs/changelog/template.html b/docs/changelog/template.html index 2a6361ba7..5f1193381 100644 --- a/docs/changelog/template.html +++ b/docs/changelog/template.html @@ -9,6 +9,12 @@ <link rel="stylesheet" href="css/combo.css"> </head> <body> +<<<<<<< HEAD +======= + <div class="container center"> + <p><a href="https://www.iggdrasil.net"><img src="img/iggdrasil.png"></a></p> + </div> +>>>>>>> 82f929c25 (Generate html CHANGELOG) <div class='container'> $body$ </div> |