Skip to content

Commit 25f3c74

Browse files
committed
Update to font-awesome 6.2
1 parent 5694a87 commit 25f3c74

File tree

6 files changed

+17
-16
lines changed

6 files changed

+17
-16
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ chrono = "0.4"
2121
clap = { version = "3.0", features = ["cargo"] }
2222
clap_complete = "3.0"
2323
env_logger = "0.9.0"
24-
font-awesome-as-a-crate = "0.2.0"
24+
font-awesome-as-a-crate = "0.3.0"
2525
handlebars = "4.0"
2626
lazy_static = "1.0"
2727
log = "0.4"

guide/src/guide/reading.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ The icons displayed will depend on the settings of how the book was generated.
3030

3131
| Icon | Description |
3232
|------|-------------|
33-
| <i class="fa fa-bars"></i> | Opens and closes the chapter listing sidebar. |
34-
| <i class="fa fa-paint-brush"></i> | Opens a picker to choose a different color theme. |
35-
| <i class="fa fa-search"></i> | Opens a search bar for searching within the book. |
36-
| <i class="fa fa-print"></i> | Instructs the web browser to print the entire book. |
37-
| <i class="fa fa-github"></i> | Opens a link to the website that hosts the source code of the book. |
38-
| <i class="fa fa-edit"></i> | Opens a page to directly edit the source of the page you are currently reading. |
33+
| <i class="fas fa-bars"></i> | Opens and closes the chapter listing sidebar. |
34+
| <i class="fas fa-paintbrush"></i> | Opens a picker to choose a different color theme. |
35+
| <i class="fas fa-magnifying-glass"></i> | Opens a search bar for searching within the book. |
36+
| <i class="fas fa-print"></i> | Instructs the web browser to print the entire book. |
37+
| <i class="fab fa-github"></i> | Opens a link to the website that hosts the source code of the book. |
38+
| <i class="fas fa-pencil"></i> | Opens a page to directly edit the source of the page you are currently reading. |
3939

4040
Tapping the menu bar will scroll the page to the top.
4141

@@ -59,9 +59,9 @@ Code blocks may contain several different icons for interacting with them:
5959
| Icon | Description |
6060
|------|-------------|
6161
| <i class="fa fa-copy"></i> | Copies the code block into your local clipboard, to allow pasting into another application. |
62-
| <i class="fa fa-play"></i> | For Rust code examples, this will execute the sample code and display the compiler output just below the example (see [playground]). |
62+
| <i class="fas fa-play"></i> | For Rust code examples, this will execute the sample code and display the compiler output just below the example (see [playground]). |
6363
| <i class="fa fa-eye"></i> | For Rust code examples, this will toggle visibility of "hidden" lines. Sometimes, larger examples will hide lines which are not particularly relevant to what is being illustrated (see [hiding code lines]). |
64-
| <i class="fa fa-history"></i> | For [editable code examples][editor], this will undo any changes you have made. |
64+
| <i class="fas fa-clock-rotate-left"></i> | For [editable code examples][editor], this will undo any changes you have made. |
6565

6666
Here's an example:
6767

src/renderer/html_handlebars/helpers/fontawesome.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use font_awesome_as_a_crate as fa;
22
use handlebars::{Context, Handlebars, Helper, Output, RenderContext, RenderError};
3+
use log::trace;
34
use std::str::FromStr;
45

56
pub fn fa_helper(

src/theme/book.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ function playground_text(playground) {
274274
undoChangesButton.className = 'reset-button';
275275
undoChangesButton.title = 'Undo changes';
276276
undoChangesButton.setAttribute('aria-label', undoChangesButton.title);
277-
undoChangesButton.innerHTML += document.getElementById('fa-history').innerHTML;
277+
undoChangesButton.innerHTML += document.getElementById('fa-clock-rotate-left').innerHTML;
278278

279279
buttons.insertBefore(undoChangesButton, buttons.firstChild);
280280

src/theme/index.hbs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
{{fa "solid" "bars"}}
119119
</button>
120120
<button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
121-
{{fa "solid" "paint-brush"}}
121+
{{fa "solid" "paintbrush"}}
122122
</button>
123123
<ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
124124
<li role="none"><button role="menuitem" class="theme" id="light">{{ theme_option "Light" }}</button></li>
@@ -129,7 +129,7 @@
129129
</ul>
130130
{{#if search_enabled}}
131131
<button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
132-
{{fa "solid" "search"}}
132+
{{fa "solid" "magnifying-glass"}}
133133
</button>
134134
{{/if}}
135135
</div>
@@ -149,7 +149,7 @@
149149
{{/if}}
150150
{{#if git_repository_edit_url}}
151151
<a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
152-
<i id="git-edit-button" class="fa fa-edit"></i>
152+
{{fa "solid" "pencil" "git-edit-button"}}
153153
</a>
154154
{{/if}}
155155

@@ -222,7 +222,7 @@
222222
<template id=fa-eye-slash>{{fa "solid" "eye-slash"}}</template>
223223
<template id=fa-copy>{{fa "regular" "copy"}}</template>
224224
<template id=fa-play>{{fa "solid" "play"}}</template>
225-
<template id=fa-history>{{fa "solid" "history"}}</template>
225+
<template id=fa-clock-rotate-left>{{fa "solid" "clock-rotate-left"}}</template>
226226

227227
{{#if live_reload_endpoint}}
228228
<!-- Livereload script (if served using the cli tool) -->

0 commit comments

Comments
 (0)