Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit aa34f55

Browse files
committedMar 5, 2021
refactor: move the CSS and images to a separate assets folder
Create a bash script called `server` to run `bundle exec jekyll serve` with `./server`
1 parent aca4ee3 commit aa34f55

18 files changed

+83
-65
lines changed
 

‎Gemfile.lock

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.3.3)
4+
activesupport (6.0.3.5)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
@@ -17,8 +17,8 @@ GEM
1717
colorator (1.1.0)
1818
commonmarker (0.17.13)
1919
ruby-enum (~> 0.5)
20-
concurrent-ruby (1.1.7)
21-
dnsruby (1.61.4)
20+
concurrent-ruby (1.1.8)
21+
dnsruby (1.61.5)
2222
simpleidn (~> 0.1)
2323
em-websocket (0.5.2)
2424
eventmachine (>= 0.12.9)
@@ -27,21 +27,24 @@ GEM
2727
ffi (>= 1.3.0)
2828
eventmachine (1.2.7)
2929
execjs (2.7.0)
30-
faraday (1.0.1)
30+
faraday (1.3.0)
31+
faraday-net_http (~> 1.0)
3132
multipart-post (>= 1.2, < 3)
32-
ffi (1.13.1)
33+
ruby2_keywords
34+
faraday-net_http (1.0.1)
35+
ffi (1.14.2)
3336
forwardable-extended (2.6.0)
3437
gemoji (3.0.1)
35-
git (1.7.0)
38+
git (1.8.1)
3639
rchardet (~> 1.8)
37-
github-pages (208)
38-
github-pages-health-check (= 1.16.1)
40+
github-pages (212)
41+
github-pages-health-check (= 1.17.0)
3942
jekyll (= 3.9.0)
4043
jekyll-avatar (= 0.7.0)
4144
jekyll-coffeescript (= 1.1.1)
4245
jekyll-commonmark-ghpages (= 0.1.6)
4346
jekyll-default-layout (= 0.1.4)
44-
jekyll-feed (= 0.15.0)
47+
jekyll-feed (= 0.15.1)
4548
jekyll-gist (= 1.5.0)
4649
jekyll-github-metadata (= 2.13.0)
4750
jekyll-mentions (= 1.6.0)
@@ -52,7 +55,7 @@ GEM
5255
jekyll-relative-links (= 0.6.1)
5356
jekyll-remote-theme (= 0.4.2)
5457
jekyll-sass-converter (= 1.5.2)
55-
jekyll-seo-tag (= 2.6.1)
58+
jekyll-seo-tag (= 2.7.1)
5659
jekyll-sitemap (= 1.4.0)
5760
jekyll-swiss (= 1.0.0)
5861
jekyll-theme-architect (= 0.1.1)
@@ -76,13 +79,13 @@ GEM
7679
mercenary (~> 0.3)
7780
minima (= 2.5.1)
7881
nokogiri (>= 1.10.4, < 2.0)
79-
rouge (= 3.23.0)
82+
rouge (= 3.26.0)
8083
terminal-table (~> 1.4)
81-
github-pages-health-check (1.16.1)
84+
github-pages-health-check (1.17.0)
8285
addressable (~> 2.3)
8386
dnsruby (~> 1.60)
8487
octokit (~> 4.0)
85-
public_suffix (~> 3.0)
88+
public_suffix (>= 2.0.2, < 5.0)
8689
typhoeus (~> 1.3)
8790
html-pipeline (2.14.0)
8891
activesupport (>= 2)
@@ -117,7 +120,7 @@ GEM
117120
rouge (>= 2.0, < 4.0)
118121
jekyll-default-layout (0.1.4)
119122
jekyll (~> 3.0)
120-
jekyll-feed (0.15.0)
123+
jekyll-feed (0.15.1)
121124
jekyll (>= 3.7, < 5.0)
122125
jekyll-gist (1.5.0)
123126
octokit (~> 4.2)
@@ -143,8 +146,8 @@ GEM
143146
rubyzip (>= 1.3.0, < 3.0)
144147
jekyll-sass-converter (1.5.2)
145148
sass (~> 3.4)
146-
jekyll-seo-tag (2.6.1)
147-
jekyll (>= 3.3, < 5.0)
149+
jekyll-seo-tag (2.7.1)
150+
jekyll (>= 3.8, < 5.0)
148151
jekyll-sitemap (1.4.0)
149152
jekyll (>= 3.7, < 5.0)
150153
jekyll-swiss (1.0.0)
@@ -201,34 +204,39 @@ GEM
201204
kramdown-parser-gfm (1.1.0)
202205
kramdown (~> 2.0)
203206
liquid (4.0.3)
204-
listen (3.2.1)
207+
listen (3.4.1)
205208
rb-fsevent (~> 0.10, >= 0.10.3)
206209
rb-inotify (~> 0.9, >= 0.9.10)
207210
mercenary (0.3.6)
208211
mgem (0.3.0)
209-
mini_portile2 (2.4.0)
212+
mini_portile2 (2.5.0)
210213
minima (2.5.1)
211214
jekyll (>= 3.5, < 5.0)
212215
jekyll-feed (~> 0.9)
213216
jekyll-seo-tag (~> 2.1)
214-
minitest (5.14.2)
217+
minitest (5.14.4)
215218
multipart-post (2.1.1)
216-
nokogiri (~> 1.11.0)
217-
mini_portile2 (~> 2.4.0)
218-
octokit (4.18.0)
219+
nokogiri (1.11.1)
220+
mini_portile2 (~> 2.5.0)
221+
racc (~> 1.4)
222+
nokogiri (1.11.1-x86_64-darwin)
223+
racc (~> 1.4)
224+
octokit (4.20.0)
219225
faraday (>= 0.9)
220226
sawyer (~> 0.8.0, >= 0.5.3)
221227
pathutil (0.16.2)
222228
forwardable-extended (~> 2.6)
223-
public_suffix (3.1.1)
229+
public_suffix (4.0.6)
230+
racc (1.5.2)
224231
rb-fsevent (0.10.4)
225232
rb-inotify (0.10.1)
226233
ffi (~> 1.0)
227234
rchardet (1.8.0)
228235
rexml (3.2.4)
229-
rouge (3.23.0)
230-
ruby-enum (0.8.0)
236+
rouge (3.26.0)
237+
ruby-enum (0.9.0)
231238
i18n
239+
ruby2_keywords (0.0.4)
232240
rubyzip (2.3.0)
233241
safe_yaml (1.0.5)
234242
sass (3.7.4)
@@ -239,29 +247,30 @@ GEM
239247
sawyer (0.8.2)
240248
addressable (>= 2.3.5)
241249
faraday (> 0.8, < 2.0)
242-
simpleidn (0.1.1)
250+
simpleidn (0.2.1)
243251
unf (~> 0.1.4)
244252
terminal-table (1.8.0)
245253
unicode-display_width (~> 1.1, >= 1.1.1)
246254
thread_safe (0.3.6)
247255
typhoeus (1.4.0)
248256
ethon (>= 0.9.0)
249-
tzinfo (1.2.7)
257+
tzinfo (1.2.9)
250258
thread_safe (~> 0.1)
251259
unf (0.1.4)
252260
unf_ext
253261
unf_ext (0.0.7.7)
254262
unicode-display_width (1.7.0)
255-
yard (0.9.25)
263+
yard (0.9.26)
256264
yard-coderay (0.1.0)
257265
coderay
258266
yard
259267
yard-mruby (0.3.0)
260268
yard (~> 0.9.0)
261-
zeitwerk (2.4.0)
269+
zeitwerk (2.4.2)
262270

