Compare commits

..

3 commits

Author SHA1 Message Date
0a964b1237 Git conflict 2025-05-18 16:47:17 +02:00
15fbd6145d Git conflict 2025-05-18 16:43:03 +02:00
5baa6cc59b Improved layouts of single service page 2025-05-18 16:19:27 +02:00
9 changed files with 106 additions and 103 deletions

2
.idea/.gitignore generated vendored
View file

@ -3,6 +3,8 @@
/workspace.xml /workspace.xml
# Editor-based HTTP Client requests # Editor-based HTTP Client requests
/httpRequests/ /httpRequests/
# Environment-dependent path to Maven home directory
/mavenHomeManager.xml
# Datasource local storage ignored files # Datasource local storage ignored files
/dataSources/ /dataSources/
/dataSources.local.xml /dataSources.local.xml

2
.idea/.name generated
View file

@ -1 +1 @@
SpeedTech Website SpeedTech - Website

2
.idea/misc.xml generated
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager"> <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

2
.idea/modules.xml generated
View file

@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/website.iml" filepath="$PROJECT_DIR$/website.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/website.iml" filepath="$PROJECT_DIR$/.idea/website.iml" />
</modules> </modules>
</component> </component>
</project> </project>

9
.idea/website.iml generated Normal file
View file

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

View file

@ -22,7 +22,6 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col l9 m9 s12"> <div class="col l9 m9 s12">
<section class="col s12">
<div class="list-group"> <div class="list-group">
{{ $paginator := .Paginate ((where .Pages "Type" "blogibis").ByParam "lastmod").Reverse}} {{ $paginator := .Paginate ((where .Pages "Type" "blogibis").ByParam "lastmod").Reverse}}
{{ range $paginator.Pages }} {{ range $paginator.Pages }}
@ -32,7 +31,6 @@
{{ partial "partials/pagination.html" (dict "page" . "format" "default" "align" "center") }} {{ partial "partials/pagination.html" (dict "page" . "format" "default" "align" "center") }}
</section>
</div> </div>
{{ partial "widgets/ibissidebar.html" . }} {{ partial "widgets/ibissidebar.html" . }}
</div> </div>

View file

@ -1,11 +1,8 @@
<section> {{ with .projects }}
{{ $projects := first 4 ((where (.Site.RegularPages.RelatedIndices . "services" ) "Type" "blogspot").ByLastmod ) }}
{{ with $projects }}
<h4 class="text-center">{{ i18n "related_projects" }}</h4> <h4 class="text-center">{{ i18n "related_projects" }}</h4>
{{ range . }} {{ range . }}
<div class="col l12 article" style="text-align: center"> <div class="article" style="text-align: center">
{{ partial "widgets/article.html" . }} {{ partial "widgets/article.html" . }}
</div> </div>
{{ end }} {{ end }}
{{ end }} {{ end }}
</section>

View file

