Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* 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)
  ...
  • Loading branch information
RoneoOrg committed Sep 30, 2022
2 parents 861c47f + 3a0a481 commit 1769bfb
Show file tree
Hide file tree
Showing 32 changed files with 396 additions and 280 deletions.
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ Please fill the template below
**Expected behavior**:
<!-- A clear and concise description of what you expected to happen. -->

**Repo/Source where this issue can be reproduced**:
<!-- Please link source code of website where the said issue can be reproduced -->

**Screenshots**
<!-- If applicable, add screenshots to help explain your problem. -->

Expand Down
37 changes: 0 additions & 37 deletions .github/workflows/build.yml

This file was deleted.

71 changes: 52 additions & 19 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build GH-Pages
name: Deploy Hugo PaperMod Demo to Pages

on:
push:
Expand All @@ -17,31 +17,64 @@ on:
required: false
default: "0.83.0"

# Allow one concurrent deployment
concurrency:
group: "pages"
cancel-in-progress: true

# Default to bash
defaults:
run:
shell: bash

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

jobs:
deploy:
# Build job
build:
runs-on: ubuntu-latest
env:
HUGO_VERSION: "0.83.0"
steps:
- name: Git checkout
uses: actions/checkout@v2
- 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 \
&& 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
- name: Get Theme
run: git submodule update --init --recursive

- name: Update theme to Latest commit
run: git submodule update --remote --merge

- name: Setup hugo
uses: peaceiris/actions-hugo@v2
- name: Build with Hugo
run: |
hugo \
--buildDrafts --gc --verbose \
--baseURL ${{ steps.pages.outputs.base_url }}
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
hugo-version: "${{ github.event.inputs.hugoVersion }}"

- name: Build
run: hugo --buildDrafts --gc --verbose --minify

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.TOKEN }}
publish_dir: ./public
path: ./public
# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
6 changes: 1 addition & 5 deletions assets/css/common/header.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
font-weight: 700;
}

.logo a img {
.logo a img, .logo a svg {
display: inline;
vertical-align: middle;
pointer-events: none;
Expand All @@ -36,10 +36,6 @@
margin-inline-end: 8px;
}

#theme-toggle svg {
height: 18px;
}

button#theme-toggle {
font-size: 26px;
margin: auto 4px;
Expand Down
42 changes: 5 additions & 37 deletions assets/css/common/post-single.css
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,6 @@
margin-bottom: 0;
}

.post-content .highlighttable td .highlight pre code::-webkit-scrollbar {
display: none;
}

.post-content code {
margin: auto 4px;
padding: 4px 6px;
Expand Down Expand Up @@ -340,17 +336,6 @@
margin-inline-end: 12px;
}

.share-buttons a svg {
height: 30px;
width: 30px;
fill: currentColor;
transition: transform 0.1s;
}

.share-buttons svg:active {
transform: scale(0.96);
}

h1:hover .anchor,
h2:hover .anchor,
h3:hover .anchor,
Expand All @@ -364,28 +349,6 @@ h6:hover .anchor {
user-select: none;
}

.post-content :not(table) ::-webkit-scrollbar-thumb {
border: 2px solid var(--hljs-bg);
background: rgb(113, 113, 117);
}

.post-content :not(table) ::-webkit-scrollbar-thumb:hover {
background: rgb(163, 163, 165);
}

.gist table::-webkit-scrollbar-thumb {
border: 2px solid rgb(255, 255, 255);
background: rgb(173, 173, 173);
}

.gist table::-webkit-scrollbar-thumb:hover {
background: rgb(112, 112, 112);
}

.post-content table::-webkit-scrollbar-thumb {
border-width: 2px;
}

.paginav {
margin: 10px 0;
display: flex;
Expand Down Expand Up @@ -426,4 +389,9 @@ h6:hover .anchor {

h1>a>svg {
display: inline;
}

img.in-text {
display: inline;
margin: auto;
}
1 change: 0 additions & 1 deletion assets/css/common/profile-mode.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
.profile img {
display: inline-table;
border-radius: 50%;
pointer-events: none;
}

.buttons {
Expand Down
6 changes: 6 additions & 0 deletions assets/css/core/license.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/*
PaperMod v6
License: MIT https://github.com/adityatelange/hugo-PaperMod/blob/master/LICENSE
Copyright (c) 2020 nanxiaobei and adityatelange
Copyright (c) 2021-2022 adityatelange
*/
22 changes: 0 additions & 22 deletions assets/css/core/reset.css
Original file line number Diff line number Diff line change
Expand Up @@ -114,25 +114,3 @@ img {
display: block;
max-width: 100%;
}

::-webkit-scrollbar-track {
background: 0 0;
}

.list:not(.dark)::-webkit-scrollbar-track {
background: var(--code-bg);
}

::-webkit-scrollbar-thumb {
background: var(--tertiary);
border: 5px solid var(--theme);
border-radius: var(--radius);
}

.list:not(.dark)::-webkit-scrollbar-thumb {
border: 5px solid var(--code-bg);
}

::-webkit-scrollbar-thumb:hover {
background: var(--secondary);
}
9 changes: 0 additions & 9 deletions assets/css/core/zmedia.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@
}
}

@media screen and (min-width: 768px) {
/* reset */
::-webkit-scrollbar {
width: 19px;
height: 11px;
}
}

/* footer */
@media screen and (max-width: 900px) {
.list .top-link {
Expand All @@ -48,7 +40,6 @@
/* terms; profile-mode; post-single; post-entry; post-entry; search; search */
.terms-tags a:active,
.button:active,
.share-buttons svg:active,
.post-entry:active,
.top-link,
#searchResults .focus,
Expand Down
63 changes: 63 additions & 0 deletions assets/css/includes/scroll-bar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/* from reset */
::-webkit-scrollbar-track {
background: 0 0;
}

.list:not(.dark)::-webkit-scrollbar-track {
background: var(--code-bg);
}

::-webkit-scrollbar-thumb {
background: var(--tertiary);
border: 5px solid var(--theme);
border-radius: var(--radius);
}

.list:not(.dark)::-webkit-scrollbar-thumb {
border: 5px solid var(--code-bg);
}

::-webkit-scrollbar-thumb:hover {
background: var(--secondary);
}

::-webkit-scrollbar:not(.highlighttable, .highlight table, .gist .highlight) {
background: var(--theme);
}

/* from post-single */
.post-content .highlighttable td .highlight pre code::-webkit-scrollbar {
display: none;
}

.post-content :not(table) ::-webkit-scrollbar-thumb {
border: 2px solid var(--hljs-bg);
background: rgb(113, 113, 117);
}

.post-content :not(table) ::-webkit-scrollbar-thumb:hover {
background: rgb(163, 163, 165);
}

.gist table::-webkit-scrollbar-thumb {
border: 2px solid rgb(255, 255, 255);
background: rgb(173, 173, 173);
}

.gist table::-webkit-scrollbar-thumb:hover {
background: rgb(112, 112, 112);
}

.post-content table::-webkit-scrollbar-thumb {
border-width: 2px;
}

/* from zmedia */
@media screen and (min-width: 768px) {

/* reset */
::-webkit-scrollbar {
width: 19px;
height: 11px;
}
}
Loading

0 comments on commit 1769bfb

Please sign in to comment.