Skip to content

Commit e6111aa

Browse files
rjokenrjoken
authored
Fix some font styling issues (#86)
* Fix some font styling issues * bundle update
1 parent 848b6ac commit e6111aa

5 files changed

Lines changed: 132 additions & 90 deletions

File tree

‎Gemfile.lock‎

Lines changed: 83 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
action_text-trix (2.1.17)
4+
action_text-trix (2.1.18)
55
railties
6-
actioncable (8.1.2)
7-
actionpack (= 8.1.2)
8-
activesupport (= 8.1.2)
6+
actioncable (8.1.3)
7+
actionpack (= 8.1.3)
8+
activesupport (= 8.1.3)
99
nio4r (~> 2.0)
1010
websocket-driver (>= 0.6.1)
1111
zeitwerk (~> 2.6)
12-
actionmailbox (8.1.2)
13-
actionpack (= 8.1.2)
14-
activejob (= 8.1.2)
15-
activerecord (= 8.1.2)
16-
activestorage (= 8.1.2)
17-
activesupport (= 8.1.2)
12+
actionmailbox (8.1.3)
13+
actionpack (= 8.1.3)
14+
activejob (= 8.1.3)
15+
activerecord (= 8.1.3)
16+
activestorage (= 8.1.3)
17+
activesupport (= 8.1.3)
1818
mail (>= 2.8.0)
19-
actionmailer (8.1.2)
20-
actionpack (= 8.1.2)
21-
actionview (= 8.1.2)
22-
activejob (= 8.1.2)
23-
activesupport (= 8.1.2)
19+
actionmailer (8.1.3)
20+
actionpack (= 8.1.3)
21+
actionview (= 8.1.3)
22+
activejob (= 8.1.3)
23+
activesupport (= 8.1.3)
2424
mail (>= 2.8.0)
2525
rails-dom-testing (~> 2.2)
26-
actionpack (8.1.2)
27-
actionview (= 8.1.2)
28-
activesupport (= 8.1.2)
26+
actionpack (8.1.3)
27+
actionview (= 8.1.3)
28+
activesupport (= 8.1.3)
2929
nokogiri (>= 1.8.5)
3030
rack (>= 2.2.4)
3131
rack-session (>= 1.0.1)
3232
rack-test (>= 0.6.3)
3333
rails-dom-testing (~> 2.2)
3434
rails-html-sanitizer (~> 1.6)
3535
useragent (~> 0.16)
36-
actiontext (8.1.2)
36+
actiontext (8.1.3)
3737
action_text-trix (~> 2.1.15)
38-
actionpack (= 8.1.2)
39-
activerecord (= 8.1.2)
40-
activestorage (= 8.1.2)
41-
activesupport (= 8.1.2)
38+
actionpack (= 8.1.3)
39+
activerecord (= 8.1.3)
40+
activestorage (= 8.1.3)
41+
activesupport (= 8.1.3)
4242
globalid (>= 0.6.0)
4343
nokogiri (>= 1.8.5)
44-
actionview (8.1.2)
45-
activesupport (= 8.1.2)
44+
actionview (8.1.3)
45+
activesupport (= 8.1.3)
4646
builder (~> 3.1)
4747
erubi (~> 1.11)
4848
rails-dom-testing (~> 2.2)
4949
rails-html-sanitizer (~> 1.6)
50-
activejob (8.1.2)
51-
activesupport (= 8.1.2)
50+
activejob (8.1.3)
51+
activesupport (= 8.1.3)
5252
globalid (>= 0.3.6)
53-
activemodel (8.1.2)
54-
activesupport (= 8.1.2)
55-
activerecord (8.1.2)
56-
activemodel (= 8.1.2)
57-
activesupport (= 8.1.2)
53+
activemodel (8.1.3)
54+
activesupport (= 8.1.3)
55+
activerecord (8.1.3)
56+
activemodel (= 8.1.3)
57+
activesupport (= 8.1.3)
5858
timeout (>= 0.4.0)
59-
activestorage (8.1.2)
60-
actionpack (= 8.1.2)
61-
activejob (= 8.1.2)
62-
activerecord (= 8.1.2)
63-
activesupport (= 8.1.2)
59+
activestorage (8.1.3)
60+
actionpack (= 8.1.3)
61+
activejob (= 8.1.3)
62+
activerecord (= 8.1.3)
63+
activesupport (= 8.1.3)
6464
marcel (~> 1.0)
65-
activesupport (8.1.2)
65+
activesupport (8.1.3)
6666
base64
6767
bigdecimal
6868
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -79,28 +79,28 @@ GEM
7979
public_suffix (>= 2.0.2, < 8.0)
8080
ast (2.4.3)
8181
aws-eventstream (1.4.0)
82-
aws-partitions (1.1227.0)
83-
aws-sdk-core (3.243.0)
82+
aws-partitions (1.1232.0)
83+
aws-sdk-core (3.244.0)
8484
aws-eventstream (~> 1, >= 1.3.0)
8585
aws-partitions (~> 1, >= 1.992.0)
8686
aws-sigv4 (~> 1.9)
8787
base64
8888
bigdecimal
8989
jmespath (~> 1, >= 1.6.1)
9090
logger
91-
aws-sdk-kms (1.122.0)
92-
aws-sdk-core (~> 3, >= 3.241.4)
91+
aws-sdk-kms (1.123.0)
92+
aws-sdk-core (~> 3, >= 3.244.0)
9393
aws-sigv4 (~> 1.5)
94-
aws-sdk-s3 (1.216.0)
95-
aws-sdk-core (~> 3, >= 3.243.0)
94+
aws-sdk-s3 (1.217.1)
95+
aws-sdk-core (~> 3, >= 3.244.0)
9696
aws-sdk-kms (~> 1)
9797
aws-sigv4 (~> 1.5)
9898
aws-sigv4 (1.12.1)
9999
aws-eventstream (~> 1, >= 1.0.2)
100100
base64 (0.3.0)
101-
bcrypt (3.1.21)
101+
bcrypt (3.1.22)
102102
bcrypt_pbkdf (1.1.2)
103-
bigdecimal (4.0.1)
103+
bigdecimal (4.1.0)
104104
bindex (0.8.1)
105105
bootsnap (1.23.0)
106106
msgpack (~> 1.2)
@@ -140,12 +140,12 @@ GEM
140140
erubi (1.13.1)
141141
et-orbi (1.4.0)
142142
tzinfo
143-
ffi (1.17.3-aarch64-linux-gnu)
144-
ffi (1.17.3-aarch64-linux-musl)
145-
ffi (1.17.3-arm-linux-gnu)
146-
ffi (1.17.3-arm-linux-musl)
147-
ffi (1.17.3-x86_64-linux-gnu)
148-
ffi (1.17.3-x86_64-linux-musl)
143+
ffi (1.17.4-aarch64-linux-gnu)
144+
ffi (1.17.4-aarch64-linux-musl)
145+
ffi (1.17.4-arm-linux-gnu)
146+
ffi (1.17.4-arm-linux-musl)
147+
ffi (1.17.4-x86_64-linux-gnu)
148+
ffi (1.17.4-x86_64-linux-musl)
149149
fugit (1.12.1)
150150
et-orbi (~> 1.4)
151151
raabro (~> 1.4)
@@ -172,10 +172,7 @@ GEM
172172
actionview (>= 7.0.0)
173173
activesupport (>= 7.0.0)
174174
jmespath (1.6.2)
175-
json (2.19.1)
176-
json-schema (6.2.0)
177-
addressable (~> 2.8)
178-
bigdecimal (>= 3.1, < 5)
175+
json (2.19.3)
179176
kamal (2.11.0)
180177
activesupport (>= 7.0)
181178
base64 (~> 0.2)
@@ -207,8 +204,6 @@ GEM
207204
net-smtp
208205
marcel (1.1.0)
209206
matrix (0.4.3)
210-
mcp (0.8.0)
211-
json-schema (>= 4.1)
212207
mini_magick (5.3.1)
213208
logger
214209
mini_mime (1.1.5)
@@ -229,27 +224,27 @@ GEM
229224
net-ssh (>= 5.0.0, < 8.0.0)
230225
net-smtp (0.5.1)
231226
net-protocol
232-
net-ssh (7.3.1)
227+
net-ssh (7.3.2)
233228
nio4r (2.7.5)
234-
nokogiri (1.19.1-aarch64-linux-gnu)
229+
nokogiri (1.19.2-aarch64-linux-gnu)
235230
racc (~> 1.4)
236-
nokogiri (1.19.1-aarch64-linux-musl)
231+
nokogiri (1.19.2-aarch64-linux-musl)
237232
racc (~> 1.4)
238-
nokogiri (1.19.1-arm-linux-gnu)
233+
nokogiri (1.19.2-arm-linux-gnu)
239234
racc (~> 1.4)
240-
nokogiri (1.19.1-arm-linux-musl)
235+
nokogiri (1.19.2-arm-linux-musl)
241236
racc (~> 1.4)
242-
nokogiri (1.19.1-x86_64-linux-gnu)
237+
nokogiri (1.19.2-x86_64-linux-gnu)
243238
racc (~> 1.4)
244-
nokogiri (1.19.1-x86_64-linux-musl)
239+
nokogiri (1.19.2-x86_64-linux-musl)
245240
racc (~> 1.4)
246241
ostruct (0.6.3)
247-
pagy (43.4.0)
242+
pagy (43.4.4)
248243
json
249244
uri
250245
yaml
251246
parallel (1.27.0)
252-
parser (3.3.10.2)
247+
parser (3.3.11.1)
253248
ast (~> 2.4.1)
254249
racc
255250
pg (1.6.3)
@@ -281,30 +276,30 @@ GEM
281276
rack (>= 1.3)
282277
rackup (2.3.1)
283278
rack (>= 3)
284-
rails (8.1.2)
285-
actioncable (= 8.1.2)
286-
actionmailbox (= 8.1.2)
287-
actionmailer (= 8.1.2)
288-
actionpack (= 8.1.2)
289-
actiontext (= 8.1.2)
290-
actionview (= 8.1.2)
291-
activejob (= 8.1.2)
292-
activemodel (= 8.1.2)
293-
activerecord (= 8.1.2)
294-
activestorage (= 8.1.2)
295-
activesupport (= 8.1.2)
279+
rails (8.1.3)
280+
actioncable (= 8.1.3)
281+
actionmailbox (= 8.1.3)
282+
actionmailer (= 8.1.3)
283+
actionpack (= 8.1.3)
284+
actiontext (= 8.1.3)
285+
actionview (= 8.1.3)
286+
activejob (= 8.1.3)
287+
activemodel (= 8.1.3)
288+
activerecord (= 8.1.3)
289+
activestorage (= 8.1.3)
290+
activesupport (= 8.1.3)
296291
bundler (>= 1.15.0)
297-
railties (= 8.1.2)
292+
railties (= 8.1.3)
298293
rails-dom-testing (2.3.0)
299294
activesupport (>= 5.0.0)
300295
minitest
301296
nokogiri (>= 1.6)
302297
rails-html-sanitizer (1.7.0)
303298
loofah (~> 2.25)
304299
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
305-
railties (8.1.2)
306-
actionpack (= 8.1.2)
307-
activesupport (= 8.1.2)
300+
railties (8.1.3)
301+
actionpack (= 8.1.3)
302+
activesupport (= 8.1.3)
308303
irb (~> 1.13)
309304
rackup (>= 1.0.0)
310305
rake (>= 12.2)
@@ -321,11 +316,10 @@ GEM
321316
reline (0.6.3)
322317
io-console (~> 0.5)
323318
rexml (3.4.4)
324-
rubocop (1.85.1)
319+
rubocop (1.86.0)
325320
json (~> 2.3)
326321
language_server-protocol (~> 3.17.0.2)
327322
lint_roller (~> 1.1.0)
328-
mcp (~> 0.6)
329323
parallel (~> 1.10)
330324
parser (>= 3.3.0.2)
331325
rainbow (>= 2.2.2, < 4.0)
@@ -374,7 +368,7 @@ GEM
374368
activejob (>= 7.2)
375369
activerecord (>= 7.2)
376370
railties (>= 7.2)
377-
solid_queue (1.3.2)
371+
solid_queue (1.4.0)
378372
activejob (>= 7.1)
379373
activerecord (>= 7.1)
380374
concurrent-ruby (>= 1.3.1)
@@ -400,9 +394,9 @@ GEM
400394
tailwindcss-ruby (4.2.1-x86_64-linux-gnu)
401395
tailwindcss-ruby (4.2.1-x86_64-linux-musl)
402396
thor (1.5.0)
403-
thruster (0.1.19)
404-
thruster (0.1.19-aarch64-linux)
405-
thruster (0.1.19-x86_64-linux)
397+
thruster (0.1.20)
398+
thruster (0.1.20-aarch64-linux)
399+
thruster (0.1.20-x86_64-linux)
406400
timeout (0.6.1)
407401
tsort (0.2.0)
408402
turbo-rails (2.0.23)

‎app/assets/tailwind/application.css‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
image-rendering: crisp-edges;
77
}
88