@ -5,12 +5,20 @@
<body hx-boost="true" lang="{{ .Site.Language.Lang }}"> <body hx-boost="true" lang="{{ .Site.Language.Lang }}">
{{ partial "nav.html" . }} {{ partial "nav.html" . }}
{{ $projects := first 4 ((where (.Site.RegularPages.RelatedIndices . "services" ) "Type" "blogspot").ByLastmod ) }}
{{ $numOfProjects := $projects | len}}
{{ $contentClass := "s12 m9 l9" }}
{{ if eq $numOfProjects 0 }}
{{ $contentClass = "s12 m12 l12" }}
{{ end }}
<div id="page-content"> <div id="page-content">
<header class="service"> <header class="service">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col s12 m9 l9"> <div class="col {{ $contentClass }}">
<h2>{{ .Title }}</h2> <h2>{{ .Title }}</h2>
<p>{{ .Params.shortDescription }}</p> <p>{{ .Params.shortDescription }}</p>
</div> </div>
@ -25,20 +33,21 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col s12 m9 l9 servicecontent"> <div class="col {{ $contentClass }}">
{{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}} {{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
{{ $mainimage := resources.Get (index .Params.images 0) }} {{ $mainimage := resources.Get (index .Params.images 0) }}
<p style="text-align: center"><img class="img-fluid" src="{{ $mainimage.RelPermalink }}" width="500"> <p style="text-align: center"><img class="img-fluid" src="{{ $mainimage.RelPermalink }}" width="500"></p>
</p> {{ end }}
{{ end }} <div style="text-align: justify;">
<div style="text-align: justify;"> {{ .Content }}
{{ .Content }} </div>
</div>
</div> </div>
<div class="col m3 l3 servicesidebar"> {{ if gt $numOfProjects 0 }}
{{ partial "widgets/servicesidebar.html" . }} <div class="col s12 m3 l3 servicesidebar">
{{ partial "widgets/servicesidebar.html" (dict "projects" $projects "service" .) }}
</div> </div>
{{ end }}
</div> </div>
<!-- /.row --> <!-- /.row -->

View file

@ -211,7 +211,7 @@ body {
-webkit-mask-repeat: no-repeat; -webkit-mask-repeat: no-repeat;
mask-repeat: no-repeat; mask-repeat: no-repeat;
-webkit-mask-size: 100% 100%; -webkit-mask-size: 100% 100%;
mask-size: 100% 100%; mask-size: 100% 100%;
} }
.icon-responsive-menu { .icon-responsive-menu {
@ -235,6 +235,7 @@ body {
#topnav { #topnav {
background-color: var(--dark-color); background-color: var(--dark-color);
border-bottom: 1px solid #ddd;
padding: 0 10px; padding: 0 10px;
position: fixed; position: fixed;
top: 0; top: 0;
@ -336,71 +337,6 @@ body {
display: block; display: block;
} }
@media screen and (max-width: 992px) {
body {
padding-top: 80px;
}
#topnav {
padding-top: 10px;
padding-bottom: 10px;
}
#responsive-button {
display: block;
}
#topmenu {
position:relative;
}
#topmenu ul {
background:var(--dark-color);
position:absolute;
z-index:3;
height:auto;
display:none;
top: 54px;
right: -30px;
flex-direction: column;
border-bottom-left-radius: 10px;
padding-left:0;
}
#topmenu ul li {
padding-top:4px;
padding-bottom: 4px;
}
#topmenu ul li.dropdown:after {
content: none;
}
#topmenu ul.submenu {
width:100%;
position:static;
background: var(--dark-color);
color: #fff;
padding-top:4px;
padding-bottom: 4px;
margin-top:0;
margin-bottom:0;
}
#topmenu ul.submenu li a{
color: #fff;
}
#topmenu li {display:block;float:left;width:auto;}
#topmenu :is(ul li:hover > ul, li:focus-within > ul, ul li ul:hover, ul li ul:focus) {
display: flex;
}
#topmenu.responsive ul {display: flex;visibility: visible; opacity: 1; margin-top:0}
#topmenu.responsive ul>li>ul.submenu>li {visibility: visible; display:block;}
}
#home-introduction { #home-introduction {
h4 { h4 {
text-align: center; text-align: center;
@ -456,15 +392,11 @@ footer {
color: rgba(255, 255, 255, 0.7); color: rgba(255, 255, 255, 0.7);
padding-top: 40px; padding-top: 40px;
padding-bottom: 40px; padding-bottom: 40px;
}
footer .menu ul { .menu ul {
list-style-type: none; list-style-type: none;
padding-left: 0; padding-left: 0;
} }
footer .icon {
margin-right: 5px;
} }
.img-fluid { .img-fluid {
@ -476,13 +408,9 @@ footer .icon {
} }
ul.pagination { ul.pagination {
margin-block-start: 0;
margin-block-end: 0;
padding-inline-start: 0;
list-style-type: none; list-style-type: none;
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-bottom: 40px;
} }
link { link {
@ -499,7 +427,7 @@ link {
.page-link { .page-link {
position: relative; position: relative;
display: block; display: block;
color: #207491; color: var(--primary-color);
padding: .375rem .75rem; padding: .375rem .75rem;
text-decoration: none; text-decoration: none;
background-color: #fff; background-color: #fff;
@ -508,8 +436,8 @@ link {
} }
.page-item.active .page-link { .page-item.active .page-link {
background-color: #207491; background-color: var(--primary-color);
border-color: #207491; border-color: var(--primary-color);
color: #fff; color: #fff;
} }
@ -786,6 +714,66 @@ link {
} }
} }
@media screen and (max-width: 992px) {
body {
padding-top: 60px;
}
#responsive-button {
display: block;
}
#topmenu {
position:relative;
}
#topmenu ul {
background:var(--dark-color);
position:absolute;
z-index:3;
height:auto;
display:none;
top: 45px;
right: -30px;
flex-direction: column;
border-bottom-left-radius: 10px;
padding-left:0;
}
#topmenu ul li {
padding-top:4px;
padding-bottom: 4px;
}
#topmenu ul li.dropdown:after {
content: none;
}
#topmenu ul.submenu {
width:100%;
position:static;
background: var(--dark-color);
color: #fff;
padding-top:4px;
padding-bottom: 4px;
margin-top:0;
margin-bottom:0;
}
#topmenu ul.submenu li a{
color: #fff;
}
#topmenu li {display:block;float:left;width:auto;}
#topmenu :is(ul li:hover > ul, li:focus-within > ul, ul li ul:hover, ul li ul:focus) {
display: flex;
}
#topmenu.responsive ul {display: flex;visibility: visible; opacity: 1; margin-top:0}
#topmenu.responsive ul>li>ul.submenu>li {visibility: visible; display:block;}
}
@media (max-width: 1140px) { @media (max-width: 1140px) {
.container { .container {
padding-left: 20px; padding-left: 20px;