Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feat/notice-shortcode' into feat…
Browse files Browse the repository at this point in the history
…/notice-shortcode
  • Loading branch information
lxndrblz committed Mar 26, 2022
2 parents a93793b + 3c80009 commit c52f433
Show file tree
Hide file tree
Showing 12 changed files with 87 additions and 14 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/update-resources.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: update resources

on:
push:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
- name: setup hugo
uses: peaceiris/actions-hugo@v2
with:
extended: true
hugo-version: 0.91.2
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 14
- name: install
run: |
npm ci
npm run prepare
- name: cache dependencies
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: build
run: npm run build
- name: commit resources
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: 'chore: build resources'
file_pattern: resources/** exampleSite/resources/**
17 changes: 17 additions & 0 deletions assets/scss/partials/components/_wrapper.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,19 @@
@include widescreen {
width: calc(#{$content-ratio} * 80%);
}

&--fullscreen {
margin-top: 20px;

@include desktop_and_print {
width: 100%;
margin-top: 0px;
}

@include widescreen {
width: $body-max-width;
}
}
}

&__sidebar {
Expand All @@ -34,5 +47,9 @@
@include widescreen {
width: calc(#{$sidebar-ratio} * 80%);
}

&--hidden {
display: none;
}
}
}
4 changes: 3 additions & 1 deletion exampleSite/config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ listDateFormat = "2/1/2006"

reversepagetitle = true # When set to 'true', the Window Title will be reversed to 'Title | Author' instead of the default 'Author | Title'

# hidesidebar = true

[simpleAnalytics]
# enable = true
# customurl = "https://analytics.example.com"
Expand Down Expand Up @@ -67,4 +69,4 @@ url = "https://www.instagram.com/"
[[socialIcons]]
icon = "fas fa-envelope"
title = "e-mail"
url = "mailto:[email protected]"
url = "mailto:[email protected]"

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Target":"scss/main.rtl.min.77d2565dfa96e01e0542eef93edb55160386d595a0bcbf7f08d8f3d2afa59ea3.css","MediaType":"text/css","Data":{"Integrity":"sha256-d9JWXfqW4B4FQu75PttVFgOG1ZWgvL9/CNjz0q+lnqM="}}
{"Target":"scss/main.rtl.min.77d2565dfa96e01e0542eef93edb55160386d595a0bcbf7f08d8f3d2afa59ea3.css","MediaType":"text/css","Data":{"Integrity":"sha256-d9JWXfqW4B4FQu75PttVFgOG1ZWgvL9/CNjz0q+lnqM="}}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Target":"scss/main.min.a89797221b46b6170306450a5cafd268d94cbd1771f6c0b882f8bd886ec83dfd.css","MediaType":"text/css","Data":{"Integrity":"sha256-qJeXIhtGthcDBkUKXK/SaNlMvRdx9sC4gvi9iG7IPf0="}}
{"Target":"scss/main.min.a89797221b46b6170306450a5cafd268d94cbd1771f6c0b882f8bd886ec83dfd.css","MediaType":"text/css","Data":{"Integrity":"sha256-qJeXIhtGthcDBkUKXK/SaNlMvRdx9sC4gvi9iG7IPf0="}}
20 changes: 18 additions & 2 deletions layouts/_default/baseof.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,26 @@
{{ end }}
>
<div class="wrapper">
<aside class="wrapper__sidebar">
<aside
{{ if and (not .IsHome) (eq .Site.Params.hidesidebar true) }}
class="wrapper__sidebar wrapper__sidebar--hidden"

{{ else }}
class="wrapper__sidebar"

{{ end }}
>
{{- partial "sidebar.html" . -}}
</aside>
<main class="wrapper__main">
<main
{{ if and (not .IsHome) (eq .Site.Params.hidesidebar true) }}
class="wrapper__main wrapper__main--fullscreen"

{{ else }}
class="wrapper__main"

{{ end }}
>
<header class="header">{{ partial "navbar.html" . }}</header>
{{- block "main" . }}{{- end }}
</main>
Expand Down
6 changes: 2 additions & 4 deletions layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,10 @@ <h2>{{ .Params.mainSectionsTitle }}</h2>
<div class="post__content">
<h3><a href="{{ .RelPermalink }}">{{ upper .Title }}</a></h3>
{{ if .Site.Params.fullPostContent }}
{{ .Content }}

<p>{{ .Content | markdownify }}</p>

{{ else }}
{{ .Summary }}

<p>{{ .Summary | markdownify }}</p>

{{ end }}
<!-- add read more -->
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Target":"scss/main.rtl.min.77d2565dfa96e01e0542eef93edb55160386d595a0bcbf7f08d8f3d2afa59ea3.css","MediaType":"text/css","Data":{"Integrity":"sha256-d9JWXfqW4B4FQu75PttVFgOG1ZWgvL9/CNjz0q+lnqM="}}
{"Target":"scss/main.rtl.min.77d2565dfa96e01e0542eef93edb55160386d595a0bcbf7f08d8f3d2afa59ea3.css","MediaType":"text/css","Data":{"Integrity":"sha256-d9JWXfqW4B4FQu75PttVFgOG1ZWgvL9/CNjz0q+lnqM="}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Target":"scss/main.min.a89797221b46b6170306450a5cafd268d94cbd1771f6c0b882f8bd886ec83dfd.css","MediaType":"text/css","Data":{"Integrity":"sha256-qJeXIhtGthcDBkUKXK/SaNlMvRdx9sC4gvi9iG7IPf0="}}
{"Target":"scss/main.min.5259d55db7b9c675f751f0865411bd84a410f3ffcb5105b8fc00b22fcb739309.css","MediaType":"text/css","Data":{"Integrity":"sha256-UlnVXbe5xnX3UfCGVBG9hKQQ8//LUQW4/ACyL8tzkwk="}}

0 comments on commit c52f433

Please sign in to comment.