Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐦 ForkAwesome -> FontAwesome #178

Merged
merged 1 commit into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/_includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h1 class="menu-toggle sr-only">Footer Menu</h1>

<div class="menu-footer-container">
<ul id="menu-footer" class="list-inline dividers">
<li id="menu-item-footer-1" class="menu-item"><a class="smoothscroll" title="Back to top of page" href="#pagetop"><span class="fa fa-angle-up"></span> Top</a></li>
<li id="menu-item-footer-1" class="menu-item"><a class="smoothscroll" title="Back to top of page" href="#pagetop"><span class="fa-solid fa-angle-up"></span> Top</a></li>
<li id="menu-item-footer-2" class="menu-item menu-item-footer-portal"><a title="Home" href="/">Home</a></li>
<li class="menu-item menu-item-footer-portal"><a title="Research" href="/portals/research/">Research</a></li>
<li class="menu-item menu-item-footer-portal"><a title="Education" href="/portals/education/">Education</a></li>
Expand Down Expand Up @@ -37,7 +37,7 @@ <h1 class="menu-toggle sr-only">Footer Menu</h1>
{% endunless %}
{% endif %}
{% if edit_visible %}
<a href="https://github.com/bitcraze/{{edit_repo}}/edit/master/{{edit_repo_base}}/{{edit_repo_path}}"><i class="fa fa-pencil"></i> &nbsp;Improve this page</a>
<a href="https://github.com/bitcraze/{{edit_repo}}/edit/master/{{edit_repo_base}}/{{edit_repo_path}}"><i class="fa-solid fa-pencil"></i> &nbsp;Improve this page</a>
{% endif %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/_includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.13.3/katex.min.css" type='text/css' media='all'>
<link rel='stylesheet' href='/css/kraken.css?t={{ site.time | date: "%Y%m%d-%H%M%S"}}' type='text/css' media='all' />
<link rel='stylesheet' href='https://fonts.googleapis.com/css?family=Lato:300,400,700|Raleway:400,300,500,600,700|Droid Sans:300,400,700;' type='text/css' media='screen' />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css">

<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
<script type='text/javascript' src='/js/jquery.smooth-scroll.min.js'></script>
Expand Down
4 changes: 2 additions & 2 deletions src/_includes/index-portal-left.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ <h2>{{portalheader}}</h2>
<div class="learn-more">
<a href="{{portallink}}">
<span class="fa-stack fa-lg">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-plus fa-stack-1x"></i>
<i class="fa-regular fa-circle fa-stack-2x"></i>
<i class="fa-solid fa-plus fa-stack-1x"></i>
</span>
Learn more
</a>
Expand Down
4 changes: 2 additions & 2 deletions src/_includes/index-portal-right.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ <h2>{{portalheader}}</h2>
<div class="learn-more">
<a href="{{portallink}}">
<span class="fa-stack fa-lg">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-plus fa-stack-1x"></i>
<i class="fa-regular fa-circle fa-stack-2x"></i>
<i class="fa-solid fa-plus fa-stack-1x"></i>
</span>
Learn more
</a>
Expand Down
2 changes: 1 addition & 1 deletion src/_includes/menu_ul.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{% else %}
{% assign m_title = sub.title %}
{% assign m_url = sub.url %}
{% assign m_external = '&nbsp;&nbsp;<i class="fa fa-angle-right"></i>' %}
{% assign m_external = '&nbsp;&nbsp;<i class="fa-solid fa-angle-right"></i>' %}
{% endif %}

{% if m_is_break %}
Expand Down
16 changes: 8 additions & 8 deletions src/_includes/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
<div class="navbar-social-search">
<div class="social-bar">
<a href="https://github.com/bitcraze"><i
class="fa fa-github-alt"></i></a>
class="fa-brands fa-github"></i></a>
<a rel="me" href="https://fosstodon.org/@bitcraze"><i
class="fa fa-mastodon"></i></a>
class="fa-brands fa-mastodon"></i></a>
<a href="https://twitter.com/bitcraze_se"><i
class="fa fa-twitter"></i></a> <!--todo: replace and update once this is intergrated in fork awsome-->
class="fa-brands fa-x-twitter"></i></a>
<a href="https://instagram.com/bitcraze"><i
class="fa fa-instagram"></i></a>
class="fa-brands fa-instagram"></i></a>
<a href="https://www.linkedin.com/company/bitcraze-ab/"><i
class="fa fa-linkedin"></i></a>
class="fa-brands fa-linkedin"></i></a>
<a href="https://www.facebook.com/bitcraze"><i
class="fa fa-facebook"></i></a>
class="fa-brands fa-facebook"></i></a>
<a href="/feed/" data-proofer-ignore><i
class="fa fa-rss"></i></a>
class="fa-solid fa-rss"></i></a>
</div>
<form role="search" method="get"
class="search-form form-inline"
action="/">
<div class="form-group">
<label>
<span class="screen-reader-text sr-only">Search for:</span>
<i class="fa fa-search"></i>
<i class="fa-solid fa-magnifying-glass"></i>
<input type="search"
class="search-field form-control"
placeholder="Search &hellip;"
Expand Down
2 changes: 1 addition & 1 deletion src/_plugins/buy_online.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def initialize(tag_name, text, tokens)
end

def render(context)
'<a href="' + @params[0] + '"><button type="button" class="buy-button"><i class="fa fa-shopping-cart fa-fw"></i>Buy online</button></a>'
'<a href="' + @params[0] + '"><button type="button" class="buy-button"><i class="fa-solid fa-cart-shopping fa-fw"></i>Buy online</button></a>'
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion src/_plugins/coming_soon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def render(context)

'<div class="row">
<div class="col-md-12">
<button type="button" class="buy-button" disabled><i class="fa fa-shopping-cart fa-fw"></i>Coming soon</button>
<button type="button" class="buy-button" disabled><i class="fa-solid fa-cart-shopping fa-fw"></i>Coming soon</button>
<h4>Soon available in stores,
<a title="Signup for newsletter" href="/signup/">sign up for our newsletter.</a>
</h4>
Expand Down
4 changes: 2 additions & 2 deletions src/_plugins/datasheet.rb
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ def render(context)
when 'active'
''
when 'early-access'
'<div class="alert alert-success"><i class="fa fa-info fa-fw"></i> This product is in the <a href="/development/early-access/">Early Access stage</a>.</div>'
'<div class="alert alert-success"><i class="fa-solid fa-info fa-fw"></i> This product is in the <a href="/development/early-access/">Early Access stage</a>.</div>'
when 'eol'
'<div class="alert alert-success"><i class="fa fa-warning fa-fw"></i> This product has reach end-of-life and is not longer being manufactured. Stock might still be available in our online store or though retailers, but it is not recommended to be used for new set-ups.</div>'
'<div class="alert alert-success"><i class="fa-solid fa-circle-exclamation"></i> This product has reach end-of-life and is not longer being manufactured. Stock might still be available in our online store or though retailers, but it is not recommended to be used for new set-ups.</div>'
else
raise "Unexpected status for product"
end
Expand Down
4 changes: 2 additions & 2 deletions src/_plugins/media.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def initialize(tag_name, text, tokens)
end

def render(context)
'<div class="media-row-%2$s"><div class="embed-responsive embed-responsive-%3$s"><div class="embed-responsive-item video-item-delayed-load" data-video-id="%1$s" style="background:url(https://i1.ytimg.com/vi/%1$s/0.jpg);" onclick="kraken.loadYoutubeVideo(this)"><i class="fa fa-play-circle fa-3x"></i></div></div></div>' % @params
'<div class="media-row-%2$s"><div class="embed-responsive embed-responsive-%3$s"><div class="embed-responsive-item video-item-delayed-load" data-video-id="%1$s" style="background:url(https://i1.ytimg.com/vi/%1$s/0.jpg);" onclick="kraken.loadYoutubeVideo(this)"><i class="fa-regular fa-circle-play fa-3x"></i></div></div></div>' % @params
end
end

Expand Down Expand Up @@ -262,7 +262,7 @@ def render(context)
header = '<div><h3 id="%1$s">%2$s</h3></div>' % [full_id, @params[2]]
end

html = '<div class="col-md-6">%1$s<div class="embed-responsive embed-responsive-%3$s"><div class="embed-responsive-item video-item-delayed-load" data-video-id="%2$s" style="background:url(https://i1.ytimg.com/vi/%2$s/0.jpg);" onclick="kraken.loadYoutubeVideo(this)"><i class="fa fa-play-circle fa-3x"></i></div></div></div>' % ([header] + @params)
html = '<div class="col-md-6">%1$s<div class="embed-responsive embed-responsive-%3$s"><div class="embed-responsive-item video-item-delayed-load" data-video-id="%2$s" style="background:url(https://i1.ytimg.com/vi/%2$s/0.jpg);" onclick="kraken.loadYoutubeVideo(this)"><i class="fa-regular fa-circle-play fa-3x"></i></div></div></div>' % ([header] + @params)
context['media_gallery'].add_item(html)
html
end
Expand Down
4 changes: 2 additions & 2 deletions src/_plugins/notice.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def initialize(tag_name, text, tokens)
end

def render(context)
'<div class="alert alert-success"><i class="fa fa-info fa-fw"></i>%1$s</div>' % @params
'<div class="alert alert-success"><i class="fa-solid fa-info fa-fw"></i>%1$s</div>' % @params
end
end

Expand All @@ -39,7 +39,7 @@ def initialize(tag_name, text, tokens)
end

def render(context)
'<div class="alert alert-danger"><i class="fa fa-exclamation-triangle fa-fw"></i>%1$s</div>' % @params
'<div class="alert alert-danger"><i class="fa-solid fa-triangle-exclamation fa-fw"></i>%1$s</div>' % @params
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion src/_plugins/poplink.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def render(context)
@@id += 1
id_s = "poplink" + @@id.to_s

'<a id="' + id_s + '" class="poplink" onclick="return kraken.poplinkShowPopup(\'' + id_s + '\', \'' + @link_key + '\');" href="' + url + '">' + text + '&nbsp;<i class="fa fa-caret-right"></i></a>'
'<a id="' + id_s + '" class="poplink" onclick="return kraken.poplinkShowPopup(\'' + id_s + '\', \'' + @link_key + '\');" href="' + url + '">' + text + '&nbsp;<i class="fa-solid fa-caret-right"></i></a>'
end

def self.reset_id_counter()
Expand Down
4 changes: 2 additions & 2 deletions src/_plugins/product.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ def render_multiple(images, width, title)
end

result += '</div>
<a class="left carousel-control" href="#carousel-images" role="button" data-slide="prev"><span class="fa fa-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span></a>
<a class="right carousel-control" href="#carousel-images" role="button" data-slide="next"><span class="fa fa-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span></a>
<a class="left carousel-control" href="#carousel-images" role="button" data-slide="prev"><span class="fa-solid fa-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span></a>
<a class="right carousel-control" href="#carousel-images" role="button" data-slide="next"><span class="fa-solid fa-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span></a>
</div>'

end
Expand Down
2 changes: 1 addition & 1 deletion src/_plugins/row_columns.rb
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def render(context)
markup = super


icon_tag = icon ? '<i class="fa '+ icon + ' fa-5x"></i>' : ''
icon_tag = icon ? '<i class="fa-solid '+ icon + ' fa-5x"></i>' : ''

'<section class="row content-area"><div class="col-md-12"><h3 id="' + full_id + '">' + title + '</h3></div>' +
'</section><section class="row content-area">' +
Expand Down
2 changes: 1 addition & 1 deletion src/_plugins/stay_updated.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def render(context)
'<div class="row">
<div class="col-md-12">
<div class="text-center">
<a href="' + @params[0] + '"><button type="button" class="buy-button"><i class="fa fa-envelope-o fa-fw"></i>Keep me updated!</button></a>
<a href="' + @params[0] + '"><button type="button" class="buy-button"><i class="fa-regular fa-envelope fa-fw"></i>Keep me updated!</button></a>
</div>
</div>
</div>'
Expand Down
2 changes: 1 addition & 1 deletion src/development/external-projects.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,5 @@ usually implementing functionality similar to the Bitcraze python library.
| ![Scala](/images/icons/scala_32.png) | | <https://github.com/triplepoint/ScalaCrazyflie> |

<div class="col-md-12">
<p class="text-right">Want to add a project? <a href="https://github.com/bitcraze/bitcraze-website/edit/master/src/{{page.path}}"><i class="fa fa-pencil"></i> &nbsp;Improve this page</a></p>
<p class="text-right">Want to add a project? <a href="https://github.com/bitcraze/bitcraze-website/edit/master/src/{{page.path}}"><i class="fa-solid fa-pencil"></i> &nbsp;Improve this page</a></p>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Let's explore another example!
5. Position the Crazyflie facing a wall, then press 'A' on the keyboard. The Crazyflie will follow the wall.
6. You can disable wall following by pressing 'D' on the keyboard. The Crazyflie will respond to manual arrow keys again.

> Note that there might be an error when restarting the simulation, causing the Crazyflie to spawn in a different location. Use the simulation reload/refresh button (<i class="fa fa-refresh"></i>) to fix this.
> Note that there might be an error when restarting the simulation, causing the Crazyflie to spawn in a different location. Use the simulation reload/refresh button (<i class="fa-solid fa-arrows-rotate"></i>) to fix this.

{% youtube cpAbMiBVwsA; medium; 16by9 %}

Expand Down
2 changes: 1 addition & 1 deletion src/documentation/video-gallery.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ redirects:

---
<div class="col-md-12">
<p class="text-right">Want to add a video? <a href="https://github.com/bitcraze/bitcraze-website/edit/master/src/{{page.path}}"><i class="fa fa-pencil"></i> &nbsp;Improve this page</a></p>
<p class="text-right">Want to add a video? <a href="https://github.com/bitcraze/bitcraze-website/edit/master/src/{{page.path}}"><i class="fa-solid fa-pencil"></i> &nbsp;Improve this page</a></p>
</div>
4 changes: 2 additions & 2 deletions src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ page_id: home
</div>
<div class="header-col-wrapper">
<div class="what_we_do_arrow">
<a href="#what_we_do" class="smooth-link arrow-style"><i class="fa fa-arrow-circle-down"></i></a>
<a href="#what_we_do" class="smooth-link arrow-style"><i class="fa-solid fa-circle-arrow-down"></i></a>
</div>

<div class="value_proposition">
Expand Down Expand Up @@ -407,7 +407,7 @@ page_id: home

</div>
<div class="row">
<div class="col-md-12"><p class="text-right">Is your organization missing? <a href="https://github.com/bitcraze/bitcraze-website/edit/master/src/{{page.path}}"><i class="fa fa-pencil"></i> &nbsp;Improve this page</a></p>
<div class="col-md-12"><p class="text-right">Is your organization missing? <a href="https://github.com/bitcraze/bitcraze-website/edit/master/src/{{page.path}}"><i class="fa-regular fa-pen-to-square"></i> &nbsp;Improve this page</a></p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/portals/research.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ For guest blog posts from researchers, and other research-related blog posts, ch
{% include_relative_generated crazyflie_publications.md info="This is a placeholder for the generated list of publications. Generate using `tb generate_publications`" %}

<div class="col-md-12">
<p class="text-right">Want to add a publication? Or a obtain a copy of our `.bib` library? <a href="https://github.com/bitcraze/bitcraze-website/edit/master/src/portals/crazyflie_publications.bib"><i class="fa fa-pencil"></i> &nbsp;Improve this page</a></p>
<p class="text-right">Want to add a publication? Or a obtain a copy of our `.bib` library? <a href="https://github.com/bitcraze/bitcraze-website/edit/master/src/portals/crazyflie_publications.bib"><i class="fa-solid fa-pencil"></i> &nbsp;Improve this page</a></p>
</div>
2 changes: 1 addition & 1 deletion src/support/f-a-q.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,5 @@ Yes, it is possible to control multiple Crazyflies simultaneously. It can be don


<div class="col-md-12">
<p class="text-right">Want to add a FAQ? <a href="https://github.com/bitcraze/bitcraze-website/edit/master/src/{{page.path}}"><i class="fa fa-pencil"></i> &nbsp;Improve this page</a></p>
<p class="text-right">Want to add a FAQ? <a href="https://github.com/bitcraze/bitcraze-website/edit/master/src/{{page.path}}"><i class="fa-solid fa-pencil"></i> &nbsp;Improve this page</a></p>
</div>
2 changes: 1 addition & 1 deletion test/_plugins/buy_online_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class TestBuyOnline < Testbase
def test_that_tag_is_rendered
# Fixture
tag = '{% buy_online https://some.url %}'
expected = '<a href="https://some.url"><button type="button" class="buy-button"><i class="fa fa-shopping-cart fa-fw"></i>Buy online</button></a>'
expected = '<a href="https://some.url"><button type="button" class="buy-button"><i class="fa-solid fa-cart-shopping fa-fw"></i>Buy online</button></a>'

# Test
actual = Liquid::Template.parse(tag).render
Expand Down
2 changes: 1 addition & 1 deletion test/_plugins/coming_soon_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def test_that_tag_is_rendered

expected = '<div class="row">
<div class="col-md-12">
<button type="button" class="buy-button" disabled><i class="fa fa-shopping-cart fa-fw"></i>Coming soon</button>
<button type="button" class="buy-button" disabled><i class="fa-solid fa-cart-shopping fa-fw"></i>Coming soon</button>
<h4>Soon available in stores, <a title="Signup for newsletter" href="/signup/">sign up for our newsletter.</a></h4>
</div>
</div>'
Expand Down
4 changes: 2 additions & 2 deletions test/_plugins/datasheet_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def test_that_product_status_renders_for_early_access_product
# Fixture
tag = '{% datasheet_product_status early_access_product %}'

expected = '''<div class="alert alert-success"><i class="fa fa-info fa-fw"></i>
expected = '''<div class="alert alert-success"><i class="fa-solid fa-info fa-fw"></i>
This product is in the <a href="/development/early-access/">Early Access stage</a>.</div>'''

# Test
Expand All @@ -159,7 +159,7 @@ def test_that_product_status_renders_for_eol_product
# Fixture
tag = '{% datasheet_product_status eol_product %}'

expected = '''<div class="alert alert-success"><i class="fa fa-warning fa-fw"></i>
expected = '''<div class="alert alert-success"><i class="fa-solid fa-circle-exclamation"></i>
This product has reach end-of-life and is not longer being manufactured. Stock might
still be available in our online store or though retailers, but it is not recommended
to be used for new set-ups.</div>'''
Expand Down
Loading