263271
PLATFORMS
264272
ruby
273+
x86_64-darwin-19
265274

266275
DEPENDENCIES
267276
git
@@ -272,4 +281,4 @@ DEPENDENCIES
272281
yard-mruby
273282

274283
BUNDLED WITH
275-
2.1.4
284+
2.2.0

‎_includes/header.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
1313

1414
<!-- syntax highlighting CSS -->
15-
<link rel="stylesheet" href="/css/syntax.css">
15+
<link rel="stylesheet" href="/assets/css/syntax.css">
1616

1717
<!-- Custom CSS -->
18-
<link rel="stylesheet" href="/css/main.css">
18+
<link rel="stylesheet" href="/assets/css/main.css">

‎_includes/icons.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!-- Favicon -->
44
<link rel="icon" type="image/x-icon" href="/favicon.ico">
5-
<link rel="apple-touch-icon" sizes="180x180" href="/images/icons/apple-touch-icon.png">
6-
<link rel="icon" type="image/png" sizes="32x32" href="/images/icons/favicon-32x32.png">
7-
<link rel="icon" type="image/png" sizes="16x16" href="/images/icons/favicon-16x16.png">
8-
<link rel="manifest" href="/images/icons/site.webmanifest">
5+
<link rel="apple-touch-icon" sizes="180x180" href="/assets/images/icons/apple-touch-icon.png">
6+
<link rel="icon" type="image/png" sizes="32x32" href="/assets/images/icons/favicon-32x32.png">
7+
<link rel="icon" type="image/png" sizes="16x16" href="/assets/images/icons/favicon-16x16.png">
8+
<link rel="manifest" href="/assets/images/icons/site.webmanifest">