9+
[data-april-fools="true"] {
10+
font-family: "Comic Sans MS", "Comic Sans", "Comic Neue", cursive, sans-serif;
11+
}
12+
913
button,
1014
[type="button"],
1115
[type="submit"],
@@ -33,6 +37,8 @@
3337
--external-link: var(--color-blue-400);
3438
}
3539

40+
41+
3642
[data-theme="cyber"] {
3743
--bg: var(--color-slate-900);
3844
--surface: var(--color-slate-800);
@@ -185,6 +191,13 @@
185191
--external-link: var(--color-blue-400);
186192
}
187193

194+
195+
196+
#markdown-content {
197+
/* Override april fools joke for markdown content. I'm not that evil. */
198+
font-family: Ubuntu, ui-sans-serif, system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif;
199+
}
200+
188201
#markdown-content a {
189202
color: var(--external-link);
190203
text-decoration: underline;

‎app/javascript/controllers/aprilfools_controller.js‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { Controller } from "@hotwired/stimulus"
2+
3+
export default class extends Controller {
4+
connect() {
5+
const date = new Date();
6+
if (date.getMonth() !== 3 || date.getDate() !== 1) return;
7+
8+
document.getElementById("april-fools-container").classList.remove("hidden");
9+
this.element.textContent = localStorage.getItem("hatesFun") ? "I love fun" : "I hate fun"
10+
}
11+
disable() {
12+
if (localStorage.getItem("hatesFun")) {
13+
localStorage.removeItem("hatesFun")
14+
document.documentElement.setAttribute("data-april-fools", "true")
15+
return
16+
} else {
17+
localStorage.setItem("hatesFun", "true")
18+
document.documentElement.removeAttribute("data-april-fools")
19+
}
20+
21+
}
22+
}

‎app/javascript/controllers/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import ThemeController from "controllers/theme_controller"
88
import SearchQueryController from "controllers/search_query_controller"
99
import PrefillController from "controllers/prefill_controller"
1010
import MarkdownPreviewController from "controllers/markdown_preview_controller"
11+
import AprilFoolsController from "controllers/aprilfools_controller"
1112
import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading"
1213
eagerLoadControllersFrom("controllers", application)
1314

@@ -19,3 +20,4 @@ application.register("paste-viewer", PasteViewerController)
1920
application.register("search-query", SearchQueryController)
2021
application.register("prefill", PrefillController)
2122
application.register("markdown-preview", MarkdownPreviewController)
23+
application.register("aprilfools", AprilFoolsController)

0 commit comments

Comments
 (0)