diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..7bc07ec --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Environment-dependent path to Maven home directory +/mavenHomeManager.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6f29fee --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..b9ceecd --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/website.iml b/.idea/website.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/website.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/layouts/blogibis/list.html b/layouts/blogibis/list.html index 98c26e1..d23da77 100644 --- a/layouts/blogibis/list.html +++ b/layouts/blogibis/list.html @@ -22,7 +22,6 @@
-
{{ $paginator := .Paginate ((where .Pages "Type" "blogibis").ByParam "lastmod").Reverse}} {{ range $paginator.Pages }} @@ -32,7 +31,6 @@ {{ partial "partials/pagination.html" (dict "page" . "format" "default" "align" "center") }} -
{{ partial "widgets/ibissidebar.html" . }}
diff --git a/layouts/partials/widgets/ibissidebar.html b/layouts/partials/widgets/ibissidebar.html index da11bca..aaab8a8 100644 --- a/layouts/partials/widgets/ibissidebar.html +++ b/layouts/partials/widgets/ibissidebar.html @@ -1,4 +1,4 @@ -
+
{{ if isset .Site.Taxonomies "tagsibis" }} {{ if not (eq (len .Site.Taxonomies.tagsibis) 0) }}
diff --git a/layouts/partials/widgets/servicesidebar.html b/layouts/partials/widgets/servicesidebar.html index ccadc1e..9068b66 100644 --- a/layouts/partials/widgets/servicesidebar.html +++ b/layouts/partials/widgets/servicesidebar.html @@ -1,11 +1,8 @@ -
- {{ $projects := first 4 ((where (.Site.RegularPages.RelatedIndices . "services" ) "Type" "blogspot").ByLastmod ) }} - {{ with $projects }} + {{ with .projects }}

{{ i18n "related_projects" }}

{{ range . }} -
+
{{ partial "widgets/article.html" . }}
{{ end }} {{ end }} -
\ No newline at end of file diff --git a/layouts/partials/widgets/spotsidebar.html b/layouts/partials/widgets/spotsidebar.html index 2b50982..22eebc5 100644 --- a/layouts/partials/widgets/spotsidebar.html +++ b/layouts/partials/widgets/spotsidebar.html @@ -1,4 +1,4 @@ -
+
{{ if isset .Site.Taxonomies "tagsspot" }} {{ if not (eq (len .Site.Taxonomies.tagsspot) 0) }}
diff --git a/layouts/service/single.html b/layouts/service/single.html index b464c1a..700c8c2 100644 --- a/layouts/service/single.html +++ b/layouts/service/single.html @@ -5,12 +5,20 @@ {{ 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 }}
-
+

{{ .Title }}

{{ .Params.shortDescription }}

@@ -25,22 +33,21 @@
-
-
- {{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}} - {{ $mainimage := resources.Get (index .Params.images 0) }} -

-

- {{ end }} -
- {{ .Content }} -
-
+
+ {{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}} + {{ $mainimage := resources.Get (index .Params.images 0) }} +

+ {{ end }} +
+ {{ .Content }} +
-
- {{ partial "widgets/servicesidebar.html" . }} + {{ if gt $numOfProjects 0 }} +
+ {{ partial "widgets/servicesidebar.html" (dict "projects" $projects "service" .) }}
+ {{ end }}
diff --git a/themes/lean/static/css/main.css b/themes/lean/static/css/main.css index 596e1d6..a954938 100644 --- a/themes/lean/static/css/main.css +++ b/themes/lean/static/css/main.css @@ -337,66 +337,6 @@ body { display: block; } -@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;} -} - #home-introduction { h4 { text-align: center; @@ -487,7 +427,7 @@ link { .page-link { position: relative; display: block; - color: #207491; + color: var(--primary-color); padding: .375rem .75rem; text-decoration: none; background-color: #fff; @@ -496,8 +436,8 @@ link { } .page-item.active .page-link { - background-color: #207491; - border-color: #207491; + background-color: var(--primary-color); + border-color: var(--primary-color); color: #fff; } @@ -774,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) { .container { padding-left: 20px;