Skip to content

Commit 1769bfb

Browse files
committed
Merge remote-tracking branch 'upstream/master'
* upstream/master: (51 commits) [PATCH] Fix date format in schema and opengraph templates Fix error with profileMode imageUrl on Windows devices when imageUrl was set with external link resources.Get throws an error Use Nullish Coalescing Operator with Fastsearch (adityatelange#1033) Update bug report template add sketchfab icon (adityatelange#998) Fix spotify icon svg (adityatelange#997) Updating pagination strings for de (adityatelange#1024) Add icons for AniList and osu! (adityatelange#1022) Fix spacing around `rawhtml` shortcode (adityatelange#1018) Add param 'hiddenInHomeList' to hide certain post from home page Fix Code Smell: Unexpected var, use let or const instead. Add social icons for DeviantArt and Patreon (adityatelange#1013) Adding threema as social icon (adityatelange#1012) Feat: Add page nums in list pages pages: use github actions as build source - remove older build config (Classic Pages) Add more ja translations (adityatelange#1004) Updating pagination strings for bn: (adityatelange#1002) Add optional custom "title" for social links (adityatelange#999) Add a meta tag for naver site verification (adityatelange#991) add vimeo icon (adityatelange#975) ...
2 parents 861c47f + 3a0a481 commit 1769bfb

32 files changed

+396
-280
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ Please fill the template below
4040
**Expected behavior**:
4141
<!-- A clear and concise description of what you expected to happen. -->
4242

43+
**Repo/Source where this issue can be reproduced**:
44+
<!-- Please link source code of website where the said issue can be reproduced -->
45+
4346
**Screenshots**
4447
<!-- If applicable, add screenshots to help explain your problem. -->
4548

.github/workflows/build.yml

-37
This file was deleted.

.github/workflows/gh-pages.yml

+52-19
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build GH-Pages
1+
name: Deploy Hugo PaperMod Demo to Pages
22

33
on:
44
push:
@@ -17,31 +17,64 @@ on:
1717
required: false
1818
default: "0.83.0"
1919

20+
# Allow one concurrent deployment
21+
concurrency:
22+
group: "pages"
23+
cancel-in-progress: true
24+
25+
# Default to bash
26+
defaults:
27+
run:
28+
shell: bash
29+
30+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
31+
permissions:
32+
contents: read
33+
pages: write
34+
id-token: write
35+
2036
jobs:
21-
deploy:
37+
# Build job
38+
build:
2239
runs-on: ubuntu-latest
40+
env:
41+
HUGO_VERSION: "0.83.0"
2342
steps:
24-
- name: Git checkout
25-
uses: actions/checkout@v2
43+
- name: Check version
44+
if: ${{ github.event.inputs.hugoVersion }}
45+
run: export HUGO_VERSION="${{ github.event.inputs.hugoVersion }}"
46+
- name: Install Hugo CLI
47+
run: |
48+
wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.deb \
49+
&& sudo dpkg -i ${{ runner.temp }}/hugo.deb
50+
- name: Checkout
51+
uses: actions/checkout@v3
2652
with:
2753
ref: exampleSite
28-
54+
- name: Setup Pages
55+
id: pages
56+
uses: actions/configure-pages@v1
2957
- name: Get Theme
3058
run: git submodule update --init --recursive
31-
3259
- name: Update theme to Latest commit
3360
run: git submodule update --remote --merge
34-
35-
- name: Setup hugo
36-
uses: peaceiris/actions-hugo@v2
61+
- name: Build with Hugo
62+
run: |
63+
hugo \
64+
--buildDrafts --gc --verbose \
65+
--baseURL ${{ steps.pages.outputs.base_url }}
66+
- name: Upload artifact
67+
uses: actions/upload-pages-artifact@v1
3768
with:
38-
hugo-version: "${{ github.event.inputs.hugoVersion }}"
39-
40-
- name: Build
41-
run: hugo --buildDrafts --gc --verbose --minify
42-
43-
- name: Deploy
44-
uses: peaceiris/actions-gh-pages@v3
45-
with:
46-
github_token: ${{ secrets.TOKEN }}
47-
publish_dir: ./public
69+
path: ./public
70+
# Deployment job
71+
deploy:
72+
environment:
73+
name: github-pages
74+
url: ${{ steps.deployment.outputs.page_url }}
75+
runs-on: ubuntu-latest
76+
needs: build
77+
steps:
78+
- name: Deploy to GitHub Pages
79+
id: deployment
80+
uses: actions/deploy-pages@v1

assets/css/common/header.css

+1-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
font-weight: 700;
2828
}
2929

30-
.logo a img {
30+
.logo a img, .logo a svg {
3131
display: inline;
3232
vertical-align: middle;
3333
pointer-events: none;
@@ -36,10 +36,6 @@
3636
margin-inline-end: 8px;
3737
}
3838

39-
#theme-toggle svg {
40-
height: 18px;
41-
}
42-
4339
button#theme-toggle {
4440
font-size: 26px;
4541
margin: auto 4px;

assets/css/common/post-single.css

+5-37
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,6 @@
185185
margin-bottom: 0;
186186
}
187187

188-
.post-content .highlighttable td .highlight pre code::-webkit-scrollbar {
189-
display: none;
190-
}
191-
192188
.post-content code {
193189
margin: auto 4px;
194190
padding: 4px 6px;
@@ -340,17 +336,6 @@
340336
margin-inline-end: 12px;
341337
}
342338