‎_includes/navigation.html

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
1-
<nav class="navbar navbar-mruby navbar-expand-md navbar-header pt-0 justify-content-between" role="navigation">
2-
<a href="/"><img src="/images/mruby_header.png" alt="mruby" title="mruby"></a>
3-
<div>
4-
<ul class="nav navbar-nav">
5-
<li class="nav-item"> <a href="/downloads" class="nav-link">Downloads</a>
6-
</li>
7-
<li class="nav-item"> <a href="/docs" class="nav-link">Documentation</a>
8-
</li>
9-
<li class="nav-item"> <a href="/libraries" class="nav-link">Libraries</a>
10-
</li>
11-
<li class="nav-item"> <a href="/about" class="nav-link">About</a>
12-
</li>
13-
<li class="nav-item"> <a href="/team" class="nav-link">Team</a>
14-
</li>
15-
</ul>
16-
<!-- <form class="form-inline " role="search">
17-
18-
<div class="form-group">
19-
<input type="text" class="form-control">
20-
21-
</div> <button type="submit" class="btn btn-secondary">Submit</button>
22-
23-
</form>
24-
-->
25-
</div>
1+
<nav class="navbar navbar-expand-md navbar-header navbar-mruby
2+
justify-content-between pt-0" role="navigation">
3+
<a href="/">
4+
<img src="/assets/images/mruby_header.png" alt="mruby" title="mruby">
5+
</a>
6+
<div>
7+
<ul class="nav navbar-nav">
8+
<li class="nav-item">
9+
<a href="/downloads" class="nav-link">Downloads</a>
10+
</li>
11+
<li class="nav-item">
12+
<a href="/docs" class="nav-link">Documentation</a>
13+
</li>
14+
<li class="nav-item">
15+
<a href="/libraries" class="nav-link">Libraries</a>
16+
</li>
17+
<li class="nav-item">
18+
<a href="/about" class="nav-link">About</a>
19+
</li>
20+
<li class="nav-item">
21+
<a href="/team" class="nav-link">Team</a>
22+
</li>
23+
</ul>
24+
<!--
25+
<form class="form-inline" role="search">
26+
<div class="form-group">
27+
<input type="text" class="form-control">
28+
</div> <button type="submit" class="btn btn-secondary">Submit</button>
29+
</form>
30+
-->
31+
</div>
2632
</nav>

‎css/main.css renamed to ‎assets/css/main.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ a {
2020

2121
.navbar-mruby {
2222
background-color: transparent;
23-
background-image: url('/images/navigation_bg.png');
23+
background-image: url('/assets/images/navigation_bg.png');
2424
border: 0px;
2525
position: fixed;
2626
top: 0px;
File renamed without changes.

‎images/icons/site.webmanifest renamed to ‎assets/images/icons/site.webmanifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name":"mruby Lightweight Ruby",
33
"short_name":"mruby",
44
"icons":[
5-
{"src":"/images/icons/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},
6-
{"src":"/images/icons/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],
5+
{"src":"/assets/images/icons/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},
6+
{"src":"/assets/images/icons/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],
77
"theme_color":"#e0115f",
88
"background_color":"#ffffff",
99
"display":"standalone",
File renamed without changes.
File renamed without changes.

‎index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<div class="row clearfix">
77
<div class="col-md-12 column mruby-is">
8-
<img src="/images/mruby_logo_red_icon.png"/>
8+
<img src="/assets/images/mruby_logo_red_icon.png"/>
99
<p>
1010
mruby is the lightweight implementation of the <a href="https://www.ruby-lang.org">Ruby language</a> complying with part of the <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59579">ISO standard</a>. mruby can be linked and embedded within your application.
1111
</p>

‎server

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
3+
bundle exec jekyll serve

0 commit comments

Comments
 (0)
Please sign in to comment.