roberto/speedtech-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Git conflict

Browse source
This commit is contained in:
roberto 2025-05-18 16:47:17 +02:00
commit 0a964b1237
7 changed files with 60 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
layouts/blogibis/single.html
View file

@ -21,27 +21,21 @@
<div id="page-content">
<div class="container">
<div class="row">
<div class="col s12 m9 l9">
<section>
<article>
{{ if isset .Params "images"}}
{{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
{{ $mainimage := resources.Get (index .Params.images 0) }}
<p style="text-algin: center"><img class="img-fluid" src="{{ $mainimage.RelPermalink }}" width="500">
</p>
{{ end }}
{{ end }}
<div class="col s12 m9 l9 articlecontent">
{{ if isset .Params "images"}}
{{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
{{ $mainimage := resources.Get (index .Params.images 0) }}
<p style="text-algin: center"><img class="img-fluid" src="{{ $mainimage.RelPermalink }}" width="500"></p>
{{ end }}
{{ end }}
<div style="text-align: justify;">
{{ .Content }}
</div>
<div style="text-align: justify;">
{{ .Content }}
</div>
<small>{{ i18n "publishdate"}} : {{.PublishDate.Format "2006-01-02"}}</small> | <small>{{ i18n "lastchange"}} : {{.Lastmod.Format "2006-01-02"}}</small>
<small>{{ i18n "publishdate"}} : {{.PublishDate.Format "2006-01-02"}}</small> | <small>{{ i18n "lastchange"}} : {{.Lastmod.Format "2006-01-02"}}</small>
{{ partial "widgets/ibiscattags.html" . }}
</article>
</section>
{{ partial "widgets/ibiscattags.html" . }}
</div>
{{ partial "widgets/ibissidebar.html" . }}

30
layouts/blogspot/single.html
View file

@ -21,27 +21,21 @@
<div id="page-content">
<div class="container">
<div class="row">
<div class="col s12 m9 l9">
<section>
<article>
<div class="col s12 m9 l9 articlecontent">
{{ if isset .Params "images"}}
{{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
{{ $mainimage := resources.Get (index .Params.images 0) }}
<p class="text-center"><img class="img-fluid" src="{{ $mainimage.RelPermalink }}" width="400"></p>
{{ end }}
{{ end }}
{{ if isset .Params "images"}}
{{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
{{ $mainimage := resources.Get (index .Params.images 0) }}
<p class="text-center"><img class="img-fluid" src="{{ $mainimage.RelPermalink }}" width="400"></p>
{{ end }}
{{ end }}
<div style="text-align: justify;">
{{ .Content }}
</div>
<div style="text-align: justify;">
{{ .Content }}
</div>
<small>{{ i18n "publishdate"}} : {{.PublishDate.Format "2006-01-02"}}</small> | <small>{{ i18n "lastchange"}} : {{.Lastmod.Format "2006-01-02"}}</small>
<small>{{ i18n "publishdate"}} : {{.PublishDate.Format "2006-01-02"}}</small> | <small>{{ i18n "lastchange"}} : {{.Lastmod.Format "2006-01-02"}}</small>
{{ partial "partials/widgets/spotcattags.html" . }}
</article>
</section>
{{ partial "partials/widgets/spotcattags.html" . }}
</div>
{{ partial "partials/widgets/spotsidebar.html" . }}

2
layouts/partials/article-item.html
View file

@ -1,5 +1,5 @@
<div class="row blog-article-item-list">
<h4 class="blog-article-title"><a href="{{ .Permalink }}">{{.article.Title}}</a></h4>
<h4 class="blog-article-title"><a href="{{ .article.Permalink }}">{{.article.Title}}</a></h4>
<div class="col s12 m4 l4 blog-article-image">
{{ if isset .article.Params "images"}}
{{ if (fileExists (printf "assets/%s" (index .article.Params.images 0))) -}}

23
static/css/custom.css
View file

@ -78,4 +78,27 @@ footer .menu {
.blog-article-image {
padding-left: 20px;
padding-right: 20px;
}
.blog-single .title {
margin-top: 20px;
}
/* Min medium */
@media (min-width: 767px) {
.servicesidebar, .blogsidebar {
border-left: 1px solid #ccc;
}
.articlecontent, .servicecontent {
padding-left: 20px;
padding-right: 20px;
}
}
/* Max small */
@media (max-width: 767px) {
.servicesidebar, .blogsidebar {
margin-top: 30px;
}
}

15
themes/lean/layouts/partials/analytics.html
View file

@ -1,15 +0,0 @@
<!-- Matomo -->
<script type="text/javascript" async>
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//{{ .Site.Params.analyticsUrl }}/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '{{ .Site.Params.Analytics.SiteId }}']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Matomo Code -->

6
themes/lean/layouts/partials/head.html
View file

@ -27,8 +27,8 @@
{{ hugo.Generator }}
<link href="{{ "css/main.css" | relURL }}" rel="stylesheet">
<link href="{{ "css/custom.css" | relURL }}" rel="stylesheet">
<link href="{{ "css/main.css?8" | relURL }}" rel="stylesheet">
<link href="{{ "css/custom.css?8" | relURL }}" rel="stylesheet">
<!-- Favicon and Apple touch icons-->
<link rel="shortcut icon" href="{{ "img/favicon.ico" | relURL }}" type="image/x-icon">
@ -42,6 +42,4 @@
<script src="/js/htmx/htmx.min.js" defer></script>
<script src="/js/main.js" defer></script>
{{ partial "analytics.html" . }}
</head>

10
website.iml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="Go" enabled="true" />
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>