Skip to content

Commit 7ac76b3

Browse files
committed
Took over GitHub action to fix issue with Sass
pulling hair out how do I make github use dart sass? manually update the version of jekyll-sass-converter update version Remove theme
1 parent a938765 commit 7ac76b3

File tree

6 files changed

+90
-101
lines changed

6 files changed

+90
-101
lines changed

.github/workflows/build-jekyll.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Build and Deploy Jekyll Site
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v4
14+
15+
- name: Setup Ruby and Install Gems
16+
uses: ruby/setup-ruby@v1
17+
with:
18+
ruby-version: '3.2'
19+
bundler-cache: true
20+
21+
- name: Build Jekyll Site
22+
run: bundle exec jekyll build
23+
24+
- name: Upload Artifact
25+
uses: actions/upload-pages-artifact@v3
26+
with:
27+
path: ./_site
28+
29+
deploy:
30+
needs: build
31+
runs-on: ubuntu-latest
32+
permissions:
33+
pages: write
34+
id-token: write
35+
environment:
36+
name: github-pages
37+
url: ${{ steps.deployment.outputs.page_url }}
38+
steps:
39+
- name: Deploy to GitHub Pages
40+
id: deployment
41+
uses: actions/deploy-pages@v4

Gemfile

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,13 @@
11
source "https://rubygems.org"
2-
# Hello! This is where you manage which Jekyll version is used to run.
3-
# When you want to use a different version, change it below, save the
4-
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
5-
#
6-
# bundle exec jekyll serve
7-
#
8-
# This will help ensure the proper Jekyll version is running.
9-
# Happy Jekylling!
102
gem "jekyll", "~> 4.4.1"
11-
# This is the default theme for new Jekyll sites. You may change this to anything you like.
12-
gem "minima", "~> 2.5"
13-
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
14-
# uncomment the line below. To upgrade, run `bundle update github-pages`.
153
# gem "github-pages", group: :jekyll_plugins
16-
# If you have any plugins, put them here!
17-
gem "jekyll-theme-hacker"
184
group :jekyll_plugins do
195
gem "jekyll-feed", "~> 0.12"
20-
# gem "jekyll-remote-theme"
216
end
227

23-
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
24-
# and associated library.
258
platforms :mingw, :x64_mingw, :mswin, :jruby do
269
gem "tzinfo", ">= 1", "< 3"
2710
gem "tzinfo-data"
2811
end
29-
30-
# Performance-booster for watching directories on Windows
3112
gem "wdm", "~> 0.1", :platforms => [:mingw, :x64_mingw, :mswin]
32-
33-
# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem
34-
# do not have a Java counterpart.
3513
gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]

Gemfile.lock

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@ GEM
7777
jekyll (>= 3.7, < 5.0)
7878
jekyll-sass-converter (3.1.0)
7979
sass-embedded (~> 1.75)
80-
jekyll-seo-tag (2.8.0)
81-
jekyll (>= 3.8, < 5.0)
82-
jekyll-theme-hacker (0.2.0)
83-
jekyll (> 3.5, < 5.0)
84-
jekyll-seo-tag (~> 2.0)
8580
jekyll-watch (2.2.1)
8681
listen (~> 3.0)
8782
json (2.15.0)
@@ -94,10 +89,6 @@ GEM
9489
rb-fsevent (~> 0.10, >= 0.10.3)
9590
rb-inotify (~> 0.9, >= 0.9.10)
9691
mercenary (0.3.6)
97-
minima (2.5.1)
98-
jekyll (>= 3.5, < 5.0)
99-
jekyll-feed (~> 0.9)
100-
jekyll-seo-tag (~> 2.1)
10192
pathutil (0.16.2)
10293
forwardable-extended (~> 2.6)
10394
public_suffix (5.1.1)
@@ -169,8 +160,6 @@ DEPENDENCIES
169160
http_parser.rb (~> 0.6.0)
170161
jekyll (~> 4.4.1)
171162
jekyll-feed (~> 0.12)
172-
jekyll-theme-hacker
173-
minima (~> 2.5)
174163
tzinfo (>= 1, < 3)
175164
tzinfo-data
176165
wdm (~> 0.1)

