1
0
mirror of https://github.com/gilbN/theme.park.git synced 2024-11-04 10:12:31 +01:00

Merge branch 'develop'

This commit is contained in:
GilbN 2022-04-03 16:16:19 +02:00
commit 464094d643
2 changed files with 11 additions and 7 deletions

View File

@ -37,15 +37,15 @@ jobs:
run: | run: |
ARCHITECTURE=${{ matrix.architecture }} ARCHITECTURE=${{ matrix.architecture }}
echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ') echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo ::set-output name=title::${GITHUB_REPOSITORY,,}:${GITHUB_REF//refs\/heads\//} echo ::set-output name=title::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}
echo ::set-output name=revision::${GITHUB_SHA} echo ::set-output name=revision::${GITHUB_SHA}
echo ::set-output name=source::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/tree/${GITHUB_REF//refs\/heads\//} echo ::set-output name=source::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/tree/${{ github.ref_name }}
echo ::set-output name=vendor::${{ github.repository_owner }} echo ::set-output name=vendor::${{ github.repository_owner }}
echo ::set-output name=url::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/blob/master/README.md echo ::set-output name=url::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/blob/master/README.md
echo ::set-output name=VERSION::${{ github.event.release.tag_name }} echo ::set-output name=VERSION::${{ github.event.release.tag_name }}
echo ::set-output name=platform::${ARCHITECTURE//-/\/} echo ::set-output name=platform::${ARCHITECTURE//-/\/}
echo ::set-output name=cache::${GITHUB_REPOSITORY,,}:${GITHUB_REF//refs\/heads\//}-cache-${{ matrix.architecture }} echo ::set-output name=cache::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-cache-${{ matrix.architecture }}
echo ::set-output name=tag::${GITHUB_REPOSITORY,,}:${GITHUB_REF//refs\/heads\//}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}-${{ matrix.architecture }} echo ::set-output name=tag::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}-${{ matrix.architecture }}
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v1 uses: docker/setup-qemu-action@v1
@ -122,7 +122,7 @@ jobs:
DOCKER_CLI_EXPERIMENTAL: enabled DOCKER_CLI_EXPERIMENTAL: enabled
run: | run: |
IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,} IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,}
TAG=${GITHUB_REF//refs\/heads\//} TAG=${{ github.ref_name }}
SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER} SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}
VERSION=${{ steps.prep.outputs.VERSION }} VERSION=${{ steps.prep.outputs.VERSION }}
[[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64 [[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64

View File

@ -66,11 +66,10 @@ section {
/* slightly transparent fallback for Firefox (not supporting backdrop-filter) */ /* slightly transparent fallback for Firefox (not supporting backdrop-filter) */
@supports not ((-webkit-backdrop-filter: none) or (backdrop-filter: none)) { @supports not ((-webkit-backdrop-filter: none) or (backdrop-filter: none)) {
#mainNav, #mainNav,
#mainNav.navbar-scrolled { #mainNav.navbar-scrolled {
box-shadow: none; box-shadow: none;
background-color: rgba(0, 0, 0, 0.9); background-color: rgba(var(--accent-color), 1);
} }
} }
#mainNav .navbar-nav .nav-item .nav-link { #mainNav .navbar-nav .nav-item .nav-link {
@ -83,6 +82,11 @@ section {
opacity: .8; opacity: .8;
} }
@media (min-width: 992px) { @media (min-width: 992px) {
@supports not ((-webkit-backdrop-filter: none) or (backdrop-filter: none)) {
#mainNav {
background-color: rgba(var(--accent-color), 0.95) !important;
}
}
#mainNav { #mainNav {
box-shadow: none; box-shadow: none;
background-color: rgba(var(--accent-color), 0.25); background-color: rgba(var(--accent-color), 0.25);