diff --git a/themes/jefklak-creative-portfolio/assets/js/codex.js b/themes/jefklak-creative-portfolio/assets/js/codex.js index 4e01004..1a64842 100644 --- a/themes/jefklak-creative-portfolio/assets/js/codex.js +++ b/themes/jefklak-creative-portfolio/assets/js/codex.js @@ -44,13 +44,6 @@ document.addEventListener("DOMContentLoaded",function() { const box = new SimpleLightbox('.lbox', { /* options */ }); - function enableSidebarMenuForMobile() { - document.querySelector('[data-toggle="offcanvas"]').addEventListener('click', function () { - document.querySelector('.row-offcanvas').classList.toggle('active') - }); - } - enableSidebarMenuForMobile(); - function scrollThenFixSidebar() { const mainHeight = document.querySelector('main div').clientHeight const sidebarHeight = document.querySelector('.sidebar-content').clientHeight diff --git a/themes/jefklak-creative-portfolio/assets/sass/_bootstrap-minimal.sass b/themes/jefklak-creative-portfolio/assets/sass/_bootstrap-minimal.sass index 2f62bb5..9683367 100644 --- a/themes/jefklak-creative-portfolio/assets/sass/_bootstrap-minimal.sass +++ b/themes/jefklak-creative-portfolio/assets/sass/_bootstrap-minimal.sass @@ -45,7 +45,7 @@ code @media (min-width: 1200px) padding-left: 5rem - width: 73% + width: 75% &-content @media (min-width: 1200px) diff --git a/themes/jefklak-creative-portfolio/assets/sass/_codex.sass b/themes/jefklak-creative-portfolio/assets/sass/_codex.sass index 5f9a891..4565e67 100644 --- a/themes/jefklak-creative-portfolio/assets/sass/_codex.sass +++ b/themes/jefklak-creative-portfolio/assets/sass/_codex.sass @@ -233,10 +233,6 @@ article text-align: left !important main - float: left - @media (min-width: 768px) - width: 75% - ul li list-style-type: circle @@ -256,17 +252,6 @@ a:hover, .link:hover color: var(--textlink) background-color: #d1d3bd - -.img-inactive - display: block - width: 100% - - -.img-active - display: none - width: 100% - - .pages color: var(--accent) diff --git a/themes/jefklak-creative-portfolio/assets/sass/_sidebar.sass b/themes/jefklak-creative-portfolio/assets/sass/_sidebar.sass index f10f3ac..ffda8c4 100644 --- a/themes/jefklak-creative-portfolio/assets/sass/_sidebar.sass +++ b/themes/jefklak-creative-portfolio/assets/sass/_sidebar.sass @@ -1,32 +1,42 @@ -.sidebar - padding: 0 - height: 100% - float: left - min-height: 1px - overflow: auto - vertical-align: top - display: inline-block - padding-left: 10px - background-color: var(--bgdark) +$navpercentage: 24% - @media (min-width: 768px) - width: 25% +#all + display: grid + grid-template-columns: $navpercentage 1fr + + @media screen and (max-width: 767px) + grid-template-columns: 100% + + nav + grid-row: 2 + main + grid-row: 1 + +.sidebar + padding-left: 1.1em + padding-right: 1.1em + background-color: var(--bgdark) + border-right: 5px solid var(--accent) + + @media screen and (max-width: 767px) + font-size: 0.8em &-scrolling - width: 100% + width: unset position: unset - &-fixed - position: fixed - bottom: 0px - width: 50% - - @media (min-width: 768px) - width: calc(25% - 5px) + &-fixed + @media screen and (min-width: 767px) + padding-left: 1.1em + padding-right: 1.1em + position: fixed + bottom: 0 + left: 0 + width: $navpercentage &-menu list-style-type: none - padding-left: 20px + padding-left: 0 margin-bottom: 40px li @@ -43,23 +53,11 @@ &:hover border: 1px solid var(--accent) + background: $bglight &:before, a color: var(--textlink) - &-content - background-color: var(--bgdark) - border-right: 5px solid var(--accent) - padding-top: 30px - padding-left: 10px - @media (min-width: 992px) - padding-left: 20px - padding-right: 20px - - &-offcanvas - @media screen and (max-width: 767px) - left: -46% !important - hr border-top: 1px solid var(--accent) @@ -69,6 +67,10 @@ margin-bottom: 1rem overflow: hidden + img + @media (min-width: 768px) + width: 100% + p margin: 0 @@ -80,64 +82,23 @@ -moz-transform: rotate(-45deg) -o-transform: rotate(-45deg) -ms-transform: rotate(-45deg) - top: -50px - right: 20px - width: 25px - - @media (min-width: 768px) - top: -60px - right: 35px - width: 40px + top: -60px + right: 35px + width: 40px &-header img float: right &-heading font-weight: bold - font-size: 1.1rem + font-size: 1.1em letter-spacing: 0.1em text-transform: uppercase padding-top: 10px padding-left: 10px margin-top: 0 - - &-date + &-description color: var(--textlinkdark) font-size: 0.7rem - -.row-offcanvas - @media screen and (max-width: 767px) - position: relative - transition: all 0.25s ease-out - opacity: 1 - - &-right - .sidebar-offcanvas - @media screen and (max-width: 767px) - right: -50% - @media screen and (max-width: 767px) - right: 0 - - &-left - .sidebar-offcanvas - @media screen and (max-width: 767px) - left: -48% - @media screen and (max-width: 767px) - left: 0 - - - &-right.active - @media screen and (max-width: 767px) - right: 50% - &-left.active - @media screen and (max-width: 767px) - left: 50% - -.sidebar-offcanvas - @media screen and (max-width: 767px) - position: absolute - top: 0 - width: 50% - diff --git a/themes/jefklak-creative-portfolio/layouts/404.html b/themes/jefklak-creative-portfolio/layouts/404.html index 73a44ba..9dbcdbc 100644 --- a/themes/jefklak-creative-portfolio/layouts/404.html +++ b/themes/jefklak-creative-portfolio/layouts/404.html @@ -1,6 +1,5 @@ {{ define "main" }}
- {{ partial "mobile_nav_toggle.html" . }}

Page not found

diff --git a/themes/jefklak-creative-portfolio/layouts/_default/baseof.html b/themes/jefklak-creative-portfolio/layouts/_default/baseof.html index b680a3c..b21f6ea 100644 --- a/themes/jefklak-creative-portfolio/layouts/_default/baseof.html +++ b/themes/jefklak-creative-portfolio/layouts/_default/baseof.html @@ -14,17 +14,13 @@ get RSS feed {{ end }} +
-
-
- {{ partial "sidebar.html" . }} - -
- {{ block "main" . }} - {{ end }} -
-
-
+ {{ partial "sidebar.html" . }} +
+ {{ block "main" . }} + {{ end }} +
{{ partial "scripts.html" . }} diff --git a/themes/jefklak-creative-portfolio/layouts/_default/single.html b/themes/jefklak-creative-portfolio/layouts/_default/single.html index d013195..57ba035 100644 --- a/themes/jefklak-creative-portfolio/layouts/_default/single.html +++ b/themes/jefklak-creative-portfolio/layouts/_default/single.html @@ -1,7 +1,6 @@ {{ define "main" }}
- {{ partial "mobile_nav_toggle.html" . }}
diff --git a/themes/jefklak-creative-portfolio/layouts/_default/terms.html b/themes/jefklak-creative-portfolio/layouts/_default/terms.html index 1db0cf8..a864261 100644 --- a/themes/jefklak-creative-portfolio/layouts/_default/terms.html +++ b/themes/jefklak-creative-portfolio/layouts/_default/terms.html @@ -6,13 +6,9 @@ {{ partial "icons" . }}
-
-
- {{ partial "sidebar.html" . }} - -
+ {{ partial "sidebar.html" . }} +
- {{ partial "mobile_nav_toggle.html" . }}
@@ -52,13 +48,10 @@
- -
- - + - {{ partial "scripts.html" . }} + {{ partial "scripts.html" . }} {{ partial "footer.html" . }} diff --git a/themes/jefklak-creative-portfolio/layouts/about/list.html b/themes/jefklak-creative-portfolio/layouts/about/list.html index a155cd2..5fe8c77 100644 --- a/themes/jefklak-creative-portfolio/layouts/about/list.html +++ b/themes/jefklak-creative-portfolio/layouts/about/list.html @@ -1,6 +1,5 @@ {{ define "main" }}
- {{ partial "mobile_nav_toggle.html" . }}

{{ .Title }}

diff --git a/themes/jefklak-creative-portfolio/layouts/partials/gamegrid.html b/themes/jefklak-creative-portfolio/layouts/partials/gamegrid.html index 96a1490..ef77dc2 100644 --- a/themes/jefklak-creative-portfolio/layouts/partials/gamegrid.html +++ b/themes/jefklak-creative-portfolio/layouts/partials/gamegrid.html @@ -1,6 +1,4 @@
- {{ partial "mobile_nav_toggle.html" . }} - diff --git a/themes/jefklak-creative-portfolio/layouts/partials/mobile_nav_toggle.html b/themes/jefklak-creative-portfolio/layouts/partials/mobile_nav_toggle.html deleted file mode 100644 index f7bcce6..0000000 --- a/themes/jefklak-creative-portfolio/layouts/partials/mobile_nav_toggle.html +++ /dev/null @@ -1,3 +0,0 @@ -
- -
diff --git a/themes/jefklak-creative-portfolio/layouts/partials/portfolio-block.html b/themes/jefklak-creative-portfolio/layouts/partials/portfolio-block.html index cf7a8b3..c97c10e 100644 --- a/themes/jefklak-creative-portfolio/layouts/partials/portfolio-block.html +++ b/themes/jefklak-creative-portfolio/layouts/partials/portfolio-block.html @@ -1,39 +1,38 @@
- - {{ $thumb := "/img/logo.png" | absURL }} - {{ if .Params.image }} - {{ $thumb = .Params.image | absURL }} - {{ else if .Params.howlongtobeat_id }} - {{ $thumb = (printf "%scover.jpg" .Page.Permalink) | absURL }} - {{ else }} + {{- $thumb := "/img/logo.png" | absURL -}} + {{- if .Params.image -}} + {{- $thumb = .Params.image | absURL -}} + {{- else if .Params.howlongtobeat_id -}} + {{- $thumb = (printf "%scover.jpg" .Page.Permalink) | absURL -}} + {{- else -}} - {{ $perm := .Permalink }} - {{ $base := .Site.BaseURL }} - {{ $match := findRE `!\[(.*)\]\((.+).(jpg|png|gif)` .RawContent 1 }} - {{ range $match }} - {{ $relthumb := replaceRE `!\[(.*)\]\(` "" . }} - {{ if hasPrefix $relthumb "/" }} - {{ $thumb = printf "%s%s" $base $relthumb }} - {{ else }} - {{ $thumb = printf "%s%s" $perm $relthumb }} - {{ end }} - {{ end }} - {{ end }} + {{- $perm := .Permalink -}} + {{- $base := .Site.BaseURL -}} + {{- $match := findRE `!\[(.*)\]\((.+).(jpg|png|gif)` .RawContent 1 -}} + {{- range $match -}} + {{- $relthumb := replaceRE `!\[(.*)\]\(` "" . -}} + {{- if hasPrefix $relthumb "/" -}} + {{- $thumb = printf "%s%s" $base $relthumb -}} + {{- else -}} + {{- $thumb = printf "%s%s" $perm $relthumb -}} + {{- end -}} + {{- end -}} + {{- end -}} thumbnail of {{ .Title }}

{{ .Title }}

- {{ if .Date }} - {{ .Date.Format (.Site.Params.dateFormat | default "02/01/2006") | $.Scratch.Set "subtitle" }} + {{- if .Date -}} + {{- .Date.Format (.Site.Params.dateFormat | default "02/01/2006") | $.Scratch.Set "subtitle" -}} - {{ $.Scratch.Get "subtitle" }} + {{- $.Scratch.Get "subtitle" -}} - {{ end }} + {{- end -}}

{{ if isset .Params "score" }}{{ partial "scorelabel" . }} |{{ end }} @@ -41,5 +40,4 @@

-
diff --git a/themes/jefklak-creative-portfolio/layouts/partials/portfolio.html b/themes/jefklak-creative-portfolio/layouts/partials/portfolio.html index a2bf32f..c45b9a0 100644 --- a/themes/jefklak-creative-portfolio/layouts/partials/portfolio.html +++ b/themes/jefklak-creative-portfolio/layouts/partials/portfolio.html @@ -1,30 +1,27 @@
- {{ partial "mobile_nav_toggle.html" . }} - - {{ if eq .Paginator.PageNumber 1 }} + {{- if eq .Paginator.PageNumber 1 -}}
{{ .Content }}
- {{ end }} + {{- end -}}

Featured: {{ .Title }} (Page {{ .Paginator.PageNumber }}/{{ .Paginator.TotalPages }}) »

- {{ range (.Paginate .Pages).Pages }} - {{ if and (gt (len .Content) 1) (ne .Params.ignore true) }} + {{- range (.Paginate .Pages).Pages -}} + {{- if and (gt (len .Content) 1) (ne .Params.ignore true) -}} {{ partial "portfolio-block.html" . }} - {{ end }} - {{ end }} + {{- end -}} + {{- end -}}
{{- template "_internal/pagination.html" . }}
-
diff --git a/themes/jefklak-creative-portfolio/layouts/partials/sidebar.html b/themes/jefklak-creative-portfolio/layouts/partials/sidebar.html index f80bd6c..968c357 100644 --- a/themes/jefklak-creative-portfolio/layouts/partials/sidebar.html +++ b/themes/jefklak-creative-portfolio/layouts/partials/sidebar.html @@ -1,109 +1,108 @@ -