Skip to content

Commit c4cfb65

Browse files
committed
Update the Ruby dependencies and retreat page styling
1 parent b743dee commit c4cfb65

3 files changed

Lines changed: 68 additions & 74 deletions

File tree

Gemfile.lock

Lines changed: 60 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,101 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.0)
5-
public_suffix (>= 2.0.2, < 5.0)
4+
addressable (2.8.8)
5+
public_suffix (>= 2.0.2, < 8.0)
6+
base64 (0.3.0)
7+
bigdecimal (4.0.1)
68
colorator (1.1.0)
7-
concurrent-ruby (1.1.9)
9+
concurrent-ruby (1.3.6)
10+
csv (3.3.5)
811
em-websocket (0.5.3)
912
eventmachine (>= 0.12.9)
1013
http_parser.rb (~> 0)
1114
eventmachine (1.2.7)
12-
eventmachine (1.2.7-x64-mingw32)
13-
faraday (1.10.0)
14-
faraday-em_http (~> 1.0)
15-
faraday-em_synchrony (~> 1.0)
16-
faraday-excon (~> 1.1)
17-
faraday-httpclient (~> 1.0)
18-
faraday-multipart (~> 1.0)
19-
faraday-net_http (~> 1.0)
20-
faraday-net_http_persistent (~> 1.0)
21-
faraday-patron (~> 1.0)
22-
faraday-rack (~> 1.0)
23-
faraday-retry (~> 1.0)
24-
ruby2_keywords (>= 0.0.4)
25-
faraday-em_http (1.0.0)
26-
faraday-em_synchrony (1.0.0)
27-
faraday-excon (1.1.0)
28-
faraday-httpclient (1.0.1)
29-
faraday-multipart (1.0.3)
30-
multipart-post (>= 1.2, < 3)
31-
faraday-net_http (1.0.1)
32-
faraday-net_http_persistent (1.2.0)
33-
faraday-patron (1.0.0)
34-
faraday-rack (1.0.0)
35-
faraday-retry (1.0.3)
36-
ffi (1.15.5-x64-mingw-ucrt)
37-
ffi (1.15.5-x64-mingw32)
15+
faraday (2.14.1)
16+
faraday-net_http (>= 2.0, < 3.5)
17+
json
18+
logger
19+
faraday-net_http (3.4.2)
20+
net-http (~> 0.5)
21+
ffi (1.17.3-x64-mingw-ucrt)
3822
forwardable-extended (2.6.0)
39-
http_parser.rb (0.8.0)
40-
i18n (1.10.0)
23+
google-protobuf (4.33.5-x64-mingw-ucrt)
24+
bigdecimal
25+
rake (>= 13)
26+
http_parser.rb (0.8.1)
27+
i18n (1.14.8)
4128
concurrent-ruby (~> 1.0)
42-
jekyll (4.2.1)
29+
jekyll (4.4.1)
4330
addressable (~> 2.4)
31+
base64 (~> 0.2)
4432
colorator (~> 1.0)
33+
csv (~> 3.0)
4534
em-websocket (~> 0.5)
4635
i18n (~> 1.0)
47-
jekyll-sass-converter (~> 2.0)
36+
jekyll-sass-converter (>= 2.0, < 4.0)
4837
jekyll-watch (~> 2.0)
49-
kramdown (~> 2.3)
38+
json (~> 2.6)
39+
kramdown (~> 2.3, >= 2.3.1)
5040
kramdown-parser-gfm (~> 1.0)
5141
liquid (~> 4.0)
52-
mercenary (~> 0.4.0)
42+
mercenary (~> 0.3, >= 0.3.6)
5343
pathutil (~> 0.9)
54-
rouge (~> 3.0)
44+
rouge (>= 3.0, < 5.0)
5545
safe_yaml (~> 1.0)
56-
terminal-table (~> 2.0)
57-
jekyll-feed (0.16.0)
46+
terminal-table (>= 1.8, < 4.0)
47+
webrick (~> 1.7)
48+
jekyll-feed (0.17.0)
5849
jekyll (>= 3.7, < 5.0)
5950
jekyll-gist (1.5.0)
6051
octokit (~> 4.2)
61-
jekyll-sass-converter (2.1.0)
62-
sassc (> 2.0.1, < 3.0)
52+
jekyll-sass-converter (3.1.0)
53+
sass-embedded (~> 1.75)
6354
jekyll-sitemap (1.4.0)
6455
jekyll (>= 3.7, < 5.0)
6556
jekyll-watch (2.2.1)
6657
listen (~> 3.0)
67-
kramdown (2.3.1)
68-
rexml
58+
json (2.18.1)
59+
kramdown (2.5.2)
60+
rexml (>= 3.4.4)
6961
kramdown-parser-gfm (1.1.0)
7062
kramdown (~> 2.0)
71-
liquid (4.0.3)
72-
listen (3.7.1)
63+
liquid (4.0.4)
64+
listen (3.10.0)
65+
logger
7366
rb-fsevent (~> 0.10, >= 0.10.3)
7467
rb-inotify (~> 0.9, >= 0.9.10)
68+
logger (1.7.0)
7569
mercenary (0.4.0)
76-
multipart-post (2.1.1)
77-
octokit (4.22.0)
78-
faraday (>= 0.9)
79-
sawyer (~> 0.8.0, >= 0.5.3)
70+
net-http (0.9.1)
71+
uri (>= 0.11.1)
72+
octokit (4.25.1)
73+
faraday (>= 1, < 3)
74+
sawyer (~> 0.9)
8075
pathutil (0.16.2)
8176
forwardable-extended (~> 2.6)
82-
public_suffix (4.0.6)
83-
rb-fsevent (0.11.1)
84-
rb-inotify (0.10.1)
77+
public_suffix (7.0.2)
78+
rake (13.3.1)
79+
rb-fsevent (0.11.2)
80+
rb-inotify (0.11.1)
8581
ffi (~> 1.0)
86-
rexml (3.2.5)
87-
rouge (3.28.0)
88-
ruby2_keywords (0.0.5)
82+
rexml (3.4.4)
83+
rouge (4.7.0)
8984
safe_yaml (1.0.5)
90-
sassc (2.4.0)
91-
ffi (~> 1.9)
92-
sassc (2.4.0-x64-mingw32)
93-
ffi (~> 1.9)
94-
sawyer (0.8.2)
85+
sass-embedded (1.97.3-x64-mingw-ucrt)
86+
google-protobuf (~> 4.31)
87+
sawyer (0.9.3)
9588
addressable (>= 2.3.5)
96-
faraday (> 0.8, < 2.0)
97-
terminal-table (2.0.0)
98-
unicode-display_width (~> 1.1, >= 1.1.1)
99-
unicode-display_width (1.8.0)
100-
wdm (0.1.1)
101-
webrick (1.7.0)
89+
faraday (>= 0.17.3, < 3)
90+
terminal-table (3.0.2)
91+
unicode-display_width (>= 1.1.1, < 3)
92+
unicode-display_width (2.6.0)
93+
uri (1.1.1)
94+
wdm (0.2.0)
95+
webrick (1.9.2)
10296

