Skip to content

Commit a8a30c8

Browse files
authored
Resolve homepage conflict after merge
2 parents 7206206 + c48c6f0 commit a8a30c8

File tree

2 files changed

+54
-14
lines changed

2 files changed

+54
-14
lines changed
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
2+
name: Deploy Jekyll with GitHub Pages dependencies preinstalled
3+
4+
on:
5+
# Runs on pushes targeting the default branch
6+
push:
7+
branches: ["main"]
8+
9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
13+
permissions:
14+
contents: read
15+
pages: write
16+
id-token: write
17+
18+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
19+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
20+
concurrency:
21+
group: "pages"
22+
cancel-in-progress: false
23+
24+
jobs:
25+
# Build job
26+
build:
27+
runs-on: ubuntu-latest
28+
steps:
29+
- name: Checkout
30+
uses: actions/checkout@v4
31+
- name: Setup Pages
32+
uses: actions/configure-pages@v5
33+
- name: Build with Jekyll
34+
uses: actions/jekyll-build-pages@v1
35+
with:
36+
source: ./
37+
destination: ./_site
38+
- name: Upload artifact
39+
uses: actions/upload-pages-artifact@v3
40+
41+
# Deployment job
42+
deploy:
43+
environment:
44+
name: github-pages
45+
url: ${{ steps.deployment.outputs.page_url }}
46+
runs-on: ubuntu-latest
47+
needs: build
48+
steps:
49+
- name: Deploy to GitHub Pages
50+
id: deployment
51+
uses: actions/deploy-pages@v4

src/pages/index.js

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,10 @@ export default function Home() {
88
description="Smart Packets. Structured. Voice-Ready.">
99
<main style={{ padding: '3rem', textAlign: 'center' }}>
1010
<img src="/img/logo.png" alt="SPID Protocol Logo" style={{ width: 200, marginBottom: '2rem' }} />
11-
<h1 style={{ fontSize: '3rem', marginBottom: '1rem' }}>SPID Protocol</h1>
12-
<p style={{ fontSize: '1.25rem', marginBottom: '2rem' }}>
13-
We’re building the open standard for voice-first, structured communication.
14-
</p>
11+
<h1 style={{ fontSize: '3rem' }}>SPID Protocol</h1>
12+
<p style={{ fontSize: '1.25rem' }}>We’re building the open standard for voice-first, structured communication.</p>
1513
<a href="/docs/intro">
16-
<button
17-
style={{
18-
padding: '1rem 2rem',
19-
fontSize: '1.1rem',
20-
backgroundColor: '#e63946',
21-
color: 'white',
22-
border: 'none',
23-
borderRadius: '8px',
24-
cursor: 'pointer',
25-
}}>
14+
<button style={{ marginTop: '2rem', padding: '1rem 2rem', fontSize: '1.1rem', backgroundColor: '#e63946', color: 'white', border: 'none', borderRadius: '8px', cursor: 'pointer' }}>
2615
🚀 Explore the Docs
2716
</button>
2817
</a>

0 commit comments

Comments
 (0)