Skip to content

Commit 35d7674

Browse files
valryonvalryon
authored
✨ Site update!
* 🚧 Updating the site WIP * 🍱 Add new heroes/covers * Add files via upload * Add files via upload * 💩 Hack the site * ✨ Site update!
1 parent 3056eff commit 35d7674

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+448
-223
lines changed

‎Gemfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
source "https://rubygems.org"
22
ruby RUBY_VERSION
33

4-
gem 'jekyll', '3.6.2'
5-
64
group :jekyll_plugins do
7-
gem 'jekyll-paginate', '1.1.0'
8-
gem 'jekyll-redirect-from', '0.12.1'
5+
gem 'github-pages'
6+
gem 'jekyll-paginate'
7+
gem 'jekyll-redirect-from'
98
end
9+
gem "webrick", "~> 1.7"

‎Gemfile.lock

+263-32
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,292 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.5.2)
5-
public_suffix (>= 2.0.2, < 4.0)
4+
activesupport (7.1.3.2)
5+
base64
6+
bigdecimal
7+
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
connection_pool (>= 2.2.5)
9+
drb
10+
i18n (>= 1.6, < 2)
11+
minitest (>= 5.1)
12+
mutex_m
13+
tzinfo (~> 2.0)
14+
addressable (2.8.6)
15+
public_suffix (>= 2.0.2, < 6.0)
16+
base64 (0.2.0)
17+
bigdecimal (3.1.8)
18+
coffee-script (2.4.1)
19+
coffee-script-source
20+
execjs
21+
coffee-script-source (1.12.2)
622
colorator (1.1.0)
7-
ffi (1.9.18)
23+
commonmarker (0.23.10)
24+
concurrent-ruby (1.2.3)
25+
connection_pool (2.4.1)
26+
dnsruby (1.72.1)
27+
simpleidn (~> 0.2.1)
28+
drb (2.2.1)
29+
em-websocket (0.5.3)
30+
eventmachine (>= 0.12.9)
31+
http_parser.rb (~> 0)
32+
ethon (0.16.0)
33+
ffi (>= 1.15.0)
34+
eventmachine (1.2.7)
35+
execjs (2.9.1)
36+
faraday (2.9.0)
37+
faraday-net_http (>= 2.0, < 3.2)
38+
faraday-net_http (3.1.0)
39+
net-http
40+
ffi (1.16.3)
841
forwardable-extended (2.6.0)
9-
jekyll (3.6.2)
42+
gemoji (4.1.0)
43+
github-pages (231)
44+
github-pages-health-check (= 1.18.2)
45+
jekyll (= 3.9.5)
46+
jekyll-avatar (= 0.8.0)
47+
jekyll-coffeescript (= 1.2.2)
48+
jekyll-commonmark-ghpages (= 0.4.0)
49+
jekyll-default-layout (= 0.1.5)
50+
jekyll-feed (= 0.17.0)
51+
jekyll-gist (= 1.5.0)
52+
jekyll-github-metadata (= 2.16.1)
53+
jekyll-include-cache (= 0.2.1)
54+
jekyll-mentions (= 1.6.0)
55+
jekyll-optional-front-matter (= 0.3.2)
56+
jekyll-paginate (= 1.1.0)
57+
jekyll-readme-index (= 0.3.0)
58+
jekyll-redirect-from (= 0.16.0)
59+
jekyll-relative-links (= 0.6.1)
60+
jekyll-remote-theme (= 0.4.3)
61+
jekyll-sass-converter (= 1.5.2)
62+
jekyll-seo-tag (= 2.8.0)
63+
jekyll-sitemap (= 1.4.0)
64+
jekyll-swiss (= 1.0.0)
65+
jekyll-theme-architect (= 0.2.0)
66+
jekyll-theme-cayman (= 0.2.0)
67+
jekyll-theme-dinky (= 0.2.0)
68+
jekyll-theme-hacker (= 0.2.0)
69+
jekyll-theme-leap-day (= 0.2.0)
70+
jekyll-theme-merlot (= 0.2.0)
71+
jekyll-theme-midnight (= 0.2.0)
72+
jekyll-theme-minimal (= 0.2.0)
73+
jekyll-theme-modernist (= 0.2.0)
74+
jekyll-theme-primer (= 0.6.0)
75+
jekyll-theme-slate (= 0.2.0)
76+
jekyll-theme-tactile (= 0.2.0)
77+
jekyll-theme-time-machine (= 0.2.0)
78+
jekyll-titles-from-headings (= 0.5.3)
79+
jemoji (= 0.13.0)
80+
kramdown (= 2.4.0)
81+
kramdown-parser-gfm (= 1.1.0)
82+
liquid (= 4.0.4)
83+
mercenary (~> 0.3)
84+
minima (= 2.5.1)
85+
nokogiri (>= 1.13.6, < 2.0)
86+
rouge (= 3.30.0)
87+
terminal-table (~> 1.4)
88+
github-pages-health-check (1.18.2)
89+
addressable (~> 2.3)
90+
dnsruby (~> 1.60)
91+
octokit (>= 4, < 8)
92+
public_suffix (>= 3.0, < 6.0)
93+
typhoeus (~> 1.3)
94+
html-pipeline (2.14.3)
95+
activesupport (>= 2)
96+
nokogiri (>= 1.4)
97+
http_parser.rb (0.8.0)
98+
i18n (1.14.5)
99+
concurrent-ruby (~> 1.0)
100+
jekyll (3.9.5)
10101
addressable (~> 2.4)
11102
colorator (~> 1.0)
103+
em-websocket (~> 0.5)
104+
i18n (>= 0.7, < 2)
12105
jekyll-sass-converter (~> 1.0)
13-
jekyll-watch (~> 1.1)
14-
kramdown (~> 1.14)
106+
jekyll-watch (~> 2.0)
107+
kramdown (>= 1.17, < 3)
15108
liquid (~> 4.0)
16109
mercenary (~> 0.3.3)
17110
pathutil (~> 0.9)
18-
rouge (>= 1.7, < 3)
111+
rouge (>= 1.7, < 4)
19112
safe_yaml (~> 1.0)
113+
jekyll-avatar (0.8.0)
114+
jekyll (>= 3.0, < 5.0)
115+
jekyll-coffeescript (1.2.2)
116+
coffee-script (~> 2.2)
117+
coffee-script-source (~> 1.12)
118+
jekyll-commonmark (1.4.0)
119+
commonmarker (~> 0.22)
120+
jekyll-commonmark-ghpages (0.4.0)
121+
commonmarker (~> 0.23.7)
122+
jekyll (~> 3.9.0)
123+
jekyll-commonmark (~> 1.4.0)
124+
rouge (>= 2.0, < 5.0)
125+
jekyll-default-layout (0.1.5)
126+
jekyll (>= 3.0, < 5.0)
127+
jekyll-feed (0.17.0)
128+
jekyll (>= 3.7, < 5.0)
129+
jekyll-gist (1.5.0)
130+
octokit (~> 4.2)
131+
jekyll-github-metadata (2.16.1)
132+
jekyll (>= 3.4, < 5.0)
133+
octokit (>= 4, < 7, != 4.4.0)
134+
jekyll-include-cache (0.2.1)
135+
jekyll (>= 3.7, < 5.0)
136+
jekyll-mentions (1.6.0)
137+
html-pipeline (~> 2.3)
138+
jekyll (>= 3.7, < 5.0)
139+
jekyll-optional-front-matter (0.3.2)
140+
jekyll (>= 3.0, < 5.0)
20141
jekyll-paginate (1.1.0)
21-
jekyll-redirect-from (0.12.1)
22-
jekyll (~> 3.3)
23-
jekyll-sass-converter (1.5.1)
142+
jekyll-readme-index (0.3.0)
143+
jekyll (>= 3.0, < 5.0)
144+
jekyll-redirect-from (0.16.0)
145+
jekyll (>= 3.3, < 5.0)
146+
jekyll-relative-links (0.6.1)
147+
jekyll (>= 3.3, < 5.0)
148+
jekyll-remote-theme (0.4.3)
149+
addressable (~> 2.0)
150+
jekyll (>= 3.5, < 5.0)
151+
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
152+
rubyzip (>= 1.3.0, < 3.0)
153+
jekyll-sass-converter (1.5.2)
24154
sass (~> 3.4)
25-
jekyll-watch (1.5.1)
155+
jekyll-seo-tag (2.8.0)
156+
jekyll (>= 3.8, < 5.0)
157+
jekyll-sitemap (1.4.0)
158+
jekyll (>= 3.7, < 5.0)
159+
jekyll-swiss (1.0.0)
160+
jekyll-theme-architect (0.2.0)
161+
jekyll (> 3.5, < 5.0)
162+
jekyll-seo-tag (~> 2.0)
163+
jekyll-theme-cayman (0.2.0)
164+
jekyll (> 3.5, < 5.0)
165+
jekyll-seo-tag (~> 2.0)
166+
jekyll-theme-dinky (0.2.0)
167+
jekyll (> 3.5, < 5.0)
168+
jekyll-seo-tag (~> 2.0)
169+
jekyll-theme-hacker (0.2.0)
170+
jekyll (> 3.5, < 5.0)
171+
jekyll-seo-tag (~> 2.0)
172+
jekyll-theme-leap-day (0.2.0)
173+
jekyll (> 3.5, < 5.0)
174+
jekyll-seo-tag (~> 2.0)
175+
jekyll-theme-merlot (0.2.0)
176+
jekyll (> 3.5, < 5.0)
177+
jekyll-seo-tag (~> 2.0)
178+
jekyll-theme-midnight (0.2.0)
179+
jekyll (> 3.5, < 5.0)
180+
jekyll-seo-tag (~> 2.0)
181+
jekyll-theme-minimal (0.2.0)
182+
jekyll (> 3.5, < 5.0)
183+
jekyll-seo-tag (~> 2.0)
184+
jekyll-theme-modernist (0.2.0)
185+
jekyll (> 3.5, < 5.0)
186+
jekyll-seo-tag (~> 2.0)
187+
jekyll-theme-primer (0.6.0)
188+
jekyll (> 3.5, < 5.0)
189+
jekyll-github-metadata (~> 2.9)
190+
jekyll-seo-tag (~> 2.0)
191+
jekyll-theme-slate (0.2.0)
192+
jekyll (> 3.5, < 5.0)
193+
jekyll-seo-tag (~> 2.0)
194+
jekyll-theme-tactile (0.2.0)
195+
jekyll (> 3.5, < 5.0)
196+
jekyll-seo-tag (~> 2.0)
197+
jekyll-theme-time-machine (0.2.0)
198+
jekyll (> 3.5, < 5.0)
199+
jekyll-seo-tag (~> 2.0)
200+
jekyll-titles-from-headings (0.5.3)
201+
jekyll (>= 3.3, < 5.0)
202+
jekyll-watch (2.2.1)
26203
listen (~> 3.0)
27-
kramdown (1.16.2)
28-
liquid (4.0.0)
29-
listen (3.1.5)
30-
rb-fsevent (~> 0.9, >= 0.9.4)
31-
rb-inotify (~> 0.9, >= 0.9.7)
32-
ruby_dep (~> 1.2)
204+
jemoji (0.13.0)
205+
gemoji (>= 3, < 5)
206+
html-pipeline (~> 2.2)
207+
jekyll (>= 3.0, < 5.0)
208+
kramdown (2.4.0)
209+
rexml
210+
kramdown-parser-gfm (1.1.0)
211+
kramdown (~> 2.0)
212+
liquid (4.0.4)
213+
listen (3.9.0)
214+
rb-fsevent (~> 0.10, >= 0.10.3)
215+
rb-inotify (~> 0.9, >= 0.9.10)
33216
mercenary (0.3.6)
34-
pathutil (0.16.1)
217+
minima (2.5.1)
218+
jekyll (>= 3.5, < 5.0)
219+
jekyll-feed (~> 0.9)
220+
jekyll-seo-tag (~> 2.1)
221+
minitest (5.22.3)
222+
mutex_m (0.2.0)
223+
net-http (0.4.1)
224+
uri
225+
nokogiri (1.16.4-aarch64-linux)
226+
racc (~> 1.4)
227+
nokogiri (1.16.4-arm-linux)
228+
racc (~> 1.4)
229+
nokogiri (1.16.4-arm64-darwin)
230+
racc (~> 1.4)
231+
nokogiri (1.16.4-x86-linux)
232+
racc (~> 1.4)
233+
nokogiri (1.16.4-x86_64-darwin)
234+
racc (~> 1.4)
235+
nokogiri (1.16.4-x86_64-linux)
236+
racc (~> 1.4)
237+
octokit (4.25.1)
238+
faraday (>= 1, < 3)
239+
sawyer (~> 0.9)
240+
pathutil (0.16.2)
35241
forwardable-extended (~> 2.6)
36-
public_suffix (3.0.1)
37-
rb-fsevent (0.10.2)
38-
rb-inotify (0.9.10)
39-
ffi (>= 0.5.0, < 2)
40-
rouge (2.2.1)
41-
ruby_dep (1.5.0)
42-
safe_yaml (1.0.4)
43-
sass (3.5.4)
242+
public_suffix (5.0.5)
243+
racc (1.7.3)
244+
rb-fsevent (0.11.2)
245+
rb-inotify (0.10.1)
246+
ffi (~> 1.0)
247+
rexml (3.2.6)
248+
rouge (3.30.0)
249+
rubyzip (2.3.2)
250+
safe_yaml (1.0.5)
251+
sass (3.7.4)
44252
sass-listen (~> 4.0.0)
45253
sass-listen (4.0.0)
46254
rb-fsevent (~> 0.9, >= 0.9.4)
47255
rb-inotify (~> 0.9, >= 0.9.7)
256+
sawyer (0.9.2)
257+
addressable (>= 2.3.5)
258+
faraday (>= 0.17.3, < 3)
259+
simpleidn (0.2.2)
260+
unf (~> 0.1.4)
261+
terminal-table (1.8.0)
262+
unicode-display_width (~> 1.1, >= 1.1.1)
263+
typhoeus (1.4.1)
264+
ethon (>= 0.9.0)
265+
tzinfo (2.0.6)
266+
concurrent-ruby (~> 1.0)
267+
unf (0.1.4)
268+
unf_ext
269+
unf_ext (0.0.9.1)
270+
unicode-display_width (1.8.0)
271+
uri (0.13.0)
272+
webrick (1.8.1)
48273