10397
PLATFORMS
10498
x64-mingw-ucrt
105-
x64-mingw32
10699

107100
DEPENDENCIES
108101
jekyll
@@ -113,4 +106,4 @@ DEPENDENCIES
113106
webrick
114107

115108
BUNDLED WITH
116-
2.2.19
109+
4.0.6

css/style.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1502,8 +1502,9 @@
15021502
}
15031503

15041504
#conf-text {
1505-
text-align: center;
1505+
text-align: justify;
15061506
float: none;
1507+
margin: 0 0 2em 0;
15071508
}
15081509

15091510
/* NEWS POST */

retreat_2026.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ <h2>Lusławice, 25th to 29th of March, 2026</h2>
1111
<section class="wrapper style4 container">
1212
<div class="row news">
1313
<p id="conf-text">
14-
We look forward to see you at the 16th Scientifi c Meeting of Consciousness Lab!
14+
We look forward to see you at the 16th Scientific Meeting of Consciousness Lab!
1515
</p>
1616
<p id="conf-text">
1717
This conference aims to provide a forum for interdisciplinary reflection on how conscious experience is conceptualized and studied. Rather than taking consciousness as a given, the conference invites participants to reflect on what we mean when we speak of conscious experience and how different conceptual frameworks shape its investigation. Across talks and discussions, we will examine theoretical approaches to consciousness, consider methodological and empirical strategies, and explore how different scientific perspectives inform one another. By bringing together researchers from many fields, the conference seeks to foster critical discussion, intellectual exchange, and collaboration.
1818

1919
We warmly invite Consciousness Lab members, affiliates, collaborators, and researchers interested in consciousness and experience to take part.
2020
<div id="conf-info-box">
2121
<div id="conf-info-sub">Venue:</div>
22-
<div id="conf-info-con">Europejskie Centrum Muzyki Krzysztofa Pendereckiego. Lusławice 250, 32-840 Zakliczyn</div>
22+
<div id="conf-info-con">Europejskie Centrum Muzyki Krzysztofa Pendereckiego. <br> Lusławice 250, 32-840 Zakliczyn</div>
2323
</div>
2424

25-
<p style="width:100%; display:block; text-align:center;">
25+
<p style="width:100%; display:block; text-align:center; margin-bottom: 2em;">
2626
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2572.3254684376134!2d20.8301013!3d49.85513059999999!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47165bc7917f60a5%3A0x882bb93c5e1e9452!2sEuropejskie%20Centrum%20Muzyki%20Krzysztofa%20Pendereckiego!5e0!3m2!1spl!2spl!4v1770817691729!5m2!1spl!2spl" width="600" height="450" style="border:0;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
2727
<!-- <iframe src="https://maps.app.goo.gl/UPcL877HWUJd7KhF7" width="600" height="450" style="border:0;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe> -->
2828
</p>
@@ -45,11 +45,11 @@ <h2>Lusławice, 25th to 29th of March, 2026</h2>
4545

4646
<div id="conf-info-box">
4747
<div id="conf-info-sub">Contact:</div>
48-
<div id="conf-info-con">sandra.frycz@doctoral.uj.edu.pl</div>
49-
<div id="conf-info-con">marcin.skotniczny@doctoral.uj.edu.pl </div>
48+
<div id="conf-info-con">sandra.frycz [at] doctoral.uj.edu.pl<br>
49+
marcin.skotniczny [at] doctoral.uj.edu.pl </div>
5050
</div>
5151

52-
div id="conf-info-box">
52+
<div id="conf-info-box">
5353
<div id="conf-info-sub">Programme:</div>
5454
<div id="conf-info-con">
5555
To be announced

0 commit comments

Comments
 (0)