Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Wonderfall committed Dec 30, 2023
2 parents 3e21361 + a1cb044 commit d3368d1
Show file tree
Hide file tree
Showing 34 changed files with 526 additions and 144 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Please fill the template below
- Device/Os: [e.g. Android 10]
- Type: [e.g. Desktop/Mobile]
- Browser and version [e.g. Chrome 86.0]:
- Hugo Version [ >=0.97.1 expected]:
- Hugo Version [ >=0.112.4 expected]:
- Theme Version [e.g. v4.0, master, or commit-id ]:

**Steps to reproduce the behavior:**
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
hugoVersion:
description: "Hugo Version"
required: false
default: "0.97.1"
default: "0.112.4"

# Allow one concurrent deployment
concurrency:
Expand All @@ -38,22 +38,22 @@ jobs:
build:
runs-on: ubuntu-latest
env:
HUGO_VERSION: "0.97.1"
HUGO_VERSION: "0.112.4"
steps:
- name: Check version
if: ${{ github.event.inputs.hugoVersion }}
run: export HUGO_VERSION="${{ github.event.inputs.hugoVersion }}"
- name: Install Hugo CLI
run: |
wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.deb \
wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_linux-amd64.deb \
&& sudo dpkg -i ${{ runner.temp }}/hugo.deb
- name: Checkout
uses: actions/checkout@v3
with:
ref: exampleSite
- name: Setup Pages
id: pages
uses: actions/configure-pages@v1
uses: actions/configure-pages@v3
- name: Get Theme
run: git submodule update --init --recursive
- name: Update theme to Latest commit
Expand All @@ -64,7 +64,7 @@ jobs:
--buildDrafts --gc --verbose \
--baseURL ${{ steps.pages.outputs.base_url }}
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v2
with:
path: ./public
# Deployment job
Expand All @@ -77,4 +77,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v2
8 changes: 3 additions & 5 deletions assets/css/common/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@
margin-inline-start: auto;
}

.social-icons {
padding: 12px 0;
}

.social-icons a:not(:last-of-type) {
margin-inline-end: 12px;
.social-icons a {
display: inline-flex;
padding: 10px;
}

.social-icons a svg {
Expand Down
10 changes: 7 additions & 3 deletions assets/css/common/post-entry.css
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,17 @@
bottom: 0;
}

.entry-cover,
.entry-isdraft {
font-size: 14px;
.entry-hint {
color: var(--secondary);
}

.entry-hint-parent {
display: flex;
justify-content: space-between;
}

.entry-cover {
font-size: 14px;
margin-bottom: var(--gap);
text-align: center;
}
Expand Down
30 changes: 17 additions & 13 deletions assets/css/common/post-single.css
Original file line number Diff line number Diff line change
Expand Up @@ -128,19 +128,18 @@
}

.post-content table {
margin-bottom: 32px;
margin-bottom: var(--content-gap);
}

.post-content table th,
.post-content table:not(.highlighttable, .highlight table, .gist .highlight) td {
min-width: 80px;
padding: 12px 8px;
padding: 8px 5px;
line-height: 1.5;
border-bottom: 1px solid var(--border);
}

.post-content table th {
font-size: 14px;
text-align: start;
}

Expand Down Expand Up @@ -314,10 +313,18 @@
margin-top: 56px;
}

.post-footer>* {
margin-bottom: 10px;
}

.post-tags {
display: flex;
flex-wrap: wrap;
gap: 10px;
}

.post-tags li {
display: inline-block;
margin-inline-end: 3px;
margin-bottom: 5px;
}

.post-tags a,
Expand All @@ -329,26 +336,24 @@

.post-tags a {
display: block;
padding-inline-start: 14px;
padding-inline-end: 14px;
padding: 0 14px;
color: var(--secondary);
font-size: 14px;
line-height: 34px;
background: var(--tertiary);
}

.share-buttons {
margin: 14px 0;
padding-inline-start: var(--radius);
padding: 10px;
display: flex;
justify-content: center;
overflow-x: auto;
background: none;
border: none;
gap: 10px;
}

.share-buttons li,
.share-buttons a {
margin-top: 10px;
display: inline-flex;
}

.share-buttons a:not(:last-of-type) {
Expand All @@ -370,7 +375,6 @@ h6:hover .anchor {
}

.paginav {
margin: 10px 0;
display: flex;
line-height: 30px;
border-radius: var(--radius);
Expand Down
9 changes: 5 additions & 4 deletions assets/css/common/profile-mode.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,20 @@
text-align: center;
}

.profile .profile_inner h1 {
padding: 12px 0;
.profile .profile_inner {
display: flex;
flex-direction: column;
align-items: center;
gap: 10px;
}

.profile img {
display: inline-table;
border-radius: 50%;
}

.buttons {
flex-wrap: wrap;
max-width: 400px;
margin: 0 auto;
}

.button {
Expand Down
2 changes: 2 additions & 0 deletions assets/css/core/reset.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ html {
-webkit-tap-highlight-color: transparent;
overflow-y: scroll;
scroll-behavior: smooth;
-webkit-text-size-adjust: 100%;
text-size-adjust: 100%;
}

a,
Expand Down
6 changes: 6 additions & 0 deletions assets/css/core/zmedia.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
}
}

@media screen and (max-width: 340px) {
.share-buttons {
justify-content: unset;
}
}

@media (prefers-reduced-motion) {
/* terms; profile-mode; post-single; post-entry; post-entry; search; search */
.terms-tags a:active,
Expand Down
7 changes: 6 additions & 1 deletion assets/js/fastsearch.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,12 @@ sInput.onkeyup = function (e) {
// run a search query (for "term") every time a letter is typed
// in the search box
if (fuse) {
const results = fuse.search(this.value.trim()); // the actual query being run using fuse.js
let results;
if (params.fuseOpts) {
results = fuse.search(this.value.trim(), {limit: params.fuseOpts.limit}); // the actual query being run using fuse.js along with options
} else {
results = fuse.search(this.value.trim()); // the actual query being run using fuse.js
}
if (results.length !== 0) {
// build our html if result exists
let resultSet = ''; // our results bucket
Expand Down

0 comments on commit d3368d1

Please sign in to comment.