_config.yml

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,23 @@
1-
# Welcome to Jekyll!
2-
#
3-
# This config file is meant for settings that affect your whole blog, values
4-
# which you are expected to set up once and rarely edit after that. If you find
5-
# yourself editing this file very often, consider using Jekyll's data files
6-
# feature for the data you need to update frequently.
7-
#
8-
# For technical reasons, this file is *NOT* reloaded automatically when you use
9-
# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
10-
#
11-
# If you need help with YAML syntax, here are some quick references for you:
12-
# https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
13-
# https://learnxinyminutes.com/docs/yaml/
14-
#
15-
# Site settings
16-
# These are used to personalize your new site. If you look in the HTML files,
17-
# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
18-
# You can create any custom variable you would like, and they will be accessible
19-
# in the templates via {{ site.myvariable }}.
201

212
title: Caleb Larsen's Site
223
description: >- # this means to ignore newlines until "baseurl:"
234
A home for my projects and thoughts
245
baseurl: "/" # the subpath of your site, e.g. /blog
25-
url: "https://caleblarsen.github.io" # the base hostname & protocol for your site, e.g. http://example.com
6+
url: "https://caleblarsen.github.io"
267
github_username: CalebLarsen
278

289
# Build settings
29-
# theme: minima
30-
# remote_theme: pages-themes/[email protected]
31-
theme: jekyll-theme-hacker
3210
plugins:
3311
- jekyll-feed
34-
# - jekyll-remote-theme
3512

36-
# Exclude from processing.
37-
# The following items will not be processed, by default.
38-
# Any item listed under the `exclude:` key here will be automatically added to
39-
# the internal "default list".
40-
#
41-
# Excluded items can be processed by explicitly listing the directories or
42-
# their entries' file path in the `include:` list.
43-
#
4413
exclude:
45-
# - .sass-cache/
46-
# - .jekyll-cache/
47-
# - gemfiles/
48-
# - Gemfile
49-
# - Gemfile.lock
14+
- .sass-cache/
15+
- .jekyll-cache/
16+
- gemfiles/
17+
- Gemfile
18+
- Gemfile.lock
5019
- node_modules/
5120
- senseless/node_modules
5221
- senseless-src/
53-
# - vendor/bundle/
54-
# - vendor/cache/
55-
# - vendor/gems/
56-
# - vendor/ruby/
22+
5723
include: ["senseless/build"]

_sass/jekyll-theme-hacker.scss

Lines changed: 41 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $container-max-width: 1000px;
1010

1111
@mixin media-max-width($max-width) {
1212
@media (max-width: $max-width) {
13-
@content;
13+
@content;
1414
}
1515
}
1616

@@ -37,12 +37,17 @@ section {
3737
margin: 0 0 20px 0;
3838
}
3939

