Skip to content

Commit

Permalink
fix index merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
cote3804 committed Aug 7, 2024
2 parents 9456356 + 9abc2a8 commit 0662745
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 2 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

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

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Single deploy job since we're just deploying
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v5
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
# Upload entire repository
path: '.'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<div class="container text-center z-n1 position-absolute">
<div class="row bg-dark bg-gradient nopadding opacity-50">
<div class="col p-0 fixed-bottom"> <!-- Background image -->
<img src="./images/surface_transparent.png" class="z-n1" alt="Main Image" style="align-items: flex-end; width: 100%">
<img src="images/surface_transparent.png" class="z-n1" alt="Main Image" style="align-items: flex-end; width: 100%">
</div>
</div>
</div>
Expand Down Expand Up @@ -124,4 +124,4 @@ <h1>MathJax with Custom Colors Example</h1>
});
</script>
</body>
</html>
</html>

0 comments on commit 0662745

Please sign in to comment.