Skip to content

Commit b9cee41

Browse files
GuillaumeGomezsyphar
GuillaumeGomez
authored and
syphar
committed
Remove always true fw argument in fas, fab and far tera filters
1 parent 78d8bed commit b9cee41

File tree

9 files changed

+44
-49
lines changed

9 files changed

+44
-49
lines changed

‎src/web/page/templates.rs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,6 @@ impl fmt::Display for IconType {
263263
impl tera::Filter for IconType {
264264
fn filter(&self, value: &Value, args: &HashMap<String, Value>) -> TeraResult<Value> {
265265
let icon_name = tera::escape_html(value.as_str().expect("Icons only take strings"));
266-
let class = if args.get("fw").and_then(|fw| fw.as_bool()).unwrap_or(false) {
267-
"fa-svg fa-svg-fw"
268-
} else {
269-
"fa-svg"
270-
};
271266

272267
let type_ = match self {
273268
IconType::Strong => font_awesome_as_a_crate::Type::Solid,
@@ -283,7 +278,7 @@ impl tera::Filter for IconType {
283278

284279
let icon = format!(
285280
"\
286-
<span class=\"{class}{space}{class_extra}\" aria-hidden=\"true\">{icon_file_string}</span>"
281+
<span class=\"fa-svg fa-svg-fw{space}{class_extra}\" aria-hidden=\"true\">{icon_file_string}</span>"
287282
);
288283

289284
Ok(Value::String(icon))

‎templates/about-base.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@
1111
<h1 id="crate-title" class="no-description">Docs.rs documentation</h1>
1212
<div class="pure-menu pure-menu-horizontal">
1313
<ul class="pure-menu-list">
14-
{% set text = "circle-info" | fas(fw=true) %}
14+
{% set text = "circle-info" | fas %}
1515
{% set text = text ~ ' <span class="title">About</span>' %}
1616
{{ macros::active_link(expected="index", href="/about", text=text) }}
1717

18-
{% set text = "fonticons" | fab(fw=true) %}
18+
{% set text = "fonticons" | fab %}
1919
{% set text = text ~ ' <span class="title">Badges</span>' %}
2020
{{ macros::active_link(expected="badges", href="/about/badges", text=text) }}
2121

22-
{% set text = "gears" | fas(fw=true) %}
22+
{% set text = "gears" | fas %}
2323
{% set text = text ~ ' <span class="title">Builds</span>' %}
2424
{{ macros::active_link(expected="builds", href="/about/builds", text=text) }}
2525

26-
{% set text = "table" | fas(fw=true) %}
26+
{% set text = "table" | fas %}
2727
{% set text = text ~ ' <span class="title">Metadata</span>' %}
2828
{{ macros::active_link(expected="metadata", href="/about/metadata", text=text) }}
2929

30-
{% set text = "road" | fas(fw=true) %}
30+
{% set text = "road" | fas %}
3131
{% set text = text ~ ' <span class="title">Shorthand URLs</span>' %}
3232
{{ macros::active_link(expected="redirections", href="/about/redirections", text=text) }}
3333

34-
{% set text = "download" | fas(fw=true) %}
34+
{% set text = "download" | fas %}
3535
{% set text = text ~ ' <span class="title">Download</span>' %}
3636
{{ macros::active_link(expected="download", href="/about/download", text=text) }}
3737
</ul>

‎templates/core/home.html‎

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

99
{%- block body -%}
1010
<div class="container landing">
11-
<h1 class="brand">{{ "cubes" | fas(fw=true) }} Docs.rs</h1>
11+
<h1 class="brand">{{ "cubes" | fas }} Docs.rs</h1>
1212

1313
<form action="/releases/search" method="GET" class="landing-search-form">
1414
<div>

‎templates/crate/details.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
{%- if details.homepage_url -%}
4949
<li class="pure-menu-item">
5050
<a href="{{ details.homepage_url }}" class="pure-menu-link">
51-
{{ "house" | fas(fw=true) }} Homepage
51+
{{ "house" | fas }} Homepage
5252
</a>
5353
</li>
5454
{%- endif -%}
@@ -57,7 +57,7 @@
5757
{%- if details.documentation_url -%}
5858
<li class="pure-menu-item">
5959
<a href="{{ details.documentation_url }}" title="Canonical documentation" class="pure-menu-link">
60-
{{ "file-lines" | far(fw=true) }} Documentation
60+
{{ "file-lines" | far }} Documentation
6161
</a>
6262
</li>
6363
{%- endif -%}
@@ -69,20 +69,20 @@
6969
{# If the repo link is for github or gitlab, show some stats #}
7070
{# TODO: add support for hosts besides github and gitlab (#35) #}
7171
{%- if details.repository_metadata -%}
72-
{{ details.repository_metadata.icon | fab(fw=true) }}
72+
{{ details.repository_metadata.icon | fab }}
7373
{% if details.repository_metadata.name %}
7474
{{details.repository_metadata.name}}
7575
{% else %}
7676
Repository
7777
{% endif %}
7878
<br>
79-
{{ "star" | fas(fw=true, extra="left-margin") }} {{ details.repository_metadata.stars }}
80-
{{ "code-branch" | fas(fw=true) }} {{ details.repository_metadata.forks }}
81-
{{ "circle-exclamation" | fas(fw=true) }} {{ details.repository_metadata.issues }}
79+
{{ "star" | fas(extra="left-margin") }} {{ details.repository_metadata.stars }}
80+
{{ "code-branch" | fas }} {{ details.repository_metadata.forks }}
81+
{{ "circle-exclamation" | fas }} {{ details.repository_metadata.issues }}
8282

8383
{# If the repo link is unknown, just show a normal link #}
8484
{%- else -%}
85-
{{ "code-branch" | fas(fw=true) }} Repository
85+
{{ "code-branch" | fas }} Repository
8686
{%- endif -%}
8787
</a>
8888
</li>
@@ -92,7 +92,7 @@
9292
<li class="pure-menu-item">
9393
<a href="https://crates.io/crates/{{ details.name }}" class="pure-menu-link"
9494
title="See {{ details.name }} on crates.io">
95-
{{ "cube" | fas(fw=true) }} Crates.io
95+
{{ "cube" | fas }} Crates.io
9696
</a>
9797
</li>
9898

‎templates/crate/source.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
{# If we are displaying a file, we also add a button to hide the file sidebar #}
3535
{% if file_content %}
3636
<li class="pure-menu-item toggle-source">
37-
<button aria-label="Hide source sidebar" title="Hide source sidebar" aria-expanded="true"><span class="left">{{ "chevron-left" | fas(fw=true) }}</span><span class="right">{{ "chevron-right" | fas(fw=true) }}</span> <span class="text">Hide files</span></button>
37+
<button aria-label="Hide source sidebar" title="Hide source sidebar" aria-expanded="true"><span class="left">{{ "chevron-left" | fas }}</span><span class="right">{{ "chevron-right" | fas(fw=true) }}</span> <span class="text">Hide files</span></button>
3838
</li>
3939
{% endif %}
4040
{# If this isn't the root folder, show a 'back' button #}
4141
{%- if show_parent_link -%}
4242
<li class="pure-menu-item">
43-
<a href="../" class="pure-menu-link">{{ "folder-open" | far(fw=true) }} <span class="text">..</span></a>
43+
<a href="../" class="pure-menu-link">{{ "folder-open" | far }} <span class="text">..</span></a>
4444
</li>
4545
{%- endif -%}
4646

@@ -53,23 +53,23 @@
5353
<a href="./{{ file.name }}{% if file.mime == 'dir' %}/{% endif %}" class="pure-menu-link">
5454
{# Directories #}
5555
{%- if file.mime == "dir" -%}
56-
{{ "folder-open" | far(fw=true) }}
56+
{{ "folder-open" | far }}
5757

5858
{# Rust files #}
5959
{%- elif file.mime == "text/rust" -%}
60-
{{ "rust" | fab(fw=true) }}
60+
{{ "rust" | fab }}
6161

6262
{# Cargo.lock #}
6363
{%- elif file.mime == "text/plain" and file.name == "Cargo.lock" -%}
64-
{{ "lock" | fas(fw=true) }}
64+
{{ "lock" | fas }}
6565

6666
{# Markdown files #}
6767
{% elif file.mime == "text/markdown" %}
68-
{{ "markdown" | fab(fw=true) }}
68+
{{ "markdown" | fab }}
6969

7070
{# .gitignore #}
7171
{% elif file.mime == "text/plain" and file.name == ".gitignore" %}
72-
{{ "git-alt" | fab(fw=true) }}
72+
{{ "git-alt" | fab }}
7373

7474
{#
7575
More ideas
@@ -91,11 +91,11 @@
9191

9292
{# Text files or files which mime starts with `text` #}
9393
{%- elif file.mime == "text/plain" or file.mime | split(pat="/") | first == "text" -%}
94-
{{ "file-alt" | far(fw=true) }}
94+
{{ "file-alt" | far }}
9595

9696
{# Binary files and any unrecognized types #}
9797
{% else -%}
98-
{{ "file-archive" | far(fw=true) }}
98+
{{ "file-archive" | far }}
9999
{%- endif -%}
100100

101101
<span class="text">{{ file.name }}</span>

‎templates/header/package_navigation.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h1 id="crate-title">
4444
{# The crate information tab #}
4545
<li class="pure-menu-item"><a href="/crate/{{ crate_path | safe }}"
4646
class="pure-menu-link{% if active_tab == 'crate' %} pure-menu-active{% endif %}">
47-
{{ "cube" | fas(fw=true) }}
47+
{{ "cube" | fas }}
4848
<span class="title"> Crate</span>
4949
</a>
5050
</li>
@@ -53,7 +53,7 @@ <h1 id="crate-title">
5353
<li class="pure-menu-item">
5454
<a href="/crate/{{ crate_path | safe }}/source/"
5555
class="pure-menu-link{% if active_tab == 'source' %} pure-menu-active{% endif %}">
56-
{{ "folder-open" | far(fw=true) }}
56+
{{ "folder-open" | far }}
5757
<span class="title"> Source</span>
5858
</a>
5959
</li>
@@ -81,7 +81,7 @@ <h1 id="crate-title">
8181

8282
{%- if metadata.rustdoc_status -%}
8383
<a href="/{{ crate_path | safe }}/{{ metadata.target_name }}/" class="doc-link">
84-
{{ "book" | fas(fw=true) }} Documentation
84+
{{ "book" | fas }} Documentation
8585
</a>
8686
{%- endif -%}
8787
</div>

‎templates/macros.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
{% if retain_fragment %}data-fragment="retain"{% endif %}
130130
>
131131
{% if warning %}
132-
{{ "triangle-exclamation" | fas(fw=true) }}
132+
{{ "triangle-exclamation" | fas }}
133133
{% endif %}
134134
{{ release.version }}
135135
</a>

‎templates/releases/header.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,53 +24,53 @@ <h1 id="crate-title">{{ title }}</h1>
2424
<ul class="pure-menu-list">
2525
<li class="pure-menu-item">
2626
<a href="/releases" class="pure-menu-link{% if tab == 'recent' %} pure-menu-active{% endif %}">
27-
{{ "leaf" | fas(fw=true) }}
27+
{{ "leaf" | fas }}
2828
<span class="title">Recent</span>
2929
</a>
3030
</li>
3131

3232
<li class="pure-menu-item">
3333
<a href="/releases/stars" class="pure-menu-link{% if tab == 'stars' %} pure-menu-active{% endif %}">
34-
{{ "star" | fas(fw=true) }}
34+
{{ "star" | fas }}
3535
<span class="title">Stars</span>
3636
</a>
3737
</li>
3838

3939
<li class="pure-menu-item">
4040
<a href="/releases/recent-failures"
4141
class="pure-menu-link{% if tab == 'recent-failures' %} pure-menu-active{% endif %}">
42-
{{ "triangle-exclamation" | fas(fw=true) }}
42+
{{ "triangle-exclamation" | fas }}
4343
<span class="title">Recent Failures</span>
4444
</a>
4545
</li>
4646

4747
<li class="pure-menu-item">
4848
<a href="/releases/failures"
4949
class="pure-menu-link{% if tab == 'failures' %} pure-menu-active{% endif %}">
50-
{{ "star" | far(fw=true) }}
50+
{{ "star" | far }}
5151
<span class="title">Failures By Stars</span>
5252
</a>
5353
</li>
5454

5555
<li class="pure-menu-item">
5656
<a href="/releases/activity"
5757
class="pure-menu-link{% if tab == 'activity' %} pure-menu-active{% endif %}">
58-
{{ "chart-line" | fas(fw=true) }}
58+
{{ "chart-line" | fas }}
5959
<span class="title">Activity</span>
6060
</a>
6161
</li>
6262

6363
<li class="pure-menu-item">
6464
<a href="/releases/queue" class="pure-menu-link{% if tab == 'queue' %} pure-menu-active{% endif %}">
65-
{{ "list" | fas(fw=true) }}
65+
{{ "list" | fas }}
6666
<span class="title">Queue</span>
6767
</a>
6868
</li>
6969

7070
{%- if owner -%}
7171
<li class="pure-menu-item">
7272
<a href="#" class="pure-menu-link{% if tab == 'owner' %} pure-menu-active{% endif %}">
73-
{{ "user" | fas(fw=true) }}
73+
{{ "user" | fas }}
7474
<span class="title">{{ owner }}</span>
7575
</a>
7676
</li>

‎templates/rustdoc/topbar.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232

3333
<li class="pure-menu-item">
3434
<a href="{{ crate_url | safe }}" class="pure-menu-link description" title="See {{ krate.name }} in docs.rs">
35-
{{ "cube" | fas(fw=true) }} Docs.rs crate page
35+
{{ "cube" | fas }} Docs.rs crate page
3636
</a>
3737
</li>
3838

3939
<li class="pure-menu-item">
4040
<a href="{{ crate_url | safe }}" class="pure-menu-link">
41-
{{ "scale-unbalanced-flip" | fas(fw=true) }} {{ krate.license }}
41+
{{ "scale-unbalanced-flip" | fas }} {{ krate.license }}
4242
</a>
4343
</li>
4444
</ul>
@@ -52,7 +52,7 @@
5252
{%- if krate.homepage_url -%}
5353
<li class="pure-menu-item">
5454
<a href="{{ krate.homepage_url }}" class="pure-menu-link">
55-
{{ "house" | fas(fw=true) }} Homepage
55+
{{ "house" | fas }} Homepage
5656
</a>
5757
</li>
5858
{%- endif -%}
@@ -61,7 +61,7 @@
6161
{%- if krate.documentation_url -%}
6262
<li class="pure-menu-item">
6363
<a href="{{ krate.documentation_url }}" title="Canonical documentation" class="pure-menu-link">
64-
{{ "file-lines" | far(fw=true) }} Documentation
64+
{{ "file-lines" | far }} Documentation
6565
</a>
6666
</li>
6767
{%- endif -%}
@@ -70,21 +70,21 @@
7070
{%- if krate.repository_url -%}
7171
<li class="pure-menu-item">
7272
<a href="{{ krate.repository_url }}" class="pure-menu-link">
73-
{{ "code-branch" | fas(fw=true) }} Repository
73+
{{ "code-branch" | fas }} Repository
7474
</a>
7575
</li>
7676
{%- endif -%}
7777

7878
<li class="pure-menu-item">
7979
<a href="https://crates.io/crates/{{ krate.name }}" class="pure-menu-link" title="See {{ krate.name }} in crates.io">
80-
{{ "cube" | fas(fw=true) }} Crates.io
80+
{{ "cube" | fas }} Crates.io
8181
</a>
8282
</li>
8383

8484
{# A link to the release's source view #}
8585
<li class="pure-menu-item">
8686
<a href="{{ crate_url | safe }}/source/" title="Browse source of {{ metadata.name }}-{{ metadata.version }}" class="pure-menu-link">
87-
{{ "folder-open" | fas(fw=true) }} Source
87+
{{ "folder-open" | fas }} Source
8888
</a>
8989
</li>
9090
</ul>
@@ -98,7 +98,7 @@
9898
{%- for owner in krate.owners -%}
9999
<li class="pure-menu-item">
100100
<a href="https://crates.io/users/{{ owner[0] }}" class="pure-menu-link">
101-
{{ "user" | fas(fw=true) }} {{ owner[0] }}
101+
{{ "user" | fas }} {{ owner[0] }}
102102
</a>
103103
</li>
104104
{%- endfor -%}

0 commit comments

Comments
 (0)