Skip to content

Commit

Permalink
Update fontawesome to v6 (#403)
Browse files Browse the repository at this point in the history
  • Loading branch information
manasrai1406 committed Nov 28, 2023
1 parent 37dec23 commit cc5449b
Show file tree
Hide file tree
Showing 53 changed files with 17,454 additions and 17,315 deletions.
8 changes: 4 additions & 4 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ greyColorDark = "#A0A0A0"

# footer social icon
[[Languages.en.socialIcon]]
icon = " fa fa-github"
icon = " fab fa-github"
link = "https://github.com/OSGeo/grass"

[[Languages.en.socialIcon]]
Expand All @@ -259,15 +259,15 @@ greyColorDark = "#A0A0A0"
link = "https://fosstodon.org/@grassgis"

[[Languages.en.socialIcon]]
icon = " fa fa-twitter"
icon = " fab fa-x-twitter"
link = "https://twitter.com/grassgis"

[[Languages.en.socialIcon]]
icon = "fa fa-facebook"
icon = "fab fa-facebook"
link = "https://www.facebook.com/groups/GRASS"

[[Languages.en.socialIcon]]
icon = "fa fa-youtube"
icon = "fab fa-youtube"
link = "https://www.youtube.com/results?search_query=grass+gis"

[[Languages.en.socialIcon]]
Expand Down
2 changes: 1 addition & 1 deletion content/about/brand.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ This is the official <b>GRASS GIS logo</b>. Please use it to refer to the GRASS
<div class="col-lg-6 col-sm-12">
<p>The GRASS GIS logo text is using the <b>Fira Sans</b></a> open font family. 'GRASS' is written with <i>FiraSans Medium</i> and 'GIS' with the <i>FiraSans Thin</i> typeface. </p>
<ul class="list-unstyled dil">
<li><a href="https://github.com/mozilla/Fira" target="_blank"><i class="fa fa-github"></i> mozilla/Fira</a></li>
<li><a href="https://github.com/mozilla/Fira" target="_blank"><i class="fab fa-github"></i> mozilla/Fira</a></li>
</ul>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions content/about/theme.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ layout: theme
<div class="col-lg-8">
<p>This is the <a class="bigr" href="#"><i class="ms ms-grass-gis ms-1-5x"></i>&#160;<span class=" black-color grass">GRASS <span class=" black-color gis">GIS</span></span></a> web theme for Hugo. </p>
<p>Please use assets and markup described in this section for extending the GRASS GIS website consistently.</p>
<p>Get and contribute to the website source code on <a href="https://github.com/OSGeo/grass-website"><i class="fa fa-github"></i> Github</a>.
<p>Get and contribute to the website source code on <a href="https://github.com/OSGeo/grass-website"><i class="fab fa-github"></i> Github</a>.

</div>
</div>
Expand Down Expand Up @@ -534,9 +534,9 @@ Default
</div>

<div class="tab-pane" id="icons" role="tabpanel">
<h3 class="mb-5">fontawesome (4.7.0)</h3>
<h3 class="mb-5">fontawesome (6.4.2)</h3>
<div class="row mb-4">
<div class="col-lg-4"><i class="fa fa-download fa-2x grey-color-dark"></i> &#160; &#160; <i class="fa fa-book fa-2x grey-color-dark"></i> &#160; &#160; <i class="fa fa-user fa-2x grey-color-dark"></i> &#160; &#160; <i class="fa fa-github fa-2x grey-color-dark"></i> &#160; &#160; <i class="fa fa-twitter fa-2x grey-color-dark"></i>&#160; &#160; <i class="fa fa-facebook fa-2x grey-color-dark"></i>&#160; &#160; <i class="fa fa-youtube fa-2x grey-color-dark"></i>
<div class="col-lg-4"><i class="fa fa-download fa-2x grey-color-dark"></i> &#160; &#160; <i class="fa fa-book fa-2x grey-color-dark"></i> &#160; &#160; <i class="fa fa-user fa-2x grey-color-dark"></i> &#160; &#160; <i class="fab fa-github fa-2x grey-color-dark"></i> &#160; &#160; <i class="fab fa-x-twitter fa-2x grey-color-dark"></i>&#160; &#160; <i class="fab fa-facebook fa-2x grey-color-dark"></i>&#160; &#160; <i class="fab fa-youtube fa-2x grey-color-dark"></i>
<p class="mt-2"><a href="https://fontawesome.com/v4.7.0/"><i class="fa fa-font-awesome"></i> See the full icon list</a></p>
</div>
<div class="col-lg-8"><pre class="nm"><code class="hljs xml">&lt;i class="fa fa-download"&gt;&lt;/i&gt;</code></pre>
Expand Down
2 changes: 1 addition & 1 deletion content/download/addons.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ You can also use the command line, for example:

### <a name="Power-user"></a>Power users/developers

The Addons source code is also hosted in <a href="https://github.com/OSGeo/grass-addons" target="_blank"><i class="fa fa-github"></i> Github</a>:
The Addons source code is also hosted in <a href="https://github.com/OSGeo/grass-addons" target="_blank"><i class="fab fa-github"></i> Github</a>:
<p class="command"><a href="https://github.com/OSGeo/grass-addons"> $ git clone https://github.com/OSGeo/grass-addons </a></p>

To manually compile individual addons see the [compile and install wiki page](https://grasswiki.osgeo.org/wiki/Compile_and_Install#Addons).
14 changes: 7 additions & 7 deletions content/support/community.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The strength, longevity and success of the **GRASS GIS** project relies on its w

#### GRASS GIS development team

The GRASS GIS project is led by a [Team] (https://grasswiki.osgeo.org/wiki/Team) of scientists, researchers and developers from around the world. GRASS GIS software development is driven by the [Project Steering Committee](https://trac.osgeo.org/grass/wiki/PSC) which is granting developer access, managing source code releases and coordinating various community activities.
The GRASS GIS project is led by a [Team](https://grasswiki.osgeo.org/wiki/Team) of scientists, researchers and developers from around the world. GRASS GIS software development is driven by the [Project Steering Committee](https://trac.osgeo.org/grass/wiki/PSC) which is granting developer access, managing source code releases and coordinating various community activities.

### Mailing lists

Expand Down Expand Up @@ -53,9 +53,9 @@ Discussions in question and answer (Q&A) style may be held on these sites; you n

| <div style="width:70px">MEDIA</div> | LINK | |
|------|---------|-------------|
| <i class="fa fa-github"></i> | [GitHub Discussions](https://github.com/OSGeo/grass/discussions) | GitHub Discussions for GRASS GIS |
| <i class="fa fa-stack-exchange"></i> | [gis.stackexchange.com](https://gis.stackexchange.com/questions/tagged/grass) | GRASS GIS on StackExchange |
| <i class="fa fa-comments"></i> | [Gitter chat room](https://gitter.im/grassgis/community) | GRASS GIS on Gitter |
| <i class="fab fa-github"></i> | [GitHub Discussions](https://github.com/OSGeo/grass/discussions) | GitHub Discussions for GRASS GIS |
| <i class="fab fa-stack-exchange"></i> | [gis.stackexchange.com](https://gis.stackexchange.com/questions/tagged/grass) | GRASS GIS on StackExchange |
| <i class="fab fa-gitter"></i> | [Gitter chat room](https://gitter.im/grassgis/community) | GRASS GIS on Gitter |

### Social media

Expand All @@ -66,9 +66,9 @@ Join the discussion also on the following channels:
| <div style="width:70px">MEDIA</div> | LINK | |
|------|---------|-------------|
| <i class="fab fa-mastodon"></i> | [https://fosstodon.org/@grassgis](https://fosstodon.org/@grassgis) | @GRASSGIS |
| <i class="fa fa-twitter"></i> | [https://twitter.com/grassgis](https://twitter.com/grassgis) | @GRASSGIS |
| <i class="fa fa-facebook"></i> | [https://www.facebook.com/groups/GRASS](https://www.facebook.com/groups/GRASS) | @GRASSGIS |
| <i class="fa fa-youtube"></i> | [https://www.youtube.com/...grass+gis](https://www.youtube.com/results?search_query=grass+gis) | |
| <i class="fab fa-x-twitter"></i> | [https://twitter.com/grassgis](https://twitter.com/grassgis) | @GRASSGIS |
| <i class="fab fa-facebook"></i> | [https://www.facebook.com/groups/GRASS](https://www.facebook.com/groups/GRASS) | @GRASSGIS |
| <i class="fab fa-youtube"></i> | [https://www.youtube.com/...grass+gis](https://www.youtube.com/results?search_query=grass+gis) | |

### GRASS Wiki
GRASS GIS uses [wiki](https://grasswiki.osgeo.org/wiki/GRASS-Wiki) to organize community activities and provides space to share educational materials and technical solutions. To edit the wiki, please sign up [here](https://grasswiki.osgeo.org/wiki/Special:RequestAccount).
Expand Down
2 changes: 1 addition & 1 deletion themes/grass/layouts/about/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h2 class="section-title">About GRASS GIS</h2>
{{ range where .Pages "File.Dir" "in" "/about/" }}
<div class="section bg-white mb-4">
<div class="row nm">
<div class="col-1 text-center"><i class="fa fa-file-text-o fa-3x grey-color-light"></i></div>
<div class="col-1 text-center"><i class="fa fa-file-text fa-3x grey-color-light"></i></div>
<div class="col-11">
<h3 class="mt-2 mb-2"><a href="{{.File.TranslationBaseName}}">{{ .Title }}</a></h3>
</div>
Expand Down
6 changes: 3 additions & 3 deletions themes/grass/layouts/contribute/devel.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ <h3>Quick links</h3>
<li><i class="fa fa-file-text"></i> &#160;<a href="https://grass.osgeo.org/programming8/" target="_blank">Developer manual</a></li>
<li><i class="fa fa-code"></i> &#160;<a href="https://trac.osgeo.org/grass/wiki/Submitting" target="_blank">Submitting guidelines</a></li>
<li><i class="fa fa-code-fork"></i> &#160;<a href="https://trac.osgeo.org/grass/wiki/HowToGit" target="_blank">How to use git</a></li>
<li><i class="fa fa-github"></i> &#160;<a href="https://github.com/OSGeo/grass/" target="_blank">Source code</a></li>
<li><i class="fab fa-github"></i> &#160;<a href="https://github.com/OSGeo/grass/" target="_blank">Source code</a></li>
<li><i class="fa fa-bug"></i> &#160;<a href="https://github.com/OSGeo/grass/issues" target="_blank">Bug Tracker</a></li>
<li><i class="fa fa-file-code-o"></i> &#160;<a href="https://github.com/wenzeslaus/foss4g-2022-developing-custom-grass-tools" target="_blank">Write your own tools</a></li>
<li><i class="fa fa-github"></i> &#160;<a href="https://github.com/OSGeo/grass/discussions" target="_blank">GitHub Discussions</a></li>
<li><i class="fa fa-file-code"></i> &#160;<a href="https://github.com/wenzeslaus/foss4g-2022-developing-custom-grass-tools" target="_blank">Write your own tools</a></li>
<li><i class="fab fa-github"></i> &#160;<a href="https://github.com/OSGeo/grass/discussions" target="_blank">GitHub Discussions</a></li>
<li><i class="fa fa-envelope"></i> &#160;<a href="https://lists.osgeo.org/listinfo/grass-dev" target="_blank">GRASS Developers Mailing list</a></li>
</ul>
</div>
Expand Down
4 changes: 2 additions & 2 deletions themes/grass/layouts/download/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ <h2 class="section-title">Download your free and open source copy</h2>
<div class="col-4 text-center"><object type="image/svg+xml" data="{{.Site.BaseURL}}/images/logos/grasslogo.svg" class="grasslogo"></object></div>
<div class="col-8">
<h3 class="mt-20">GRASS GIS source code</h3>
<p>The GRASS GIS source code is available on <a href="https://github.com/OSGeo/grass" target="_blank"><i class="fa fa-github"></i> Github</a>, see all <a href="https://github.com/OSGeo/grass/tags">source code archives</a> for releases (zip and tarball files). Alternatively, find the latest tarballs and snapshots at <a href="https://grass.osgeo.org/grass{{- .Site.Data.grass.current_version_nodots -}}/source/">https://grass.osgeo.org/grass{{- .Site.Data.grass.current_version_nodots -}}/source/</a>.</p>
<a class="btn btn-primary" href="https://github.com/OSGeo/grass" target="_blank">Clone me at <i class="fa fa-github"></i></a>
<p>The GRASS GIS source code is available on <a href="https://github.com/OSGeo/grass" target="_blank"><i class="fab fa-github"></i> Github</a>, see all <a href="https://github.com/OSGeo/grass/tags">source code archives</a> for releases (zip and tarball files). Alternatively, find the latest tarballs and snapshots at <a href="https://grass.osgeo.org/grass{{- .Site.Data.grass.current_version_nodots -}}/source/">https://grass.osgeo.org/grass{{- .Site.Data.grass.current_version_nodots -}}/source/</a>.</p>
<a class="btn btn-primary" href="https://github.com/OSGeo/grass" target="_blank">Clone me at <i class="fab fa-github"></i></a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion themes/grass/layouts/partials/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{{end}}

{{if not .IsHome}}
<p><small><a href="https://github.com/OSGeo/grass-website/tree/master/content/{{ .Section }}/{{ with .File }}{{ .BaseFileName }}{{ end }}.md" class="fa fa-github"> <span class="edt">Edit this page on GitHub</span></a></small></p>
<p><small><a href="https://github.com/OSGeo/grass-website/tree/master/content/{{ .Section }}/{{ with .File }}{{ .BaseFileName }}{{ end }}.md" class="fab fa-github"> <span class="edt">Edit this page on GitHub</span></a></small></p>
{{end}}
</div>
<div class="col-md-4 text-md-right text-center">
Expand Down
2 changes: 1 addition & 1 deletion themes/grass/layouts/partials/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<link rel="stylesheet" href="{{ .Site.BaseURL }}plugins/fira-sans/fira-sans.css" >
<link rel="stylesheet" href="{{ .Site.BaseURL }}plugins/mapskin/css/mapskin.min.css">
<link rel="stylesheet" href="{{ .Site.BaseURL }}plugins/fontawesome/css/all.min.css">
<link rel="stylesheet" href="{{ .Site.BaseURL }}plugins/fontawesome/css/font-awesome.min.css">
<link rel="stylesheet" href="{{ .Site.BaseURL }}plugins/fontawesome/css/fontawesome.min.css">
<style>
:root{
--primary-color:{{ .Site.Params.primaryColor }};
Expand Down
165 changes: 165 additions & 0 deletions themes/grass/static/plugins/fontawesome/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
Fonticons, Inc. (https://fontawesome.com)

--------------------------------------------------------------------------------

Font Awesome Free License

Font Awesome Free is free, open source, and GPL friendly. You can use it for
commercial projects, open source projects, or really almost whatever you want.
Full Font Awesome Free license: https://fontawesome.com/license/free.

--------------------------------------------------------------------------------

# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)

The Font Awesome Free download is licensed under a Creative Commons
Attribution 4.0 International License and applies to all icons packaged
as SVG and JS file types.

--------------------------------------------------------------------------------

# Fonts: SIL OFL 1.1 License

In the Font Awesome Free download, the SIL OFL license applies to all icons
packaged as web and desktop font files.

Copyright (c) 2023 Fonticons, Inc. (https://fontawesome.com)
with Reserved Font Name: "Font Awesome".

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL

SIL OPEN FONT LICENSE
Version 1.1 - 26 February 2007

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting — in part or in whole — any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.

--------------------------------------------------------------------------------

# Code: MIT License (https://opensource.org/licenses/MIT)

In the Font Awesome Free download, the MIT license applies to all non-font and
non-icon files.

Copyright 2023 Fonticons, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in the
Software without restriction, including without limitation the rights to use, copy,
modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so, subject to the
following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------------------

# Attribution

Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
Awesome Free files already contain embedded comments with sufficient
attribution, so you shouldn't need to do anything additional when using these
files normally.

We've kept attribution comments terse, so we ask that you do not actively work
to remove them from files, especially code. They're a great way for folks to
learn about Font Awesome.

--------------------------------------------------------------------------------

# Brand Icons

All brand icons are trademarks of their respective owners. The use of these
trademarks does not indicate endorsement of the trademark holder by Font
Awesome, nor vice versa. **Please do not use brand logos for any purpose except
to represent the company, product, or service to which they refer.**

0 comments on commit cc5449b

Please sign in to comment.