49274
PLATFORMS
50-
ruby
275+
aarch64-linux
276+
arm-linux
277+
arm64-darwin
278+
x86-linux
279+
x86_64-darwin
280+
x86_64-linux
51281

52282
DEPENDENCIES
53-
jekyll (= 3.6.2)
54-
jekyll-paginate (= 1.1.0)
55-
jekyll-redirect-from (= 0.12.1)
283+
github-pages
284+
jekyll-paginate
285+
jekyll-redirect-from
286+
webrick (~> 1.7)
56287

57288
RUBY VERSION
58-
ruby 2.4.0p0
289+
ruby 3.3.0p0
59290

60291
BUNDLED WITH
61-
1.16.0
292+
2.5.4

‎_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
title: "Pixelnest Studio"
22
description: "Pixelnest Studio is a two-people indie development studio, co-founded by Matthieu Oger and Damien Mayance. We craft games and apps."
3-
keywords: "pixelnest, studio, damien, mayance, matthieu, oger, games, apps, development, mobile, web, steredenn"
3+
keywords: "pixelnest, studio, damien, mayance, matthieu, oger, games, apps, development, mobile, web, steredenn, flipon, cthuloot"
44

55
google_tracking_code: "UA-40226469-1"
66

‎_includes/footer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<footer class="page-footer">
22
<div class="page-footer__item copyright">
3-
<p>© 2016 Pixelnest Studio</p>
3+
<p>© Pixelnest Studio</p>
44
<p>We craft <strong>games</strong> and <strong>apps</strong></p>
55
</div>
66