40-
h1, h2, h3, h4, h5, h6 {
40+
h1,
41+
h2,
42+
h3,
43+
h4,
44+
h5,
45+
h6 {
4146
margin: 0 0 20px;
4247
}
4348

4449
li {
45-
line-height: 1.4 ;
50+
line-height: 1.4;
4651
}
4752

4853
/* Header, <header>
@@ -65,12 +70,13 @@ header h1 {
6570
margin: 0 0 0 -40px;
6671
font-weight: bold;
6772
font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
68-
color: default_colors.$conifer;//$header;
73+
color: default_colors.$conifer; //$header;
6974
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1),
70-
0 0 5px rgba(181, 232, 83, 0.1),
71-
0 0 10px rgba(181, 232, 83, 0.1);
75+
0 0 5px rgba(181, 232, 83, 0.1),
76+
0 0 10px rgba(181, 232, 83, 0.1);
7277
letter-spacing: -1px;
7378
-webkit-font-smoothing: antialiased;
79+
7480
@include media-max-width($container-max-width) {
7581
margin-left: 0;
7682
}
@@ -101,18 +107,24 @@ header h2 {
101107
width: 100%;
102108
-webkit-font-smoothing: antialiased;
103109
}
110+
104111
section img {
105112
max-width: 100%
106113
}
107114

108-
h1, h2, h3, h4, h5, h6 {
115+
h1,
116+
h2,
117+
h3,
118+
h4,
119+
h5,
120+
h6 {
109121
font-weight: normal;
110122
font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
111123
color: $header;
112124
letter-spacing: -0.03em;
113125
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1),
114-
0 0 5px rgba(181, 232, 83, 0.1),
115-
0 0 10px rgba(181, 232, 83, 0.1);
126+
0 0 5px rgba(181, 232, 83, 0.1),
127+
0 0 10px rgba(181, 232, 83, 0.1);
116128
}
117129

118130
#main_content h1 {
@@ -150,7 +162,7 @@ dt {
150162
}
151163

152164
ul li {
153-
list-style-image:url('../images/bullet.png');
165+
list-style-image: url('../images/bullet.png');
154166
}
155167

156168
blockquote {
@@ -172,7 +184,7 @@ pre {
172184
}
173185

174186
code.highlighter-rouge {
175-
background: rgba(0,0,0,0.9);
187+
background: rgba(0, 0, 0, 0.9);
176188
border: 1px solid rgba(255, 255, 255, 0.15);
177189
padding: 0px 3px;
178190
margin: 0px -3px;
@@ -245,17 +257,18 @@ a {
245257

246258
/* Clearfix */
247259

248-
.cf:before, .cf:after {
249-
content:"";
250-
display:table;
260+
.cf:before,
261+
.cf:after {
262+
content: "";
263+
display: table;
251264
}
252265

253266
.cf:after {
254-
clear:both;
267+
clear: both;
255268
}
256269

257270
.cf {
258-
zoom:1;
271+
zoom: 1;
259272
}
260273

261274
#a-title {
@@ -265,17 +278,17 @@ a {
265278
/* My added styles */
266279

267280
nav {
268-
padding: 1rem 2rem;
281+
padding: 1rem 2rem;
269282
min-height: 60px;
270-
box-sizing: border-box;
283+
box-sizing: border-box;
271284
}
272285

273286
.nav-link {
274287
padding-right: 2rem;
275288
}
276289

277290
.demo-title {
278-
text-align: center;
291+
text-align: center;
279292
}
280293

281294
#demo-container {
@@ -291,20 +304,20 @@ canvas#target {
291304

292305
.demo-button-box {
293306
display: flex;
294-
justify-content:center;
307+
justify-content: center;
295308
/* margin-left: 35%; */
296309
/* margin-right: 35%; */
297310
}
298311

299312
.demo-button {
300-
width:1em;
301-
height:1em;
313+
width: 1em;
314+
height: 1em;
302315
border-radius: 50%;
303316
background: deeppink;
304317
padding: 0.25em;
305318
font-size: 3em;
306-
cursor:pointer;
307-
user-select:none;
319+
cursor: pointer;
320+
user-select: none;
308321

309322
display: flex;
310323
justify-content: center;
@@ -318,7 +331,9 @@ canvas#target {
318331
h1 {
319332
margin-left: 2rem;
320333
}
321-
h3, p {
334+
335+
h3,
336+
p {
322337
margin-left: 3rem;
323338
}
324339

@@ -328,4 +343,4 @@ ul {
328343

329344
.highlight {
330345
margin-left: 1.5rem;
331-
}
346+
}

assets/css/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
---
33

4-
@use 'jekyll-theme-hacker';
4+
@import 'jekyll-theme-hacker';
55

66
.pipeline-step {
77
display: grid;

0 commit comments

Comments
 (0)