Skip to content

Commit 044dbd7

Browse files
authored
Merge pull request #111 from BenJetson/#65-replace-jekyll-octicons
#65 replace jekyll octicons
2 parents db53bc2 + 3dd745d commit 044dbd7

File tree

10 files changed

+17
-23
lines changed

10 files changed

+17
-23
lines changed

Gemfile

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

33
gem 'github-pages'
4-
gem 'jekyll-octicons'
54
gem 'jekyll-admin'

Gemfile.lock

-6
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,6 @@ GEM
136136
jekyll-mentions (1.6.0)
137137
html-pipeline (~> 2.3)
138138
jekyll (>= 3.7, < 5.0)
139-
jekyll-octicons (14.1.0)
140-
jekyll (>= 3.6, < 5.0)
141-
octicons (= 14.1.0)
142139
jekyll-optional-front-matter (0.3.2)
143140
jekyll (>= 3.0, < 5.0)
144141
jekyll-paginate (1.1.0)
@@ -228,8 +225,6 @@ GEM
228225
nokogiri (1.11.4)
229226
mini_portile2 (~> 2.5.0)
230227
racc (~> 1.4)
231-
octicons (14.1.0)
232-
nokogiri (>= 1.6.3.1)
233228
octokit (4.21.0)
234229
faraday (>= 0.9)
235230
sawyer (~> 0.8.0, >= 0.5.3)
@@ -293,7 +288,6 @@ PLATFORMS
293288
DEPENDENCIES
294289
github-pages
295290
jekyll-admin
296-
jekyll-octicons
297291

298292
BUNDLED WITH
299293
2.1.4

_config.yml

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ plugins:
5252

5353
# Site plugins
5454
- jekyll-feed
55-
- jekyll-octicons
5655
- rouge
5756

5857
# Collection Settings

_config_dev.yml

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ plugins:
3737

3838
# Site plugins
3939
- jekyll-feed
40-
- jekyll-octicons
4140
- rouge
4241

4342
# Development-only plugins.

_includes/head.html

+4
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,8 @@
4242

4343
<!-- Stylesheet -->
4444
<link rel="stylesheet" href="{{site.url}}/css/main.css" />
45+
<link
46+
rel="stylesheet"
47+
href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css"
48+
/>
4549
</head>

_layouts/project.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2>{{page.title}}</h2>
1919
class="btn btn-outline-secondary mb-1 d-block"
2020
href="{{page.webpage}}"
2121
>
22-
{% octicon link-external height: 16 %} Webpage
22+
<i class="bi bi-box-arrow-in-up-left"></i> Webpage
2323
</a>
2424
{% comment %}
2525
<!-- prettier-ignore -->
@@ -41,28 +41,28 @@ <h2>{{page.title}}</h2>
4141
{% endcomment %}
4242

4343
<a class="btn btn-outline-secondary mb-1 d-block" href="{{repoURL}}">
44-
{% octicon mark-github height: 16 %} Repository
44+
<i class="bi bi-github"></i> Repository
4545
</a>
4646
{% endif %} {% if page.issues %}
4747
<a
4848
class="btn btn-outline-secondary mb-1 d-block"
4949
href="{{repoURL}}/issues"
5050
>
51-
{% octicon issue-opened height: 16 %} Issues
51+
<i class="bi bi-exclamation-circle"></i> Issues
5252
</a>
5353
{% endif %} {% if page.wiki %}
5454
<a
5555
class="btn btn-outline-secondary mb-1 d-block"
5656
href="{{repoURL}}/wiki"
5757
>
58-
{% octicon book height: 16 %} Wiki
58+
<i class="bi bi-book"></i> Wiki
5959
</a>
6060
{% endif %} {% if page.releases %}
6161
<a
6262
class="btn btn-outline-secondary mb-1 d-block"
6363
href="{{repoURL}}/releases"
6464
>
65-
{% octicon desktop-download height: 16 %} Releases
65+
<i class="bi bi-file-earmark-zip"></i> Releases
6666
</a>
6767
{% endif %}
6868
</div>

_projects/sporclone.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ rank: 4
1212
date: 2016-04-25
1313
photo: https://live.staticflickr.com/65535/49691531813_db04e6c90c_w.jpg
1414
photo-alt: Screenshot of Sporclone Game
15+
webpage: https://www.bengodfrey.net/sporclone
1516
---

blog/index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ <h3 class="card-title">{{ post.title }}</h3>
108108
<a class="page-link" href="{{ paginator.previous_page_path }}">
109109
<span aria-hidden="true">
110110
<span class="d-none d-xl-inline">
111-
{% octicon arrow-left height: 24 %}
111+
<i class="bi bi-chevron-left"></i>
112112
</span>
113113
<span class="d-xl-none">
114-
{% octicon arrow-left height: 16 %}
114+
<i class="bi bi-chevron-left"></i>
115115
</span>
116116
</span>
117117
<span class="visually-hidden">Previous Page</span>
@@ -198,10 +198,10 @@ <h3 class="card-title">{{ post.title }}</h3>
198198
>
199199
<span aria-hidden="true">
200200
<span class="d-none d-xl-inline">
201-
{% octicon arrow-right height: 24 %}
201+
<i class="bi bi-chevron-right"></i>
202202
</span>
203203
<span class="d-xl-none">
204-
{% octicon arrow-right height: 16 %}
204+
<i class="bi bi-chevron-right"></i>
205205
</span>
206206
</span>
207207
<span class="visually-hidden">Next Page</span>

contact.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h1>Contact</h1>
1212
<noscript>
1313
<div class="alert alert-danger my-5" role="alert">
1414
<p class="h4 alert-heading">
15-
{% octicon alert height: 24 %} Unsupported Configuration
15+
<i class="bi bi-exclamation-triangle"></i> Unsupported Configuration
1616
</p>
1717
<p>This contact form requires JavaScript in order to function.</p>
1818
<hr />

projects.html

+2-4
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,14 @@ <h2>Projects</h2>
3434
<!-- <div class="container"> -->
3535
<div class="card mb-3">
3636
<div class="card-header text-white bg-info">
37-
{% octicon pin height: 16 %} Featured
37+
<i class="bi bi-pin-angle"></i> Featured
3838
</div>
3939
</div>
4040
{% else %}
4141
<!-- <section class="bg-light py-3"> -->
4242
<!-- <div class="container"> -->
4343
<div class="card mt-5 mb-3 bg-dark text-light">
44-
<div class="card-header">
45-
{% octicon archive height: 16 %} Other Projects
46-
</div>
44+
<div class="card-header"><i class="bi bi-archive"></i> Other Projects</div>
4745
</div>
4846
{% endif %} {% for project in sorted_projects %}
4947
<div class="card mb-3 mx-3 bg-light shadow-sm">

0 commit comments

Comments
 (0)