Merge branch 'main' into dependabot/npm_and_yarn/less-4.1.2

This commit is contained in:
Tobi Schäfer 2021-12-11 12:44:51 +01:00
commit 71c3eec62d
3 changed files with 14 additions and 8 deletions

View file

@ -26,7 +26,7 @@
</ul> </ul>
</header> </header>
<div class='uk-comment-body'> <div class='uk-comment-body'>
<% comment.text | comment.format %> <% comment.text | comment.format markdown %>
</div> </div>
</article> </article>

View file

@ -405,6 +405,7 @@ Image.prototype.thumbnail_macro = function(param) {
param.src = encodeURI(this.getUrl(this.getThumbnailFile().getName())); param.src = encodeURI(this.getUrl(this.getThumbnailFile().getName()));
if (!param.title) { param.title = encode(this.description || ''); } if (!param.title) { param.title = encode(this.description || ''); }
param.alt = encode(param.alt || param.title); param.alt = encode(param.alt || param.title);
param.loading = "lazy";
var width = param.width || this.thumbnailWidth; var width = param.width || this.thumbnailWidth;
var height = param.height || this.thumbnailHeight; var height = param.height || this.thumbnailHeight;
var style = []; var style = [];
@ -427,6 +428,7 @@ Image.prototype.render_macro = function(param) {
param.src = encodeURI(this.getUrl()); param.src = encodeURI(this.getUrl());
if (!param.title) { param.title = encode(this.description || ''); } if (!param.title) { param.title = encode(this.description || ''); }
param.alt = encode(param.alt || param.title); param.alt = encode(param.alt || param.title);
param.loading = "lazy";
var style = []; var style = [];
param.width && style.push('width:', param.width + 'px;'); param.width && style.push('width:', param.width + 'px;');
param.height && style.push('height:', param.height + 'px;'); param.height && style.push('height:', param.height + 'px;');

View file

@ -373,8 +373,8 @@
<div><% if <% site.modified %> then <% gettext 'Last modified {0}' <% site.modified text %> %> suffix=. %></div> <div><% if <% site.modified %> then <% gettext 'Last modified {0}' <% site.modified text %> %> suffix=. %></div>
</div> </div>
<div class='uk-text-right'> <div class='uk-text-right'>
<% image /smallchaos.gif | link https://antville.org %> & <% image /smallchaos.gif | link https://project.antville.org %> &
<% image /helma.png | link http://helma.org %> <% image /helma.png | link https://github.com/antville/helma %>
</div> </div>
</footer> </footer>
@ -440,7 +440,7 @@ html, html.uk-notouch, body {
body.av-16, body.av-page { body.av-16, body.av-page {
max-width: 900px; max-width: 900px;
margin: auto 5%; margin: 1em 5%;
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
@ -828,9 +828,9 @@ h4 + .uk-comment-meta li:first-child {
.av-header-bg-chaos { .av-header-bg-chaos {
width: 274px; width: 274px;
height: 53px; height: 53px;
margin-left: -54px; margin-left: -53px;
background: url('<% image /spritesheet.png url %>'); background: url('<% image /spritesheet.png url %>');
background-position: -9px -139px; background-position: -10px -139px;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
@ -845,11 +845,12 @@ h4 + .uk-comment-meta li:first-child {
.av-title { .av-title {
position: absolute; position: absolute;
top: 13px; top: 8px;
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow-x: hidden; overflow-x: hidden;
white-space: nowrap; white-space: nowrap;
line-height: 31px;
font-family: Verdana, Helvetica, Arial, sans-serif; font-family: Verdana, Helvetica, Arial, sans-serif;
font-size: 25px; font-size: 25px;
font-weight: bold; font-weight: bold;
@ -876,7 +877,7 @@ h4 + .uk-comment-meta li:first-child {
@media (max-width: 767px) { @media (max-width: 767px) {
.av-menu { .av-menu {
@top: 14px; @top: 23px;
@right: 5%; @right: 5%;
@size: 30px; @size: 30px;
@ -1012,6 +1013,9 @@ h4 + .uk-comment-meta li:first-child {
} }
} }
// AlpineJS https://alpinejs.dev/directives/cloak
[x-cloak] { display: none !important; }
// Overwriting some CSS classes for Googles custom search // Overwriting some CSS classes for Googles custom search
.gs-webResult.gs-result a.gs-title:link, .gs-webResult.gs-result a.gs-title:link,