‎_pages/about.html

+18
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,24 @@
2020
{% include components/member.html %}
2121
</div>
2222

23+
<div class="col">
24+
{% assign member_name = "Eddy Margueron" %}
25+
{% assign member_id = "eddy" %}
26+
{% assign member_avatar = "https://cdna.artstation.com/p/users/avatars/000/110/972/large/70f0885b2c9cf33a4e850c1414900999.jpg?1677262505" %}
27+
{% assign member_site = "https://skia.artstation.com/" %}
28+
{% assign member_twitter = "skia" %}
29+
{% assign member_linkedin = "eddy-margueron/" %}
30+
31+
{% include components/member.html %}
32+
</div>
33+
</div>
34+
</section>
35+
36+
37+
<section class="studio basic-grid">
38+
<p class="studio__description">Previous members</p>
39+
40+
<div class="studio__members row">
2341
<div class="col">
2442
{% assign member_name = "Matthieu Oger" %}
2543
{% assign member_id = "matthieu" %}

‎_pages/contact.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ permalink: /contact/
1414

1515
You can contact us on:
1616

17-
* [Twitter](https://twitter.com/pixelnest/) (recommended!)
17+
* [Mail](mailto:[email protected]) (recommended!)
18+
* [Twitter](https://twitter.com/pixelnest/)
1819
* [Facebook](https://facebook.com/pixelneststudio/)
19-
* [Mail](mailto:[email protected])
2020
* Or subscribe to our [RSS feed](https://pixelnest.io/atom.xml)
2121

22-
Note that [Pixelnest Studio is not our main activity anymore](https://pixelnest.io/2018/11/the-beginning-and-the-end/). Don't expect a quick answer. 😉

0 commit comments

Comments
 (0)