343-
.share-buttons a svg {
344-
height: 30px;
345-
width: 30px;
346-
fill: currentColor;
347-
transition: transform 0.1s;
348-
}
349-
350-
.share-buttons svg:active {
351-
transform: scale(0.96);
352-
}
353-
354339
h1:hover .anchor,
355340
h2:hover .anchor,
356341
h3:hover .anchor,
@@ -364,28 +349,6 @@ h6:hover .anchor {
364349
user-select: none;
365350
}
366351

367-
.post-content :not(table) ::-webkit-scrollbar-thumb {
368-
border: 2px solid var(--hljs-bg);
369-
background: rgb(113, 113, 117);
370-
}
371-
372-
.post-content :not(table) ::-webkit-scrollbar-thumb:hover {
373-
background: rgb(163, 163, 165);
374-
}
375-
376-
.gist table::-webkit-scrollbar-thumb {
377-
border: 2px solid rgb(255, 255, 255);
378-
background: rgb(173, 173, 173);
379-
}
380-
381-
.gist table::-webkit-scrollbar-thumb:hover {
382-
background: rgb(112, 112, 112);
383-
}
384-
385-
.post-content table::-webkit-scrollbar-thumb {
386-
border-width: 2px;
387-
}
388-
389352
.paginav {
390353
margin: 10px 0;
391354
display: flex;
@@ -426,4 +389,9 @@ h6:hover .anchor {
426389

427390
h1>a>svg {
428391
display: inline;
392+
}
393+
394+
img.in-text {
395+
display: inline;
396+
margin: auto;
429397
}

assets/css/common/profile-mode.css

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
.profile img {
1818
display: inline-table;
1919
border-radius: 50%;
20-
pointer-events: none;
2120
}
2221

2322
.buttons {

assets/css/core/license.css

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/*
2+
PaperMod v6
3+
License: MIT https://github.com/adityatelange/hugo-PaperMod/blob/master/LICENSE
4+
Copyright (c) 2020 nanxiaobei and adityatelange
5+
Copyright (c) 2021-2022 adityatelange
6+
*/

assets/css/core/reset.css

-22
Original file line numberDiff line numberDiff line change
@@ -114,25 +114,3 @@ img {
114114
display: block;
115115
max-width: 100%;
116116
}
117-
118-
::-webkit-scrollbar-track {
119-
background: 0 0;
120-
}
121-
122-
.list:not(.dark)::-webkit-scrollbar-track {
123-
background: var(--code-bg);
124-
}
125-
126-
::-webkit-scrollbar-thumb {
127-
background: var(--tertiary);
128-
border: 5px solid var(--theme);
129-
border-radius: var(--radius);
130-
}
131-
132-
.list:not(.dark)::-webkit-scrollbar-thumb {
133-
border: 5px solid var(--code-bg);
134-
}
135-
136-
::-webkit-scrollbar-thumb:hover {
137-
background: var(--secondary);
138-
}

assets/css/core/zmedia.css

-9
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@
2929
}
3030
}
3131

32-
@media screen and (min-width: 768px) {
33-
/* reset */
34-
::-webkit-scrollbar {
35-
width: 19px;
36-
height: 11px;
37-
}
38-
}
39-
4032
/* footer */
4133
@media screen and (max-width: 900px) {
4234
.list .top-link {
@@ -48,7 +40,6 @@
4840
/* terms; profile-mode; post-single; post-entry; post-entry; search; search */
4941
.terms-tags a:active,
5042
.button:active,
51-
.share-buttons svg:active,
5243
.post-entry:active,
5344
.top-link,
5445
#searchResults .focus,

assets/css/includes/scroll-bar.css

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/* from reset */
2+
::-webkit-scrollbar-track {
3+
background: 0 0;
4+
}
5+
6+
.list:not(.dark)::-webkit-scrollbar-track {
7+
background: var(--code-bg);
8+
}
9+
10+
::-webkit-scrollbar-thumb {
11+
background: var(--tertiary);
12+
border: 5px solid var(--theme);
13+
border-radius: var(--radius);
14+
}
15+
16+
.list:not(.dark)::-webkit-scrollbar-thumb {
17+
border: 5px solid var(--code-bg);
18+
}
19+
20+
::-webkit-scrollbar-thumb:hover {
21+
background: var(--secondary);
22+
}
23+
24+
::-webkit-scrollbar:not(.highlighttable, .highlight table, .gist .highlight) {
25+
background: var(--theme);
26+
}
27+
28+
/* from post-single */
29+
.post-content .highlighttable td .highlight pre code::-webkit-scrollbar {
30+
display: none;
31+
}
32+
33+
.post-content :not(table) ::-webkit-scrollbar-thumb {
34+
border: 2px solid var(--hljs-bg);
35+
background: rgb(113, 113, 117);
36+
}
37+
38+
.post-content :not(table) ::-webkit-scrollbar-thumb:hover {
39+
background: rgb(163, 163, 165);
40+
}
41+
42+
.gist table::-webkit-scrollbar-thumb {
43+
border: 2px solid rgb(255, 255, 255);
44+
background: rgb(173, 173, 173);
45+
}
46+
47+
.gist table::-webkit-scrollbar-thumb:hover {
48+
background: rgb(112, 112, 112);
49+
}
50+
51+
.post-content table::-webkit-scrollbar-thumb {
52+
border-width: 2px;
53+
}
54+
55+
/* from zmedia */
56+
@media screen and (min-width: 768px) {
57+
58+
/* reset */
59+
::-webkit-scrollbar {
60+
width: 19px;
61+
height: 11px;
62+
}
63+
}

0 commit comments

Comments
 (0)