Skip to content

Commit 86f8527

Browse files
gbazgbaz
committed
Merge branch 'cd88-design-updates'
2 parents bdda3b9 + 40b40d5 commit 86f8527

16 files changed

Lines changed: 283 additions & 129 deletions

‎.agent-context.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"main.scss": {
3+
"jekyll_syntax": "The top two lines are Jekyll front matter (---) to indicate SCSS. Nothing should ever go above these lines.",
4+
"organization": "Styles are ordered from top to bottom, matching the order of elements as rendered in homepage.html.",
5+
"media_queries": "After the main CSS, there are blocks of media queries handling the same CSS from smallest screen width to largest. Whenever adding CSS to the top section, add corresponding adjustments to the media query sections for final tweaks based on screen widths."
6+
}
7+
}

‎.gitignore‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# macOS
2+
.DS_Store
3+
4+
# Logs and temp files
5+
*.log
6+
*.tmp
7+
8+
# Ruby
9+
*.gem
10+
11+
# Jekyll
12+
_site/
13+
# Other
14+
.env
15+
16+
# VS Code
17+
.vscode/

‎README.md‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,24 @@
1-
# johnhenry
1+
# johnhenry
2+
3+
## Running Locally
4+
5+
This site uses [Jekyll](https://jekyllrb.com/).
6+
7+
### Prerequisites
8+
- Ruby (recommended: latest version)
9+
- Bundler (`gem install bundler` if not installed)
10+
11+
### Setup & Serve
12+
1. Install dependencies:
13+
```sh
14+
bundle install
15+
```
16+
2. Start the local server:
17+
```sh
18+
bundle exec jekyll serve
19+
```
20+
3. Open your browser and visit [http://localhost:4000](http://localhost:4000)
21+
22+
### Troubleshooting
23+
- If you encounter issues with Ruby or Bundler, see the [Jekyll installation docs](https://jekyllrb.com/docs/installation/).
24+
- For plugin errors, ensure all gems in the `Gemfile` are installed.

‎_config.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ url: "https://www.johnhenry.site"
66
baseurl: ""
77

88
footer_only_homepage: true
9-
footer_url: "https://github.com/rhl-bthr"
10-
footer_text: "Theme by rhl-bthr"
9+
footer_url: "https://www.johnhenry.site/"
10+
footer_text: "© 2025 The John Henry Committee"
1111

1212
profile-picture: assets/jhc_logo.png
1313
favicon_location: assets/favicon.ico
@@ -20,6 +20,8 @@ sass:
2020
navbar:
2121
- name: "About"
2222
link: "about"
23+
- name: "Contact"
24+
link: "contact"
2325
# - name: "Tech Workers Coalition"
2426
# absolute-link: "https://techworkerscoalition.org"
2527

‎_includes/head.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<meta name="description" content="{{ desc }}">
2020
<link href='https://fonts.googleapis.com/css?family=Inconsolata:400,700' rel='stylesheet' type='text/css'>
2121
<link rel="stylesheet" href="{{ sitedir }}css/main.css">
22+
<link rel="stylesheet" href="{{ sitedir }}css/html-defaults.css">
2223
<link rel="icon" type="image/ico" href="{{ favicon_location }}">
2324
<link rel="shortcut-icon" type="image/ico" href="{{ favicon_location }}">
2425

‎_includes/navbar.html‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
<div class="navbar">
2+
<div class="logos">
3+
<a href="https://techworkerscoalition.org/" target="_blank" rel="noopener">
4+
<img class="nav-logo" src="/assets/twc-logo.svg" alt="TWC Logo" />
5+
</a>
6+
<a href="https://www.johnhenry.site/" target="_blank" rel="noopener">
7+
<img class="nav-logo" src="/assets/jhc-logo.png" alt="JHC Logo" />
8+
</a>
9+
</div>
10+
211
<a class="site-title" href="{{ site.url }}{{ site.baseurl}}/">{{ site.title }}</a>
312

413
<ul class="pull-right">
514
{% for x in site.navbar %}
6-
<li class="pull-left">
15+
<li class="float-left">
716
{% if x.absolute-link %}
8-
{% assign x-url = x.absolute-link %}
17+
{% assign x-url = x.absolute-link %}
918
{% else %}
10-
{% assign x-url = site.url | append: site.baseurl | append: "/" | append: x.link %}
19+
{% assign x-url = site.url | append: site.baseurl | append: "/" | append: x.link %}
1120
{% endif %}
1221
<a href="{{ x-url }}">{{ x.name }}</a>
13-
{% if forloop.last == false %}/{% endif %}
1422
</li>
1523
{% endfor %}
1624
</ul>
17-
18-
<hr>
19-
</div>
25+
</div>
26+
<hr>

_layouts/default.html renamed to _layouts/homepage.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
{{page.title}}
1111
</div>
1212
<div class="content">
13+
<div class="row">
14+
<div class="column column-header">Resources<hr /></div>
15+
<div class="column column-header">Articles<hr /></div>
16+
</div>
1317
{{ content }}
1418
</div>
1519
{% include footer.html %}

‎_layouts/post.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: homepage
33
---
44

55
<div class="page-subtitle">

‎about.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: homepage
33
title: About
44
---
55

assets/jhc_logo.png renamed to assets/jhc-logo.png

File renamed without changes.

0 commit comments

Comments
 (0)