diff --git a/config/config.exs b/config/config.exs index db2d61f3b..a3975bb12 100644 --- a/config/config.exs +++ b/config/config.exs @@ -7,7 +7,7 @@ config :teiserver, Teiserver, site_title: "BAR", site_suffix: "", site_description: "", - site_icon: "fa-duotone fa-robot", + site_icon: "fa-solid fa-robot", credit: "Teifion Jordan" # Default configs diff --git a/documents/guides/local_setup.md b/documents/guides/local_setup.md index 15a916756..754f2ca52 100644 --- a/documents/guides/local_setup.md +++ b/documents/guides/local_setup.md @@ -83,7 +83,7 @@ iex -S mix phx.server If all goes to plan you should be able to access your site locally at [http://localhost:4000/](http://localhost:4000/). ### Libraries you need to get yourself -The site makes liberal use of [FontAwesome](https://fontawesome.com/) so if you are using the site you'll need to download it and do the following +The site makes liberal use of [FontAwesome](https://fontawesome.com/) so if you are using the site you'll need to download the free version and do the following ```bash fontawesome/css/all.css -> priv/static/css/fontawesome.css fontawesome/webfonts -> priv/static/webfonts @@ -151,4 +151,4 @@ The main dependencies of the project are: - [Oban](https://github.com/sorentwo/oban), a backend job processing framework. ### Next Steps -If you want to develop features that interact with the lobby, then you will need to [set up SPADS](/documents/guides/spads_install.md). \ No newline at end of file +If you want to develop features that interact with the lobby, then you will need to [set up SPADS](/documents/guides/spads_install.md). diff --git a/lib/teiserver.ex b/lib/teiserver.ex index c0d6dacc8..19ba73707 100644 --- a/lib/teiserver.ex +++ b/lib/teiserver.ex @@ -3,9 +3,9 @@ defmodule Teiserver do alias Teiserver.Data.Types, as: T alias Teiserver.Helpers.CacheHelper - # def icon(), do: "fa-duotone fa-robot" + # def icon(), do: "fa-solid fa-robot" @spec icon :: String.t() - def icon(), do: "fa-duotone fa-server" + def icon(), do: "fa-solid fa-server" @spec icon(:friend | :friend_request | :ignore | :relationship) :: String.t() def icon(:relationship), do: "fa-solid fa-users" diff --git a/lib/teiserver/account.ex b/lib/teiserver/account.ex index 9d4497c10..9bffb16df 100644 --- a/lib/teiserver/account.ex +++ b/lib/teiserver/account.ex @@ -10,7 +10,7 @@ defmodule Teiserver.Account do alias Teiserver.Account.UserLib @spec icon :: String.t() - def icon, do: "fa-duotone fa-user-alt" + def icon, do: "fa-solid fa-user-alt" @spec list_users() :: [User] defdelegate list_users(), to: UserLib diff --git a/lib/teiserver/account/exports/player_count_export.ex b/lib/teiserver/account/exports/player_count_export.ex index d66e8f1d0..5019b370d 100644 --- a/lib/teiserver/account/exports/player_count_export.ex +++ b/lib/teiserver/account/exports/player_count_export.ex @@ -13,7 +13,7 @@ defmodule Teiserver.Account.PlayerCountExport do alias Teiserver.Helper.TimexHelper @spec icon() :: String.t() - def icon(), do: "fa-regular fa-users" + def icon(), do: "fa-solid fa-users" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/account/exports/retention_rate_export.ex b/lib/teiserver/account/exports/retention_rate_export.ex index afc86e577..fc3e5ea29 100644 --- a/lib/teiserver/account/exports/retention_rate_export.ex +++ b/lib/teiserver/account/exports/retention_rate_export.ex @@ -24,7 +24,7 @@ defmodule Teiserver.Account.RetentionRateExport do @activity_types ~w(total player) @spec icon() :: String.t() - def icon(), do: "fa-regular fa-campground" + def icon(), do: "fa-solid fa-campground" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/account/libs/accolade_lib.ex b/lib/teiserver/account/libs/accolade_lib.ex index cc4f5b95a..a1ce0a627 100644 --- a/lib/teiserver/account/libs/accolade_lib.ex +++ b/lib/teiserver/account/libs/accolade_lib.ex @@ -12,7 +12,7 @@ defmodule Teiserver.Account.AccoladeLib do # Functions @spec icon :: String.t() - def icon, do: "fa-regular fa-award" + def icon, do: "fa-solid fa-award" @spec colours :: atom def colours, do: :info diff --git a/lib/teiserver/account/libs/code_lib.ex b/lib/teiserver/account/libs/code_lib.ex index 1770de674..5f3888ece 100644 --- a/lib/teiserver/account/libs/code_lib.ex +++ b/lib/teiserver/account/libs/code_lib.ex @@ -7,7 +7,7 @@ defmodule Teiserver.Account.CodeLib do def colours(), do: :info @spec icon :: String.t() - def icon(), do: "fa-regular fa-octagon" + def icon(), do: "fa-regular fa-diamond" @doc """ Returns a list of the code types we can manually use (e.g. not password_reset) diff --git a/lib/teiserver/account/libs/rating_lib.ex b/lib/teiserver/account/libs/rating_lib.ex index 2ee44999b..bdc5d8964 100644 --- a/lib/teiserver/account/libs/rating_lib.ex +++ b/lib/teiserver/account/libs/rating_lib.ex @@ -10,7 +10,7 @@ defmodule Teiserver.Account.RatingLib do # Functions @spec icon :: String.t() - def icon, do: "fa-regular fa-screen-users" + def icon, do: "fa-solid fa-chart-column" @spec colours :: atom def colours, do: :info diff --git a/lib/teiserver/account/libs/relationship_lib.ex b/lib/teiserver/account/libs/relationship_lib.ex index ba8d96d49..d196b2b02 100644 --- a/lib/teiserver/account/libs/relationship_lib.ex +++ b/lib/teiserver/account/libs/relationship_lib.ex @@ -9,7 +9,7 @@ defmodule Teiserver.Account.RelationshipLib do def colour(), do: :success @spec icon :: String.t() - def icon(), do: "fa-users" + def icon(), do: "fa-solid fa-users" @spec icon_follow :: String.t() def icon_follow(), do: "fa-eyes" diff --git a/lib/teiserver/account/libs/role_lib.ex b/lib/teiserver/account/libs/role_lib.ex index b30820d4b..9b43376d4 100644 --- a/lib/teiserver/account/libs/role_lib.ex +++ b/lib/teiserver/account/libs/role_lib.ex @@ -42,7 +42,7 @@ defmodule Teiserver.Account.RoleLib do %{ name: "Verified", colour: "#66AA66", - icon: "fa-duotone fa-check", + icon: "fa-solid fa-check", contains: ~w() }, @@ -50,85 +50,85 @@ defmodule Teiserver.Account.RoleLib do %{ name: "Community team", colour: "#66AA66", - icon: "fa-duotone fa-thought-bubble", + icon: "fa-solid fa-thought-bubble", contains: ~w(), badge: true }, %{ name: "Mentor", colour: "#66AA66", - icon: "fa-duotone fa-thought-bubble", + icon: "fa-solid fa-thought-bubble", contains: ["Community team"], badge: true }, %{ name: "Academy manager", colour: "#66AA66", - icon: "fa-duotone fa-thought-bubble", + icon: "fa-solid fa-thought-bubble", contains: ["Community team"], badge: true }, %{ name: "Promo team", colour: "#66AA66", - icon: "fa-duotone fa-thought-bubble", + icon: "fa-solid fa-thought-bubble", contains: ["Community team"], badge: true }, # Privileged - %{name: "VIP", colour: "#AA8833", icon: "fa-duotone fa-sparkles", contains: ["BAR+"]}, + %{name: "VIP", colour: "#AA8833", icon: "fa-solid fa-sparkles", contains: ["BAR+"]}, %{name: "Streamer", colour: "#660066", icon: "fa-brands fa-twitch", contains: ~w()}, - %{name: "Tournament", colour: "#0000AA", icon: "fa-duotone fa-trophy", contains: ~w()}, + %{name: "Tournament", colour: "#0000AA", icon: "fa-solid fa-trophy", contains: ~w()}, %{ name: "Caster", colour: "#660066", - icon: "fa-duotone fa-microphone-lines", + icon: "fa-solid fa-microphone-lines", contains: ~w(Streamer Tournament), badge: true }, - %{name: "Donor", colour: "#0066AA", icon: "fa-duotone fa-euro", contains: ~w(), badge: true}, + %{name: "Donor", colour: "#0066AA", icon: "fa-solid fa-euro", contains: ~w(), badge: true}, # Contributor/Staff %{ name: "Contributor", colour: "#66AA66", - icon: "fa-duotone fa-code-commit", + icon: "fa-solid fa-code-commit", contains: ["Trusted", "BAR+"], badge: true }, - %{name: "Engine", colour: "#007700", icon: "fa-duotone fa-engine", contains: ~w(Contributor)}, - %{name: "Mapping", colour: "#007700", icon: "fa-duotone fa-map", contains: ~w(Contributor)}, + %{name: "Engine", colour: "#007700", icon: "fa-solid fa-engine", contains: ~w(Contributor)}, + %{name: "Mapping", colour: "#007700", icon: "fa-solid fa-map", contains: ~w(Contributor)}, %{ name: "Gameplay", colour: "#AA0000", - icon: "fa-duotone fa-pen-ruler", + icon: "fa-solid fa-pen-ruler", contains: ~w(Contributor), badge: true }, %{ name: "Infrastructure", colour: "#007700", - icon: "fa-duotone fa-server", + icon: "fa-solid fa-server", contains: ~w(Contributor) }, %{ name: "Data export", colour: "#007700", - icon: "fa-duotone fa-download", + icon: "fa-solid fa-download", contains: ~w(Contributor) }, %{ name: "Tester", colour: "#00AAAA", - icon: "fa-duotone fa-vial", + icon: "fa-solid fa-vial", contains: ~w(Contributor), badge: true }, %{ name: "Core", colour: "#007700", - icon: "fa-duotone fa-code-branch", + icon: "fa-solid fa-code-branch", contains: ~w(Contributor), badge: true }, @@ -137,19 +137,19 @@ defmodule Teiserver.Account.RoleLib do %{ name: "Overwatch", colour: "#AA7733", - icon: "fa-duotone fa-clipboard-list-check", + icon: "fa-solid fa-clipboard-list-check", contains: ["BAR+"] }, %{ name: "Reviewer", colour: "#AA7700", - icon: "fa-duotone fa-user-magnifying-glass", + icon: "fa-solid fa-user-magnifying-glass", contains: ~w(Overwatch) }, %{ name: "Moderator", colour: "#FFAA00", - icon: "fa-duotone fa-gavel", + icon: "fa-solid fa-gavel", contains: ~w(Reviewer), badge: true }, diff --git a/lib/teiserver/account/reports/active_report.ex b/lib/teiserver/account/reports/active_report.ex index 6883918b0..28b35ca04 100644 --- a/lib/teiserver/account/reports/active_report.ex +++ b/lib/teiserver/account/reports/active_report.ex @@ -3,7 +3,7 @@ defmodule Teiserver.Account.ActiveReport do alias Teiserver.{Logging} @spec icon() :: String.t() - def icon(), do: "fa-regular fa-satellite-dish" + def icon(), do: "fa-solid fa-satellite-dish" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/account/reports/ban_evasion_report.ex b/lib/teiserver/account/reports/ban_evasion_report.ex index 83a9ed9b1..b913ba1f6 100644 --- a/lib/teiserver/account/reports/ban_evasion_report.ex +++ b/lib/teiserver/account/reports/ban_evasion_report.ex @@ -7,7 +7,7 @@ defmodule Teiserver.Account.BanEvasionReport do require Logger @spec icon() :: String.t() - def icon(), do: "fa-regular fa-user-ninja" + def icon(), do: "fa-solid fa-user-ninja" @spec permissions() :: String.t() def permissions(), do: "Moderator" diff --git a/lib/teiserver/account/reports/growth_report.ex b/lib/teiserver/account/reports/growth_report.ex index 778e8ccfe..91a69f8a1 100644 --- a/lib/teiserver/account/reports/growth_report.ex +++ b/lib/teiserver/account/reports/growth_report.ex @@ -10,7 +10,7 @@ defmodule Teiserver.Account.GrowthReport do def name(), do: "Growth" @spec icon() :: String.t() - def icon(), do: "fa-seedling" + def icon(), do: "fa-solid fa-seedling" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/account/reports/new_smurf_report.ex b/lib/teiserver/account/reports/new_smurf_report.ex index c0fcc2d39..897ce992c 100644 --- a/lib/teiserver/account/reports/new_smurf_report.ex +++ b/lib/teiserver/account/reports/new_smurf_report.ex @@ -4,7 +4,7 @@ defmodule Teiserver.Account.NewSmurfReport do require Logger @spec icon() :: String.t() - def icon(), do: "fa-regular fa-face-angry-horns" + def icon(), do: "fa-solid fa-face-angry" @spec permissions() :: String.t() def permissions(), do: "Moderator" diff --git a/lib/teiserver/account/reports/new_user_funnel_report.ex b/lib/teiserver/account/reports/new_user_funnel_report.ex index 234505b32..451817c4a 100644 --- a/lib/teiserver/account/reports/new_user_funnel_report.ex +++ b/lib/teiserver/account/reports/new_user_funnel_report.ex @@ -3,7 +3,7 @@ defmodule Teiserver.Account.NewUserFunnelReport do alias Teiserver.{Account, Telemetry, Battle} @spec icon() :: String.t() - def icon(), do: "fa-regular fa-filter" + def icon(), do: "fa-solid fa-filter" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/account/reports/open_skill_report.ex b/lib/teiserver/account/reports/open_skill_report.ex index 7017b8ea9..e0fabd2f9 100644 --- a/lib/teiserver/account/reports/open_skill_report.ex +++ b/lib/teiserver/account/reports/open_skill_report.ex @@ -6,7 +6,7 @@ defmodule Teiserver.Account.OpenSkillReport do import Teiserver.Helper.NumberHelper, only: [int_parse: 1] @spec icon() :: String.t() - def icon(), do: "fa-regular fa-chart-line" + def icon(), do: "fa-solid fa-chart-line" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/account/reports/population_report.ex b/lib/teiserver/account/reports/population_report.ex index d49a14e7f..b43b07d3d 100644 --- a/lib/teiserver/account/reports/population_report.ex +++ b/lib/teiserver/account/reports/population_report.ex @@ -3,7 +3,7 @@ defmodule Teiserver.Account.PopulationReport do alias Teiserver.Repo @spec icon() :: String.t() - def icon(), do: "fa-regular fa-people-group" + def icon(), do: "fa-solid fa-people-group" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/account/reports/relationship_report.ex b/lib/teiserver/account/reports/relationship_report.ex index fc57cc4ad..7235d1652 100644 --- a/lib/teiserver/account/reports/relationship_report.ex +++ b/lib/teiserver/account/reports/relationship_report.ex @@ -5,7 +5,7 @@ defmodule Teiserver.Account.RelationshipReport do alias Teiserver.Account.RelationshipLib @spec icon() :: String.t() - def icon(), do: "fa-regular fa-arrow-down-up-across-line" + def icon(), do: "fa-solid fa-arrow-down-up-across-line" @spec permissions() :: String.t() def permissions(), do: "Reviewer" diff --git a/lib/teiserver/account/reports/retention_report.ex b/lib/teiserver/account/reports/retention_report.ex index 5e18e376b..52ecd2cb5 100644 --- a/lib/teiserver/account/reports/retention_report.ex +++ b/lib/teiserver/account/reports/retention_report.ex @@ -3,7 +3,7 @@ defmodule Teiserver.Account.RetentionReport do alias Teiserver.{Account, Logging} @spec icon() :: String.t() - def icon(), do: "fa-regular fa-campground" + def icon(), do: "fa-solid fa-campground" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/account/reports/review_report.ex b/lib/teiserver/account/reports/review_report.ex index 40bdf3638..f09ee7bf5 100644 --- a/lib/teiserver/account/reports/review_report.ex +++ b/lib/teiserver/account/reports/review_report.ex @@ -3,7 +3,7 @@ defmodule Teiserver.Account.ReviewReport do alias Teiserver.{Logging} @spec icon() :: String.t() - def icon(), do: "fa-regular fa-champagne-glasses" + def icon(), do: "fa-solid fa-champagne-glasses" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/account/reports/time_compare_report.ex b/lib/teiserver/account/reports/time_compare_report.ex index 58b34d7bf..cdc5eb47e 100644 --- a/lib/teiserver/account/reports/time_compare_report.ex +++ b/lib/teiserver/account/reports/time_compare_report.ex @@ -4,7 +4,7 @@ defmodule Teiserver.Account.TimeCompareReport do import Teiserver.Helper.StringHelper, only: [get_hash_id: 1] @spec icon() :: String.t() - def icon(), do: "fa-regular fa-code-compare" + def icon(), do: "fa-solid fa-code-compare" @spec permissions() :: String.t() def permissions(), do: "Moderator" diff --git a/lib/teiserver/account/reports/time_spent_report.ex b/lib/teiserver/account/reports/time_spent_report.ex index 71b33e702..af5afdb00 100644 --- a/lib/teiserver/account/reports/time_spent_report.ex +++ b/lib/teiserver/account/reports/time_spent_report.ex @@ -5,7 +5,7 @@ defmodule Teiserver.Account.TimeSpentReport do import Teiserver.Helper.StringHelper, only: [get_hash_id: 1] @spec icon() :: String.t() - def icon(), do: "fa-regular fa-watch" + def icon(), do: "fa-solid fa-stopwatch" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/account/reports/user_age_report.ex b/lib/teiserver/account/reports/user_age_report.ex index 2be17205e..6df260363 100644 --- a/lib/teiserver/account/reports/user_age_report.ex +++ b/lib/teiserver/account/reports/user_age_report.ex @@ -5,7 +5,7 @@ defmodule Teiserver.Account.UserAgeReport do alias Teiserver.Repo @spec icon() :: String.t() - def icon(), do: "fa-regular fa-chevrons-up" + def icon(), do: "fa-solid fa-chevron-up" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/account/reports/verified_report.ex b/lib/teiserver/account/reports/verified_report.ex index 9d68b974c..8b72503b9 100644 --- a/lib/teiserver/account/reports/verified_report.ex +++ b/lib/teiserver/account/reports/verified_report.ex @@ -3,7 +3,7 @@ defmodule Teiserver.Account.VerifiedReport do alias Teiserver.Account @spec icon() :: String.t() - def icon(), do: "fa-regular fa-check" + def icon(), do: "fa-solid fa-check" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/battle/libs/match_lib.ex b/lib/teiserver/battle/libs/match_lib.ex index fd883e966..9ed533e17 100644 --- a/lib/teiserver/battle/libs/match_lib.ex +++ b/lib/teiserver/battle/libs/match_lib.ex @@ -7,7 +7,7 @@ defmodule Teiserver.Battle.MatchLib do require Logger @spec icon :: String.t() - def icon, do: "fa-regular fa-swords" + def icon, do: "fa-solid fa-explosion" @spec colours :: atom def colours, do: :success2 diff --git a/lib/teiserver/communication/libs/text_callback_lib.ex b/lib/teiserver/communication/libs/text_callback_lib.ex index 2e698dc9c..ca50e505f 100644 --- a/lib/teiserver/communication/libs/text_callback_lib.ex +++ b/lib/teiserver/communication/libs/text_callback_lib.ex @@ -6,7 +6,7 @@ defmodule Teiserver.Communication.TextCallbackLib do # Functions @spec icon :: String.t() - def icon, do: "fa-regular fa-webhook" + def icon, do: "fa-regular fa-voicemail" @spec colours :: atom def colours, do: :success2 diff --git a/lib/teiserver/game/exports/match_datatable_export.ex b/lib/teiserver/game/exports/match_datatable_export.ex index 4987f6f1b..d607ee5f8 100644 --- a/lib/teiserver/game/exports/match_datatable_export.ex +++ b/lib/teiserver/game/exports/match_datatable_export.ex @@ -20,7 +20,7 @@ defmodule Teiserver.Game.MatchDataTableExport do alias Teiserver.Helper.TimexHelper @spec icon() :: String.t() - def icon(), do: "fa-regular fa-table" + def icon(), do: "fa-solid fa-table" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/game/exports/match_ratings_export.ex b/lib/teiserver/game/exports/match_ratings_export.ex index 22630a67b..64199dcfb 100644 --- a/lib/teiserver/game/exports/match_ratings_export.ex +++ b/lib/teiserver/game/exports/match_ratings_export.ex @@ -24,7 +24,7 @@ defmodule Teiserver.Game.MatchRatingsExport do @game_chunk_size 100 @spec icon() :: String.t() - def icon(), do: "fa-regular fa-swords" + def icon(), do: "fa-solid fa-explosion" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/game/exports/player_ratings_export.ex b/lib/teiserver/game/exports/player_ratings_export.ex index 8c7bb191f..fde6266b4 100644 --- a/lib/teiserver/game/exports/player_ratings_export.ex +++ b/lib/teiserver/game/exports/player_ratings_export.ex @@ -20,7 +20,7 @@ defmodule Teiserver.Game.PlayerRatingsExport do require Logger @spec icon() :: String.t() - def icon(), do: "fa-regular fa-user-shield" + def icon(), do: "fa-solid fa-user-shield" @spec permissions() :: String.t() def permissions(), do: "teiserver.admin" diff --git a/lib/teiserver/game/exports/rating_logs_export.ex b/lib/teiserver/game/exports/rating_logs_export.ex index 8884fc956..99d39bf06 100644 --- a/lib/teiserver/game/exports/rating_logs_export.ex +++ b/lib/teiserver/game/exports/rating_logs_export.ex @@ -21,7 +21,7 @@ defmodule Teiserver.Game.RatingLogsExport do require Logger @spec icon() :: String.t() - def icon(), do: "fa-regular fa-rectangle-vertical-history" + def icon(), do: "fa-solid fa-layer-group" @spec permissions() :: String.t() def permissions(), do: "teiserver.admin" diff --git a/lib/teiserver/helpers/styling_helpers.ex b/lib/teiserver/helpers/styling_helpers.ex index e7826227a..798c121ca 100644 --- a/lib/teiserver/helpers/styling_helpers.ex +++ b/lib/teiserver/helpers/styling_helpers.ex @@ -80,7 +80,7 @@ defmodule Teiserver.Helper.StylingHelper do def icon(:filter, fa_type), do: "fa-#{fa_type} fa-filter" - def icon(:summary, fa_type), do: "fa-#{fa_type} fa-user-chart" + def icon(:summary, fa_type), do: "fa-#{fa_type} fa-clipboard-list" def icon(:chart, fa_type), do: "fa-#{fa_type} fa-chart-line" diff --git a/lib/teiserver/lobby.ex b/lib/teiserver/lobby.ex index 000d8470e..8e13ca59d 100644 --- a/lib/teiserver/lobby.ex +++ b/lib/teiserver/lobby.ex @@ -11,7 +11,7 @@ defmodule Teiserver.Lobby do alias Teiserver.Lobby.{ChatLib, LobbyLib} @spec icon :: String.t() - def icon, do: "fa-regular fa-sword" + def icon, do: "fa-solid fa-dungeon" @spec colours :: atom def colours, do: :primary2 diff --git a/lib/teiserver/microblog/libs/post_lib.ex b/lib/teiserver/microblog/libs/post_lib.ex index d987f33f1..29785fce9 100644 --- a/lib/teiserver/microblog/libs/post_lib.ex +++ b/lib/teiserver/microblog/libs/post_lib.ex @@ -6,7 +6,7 @@ defmodule Teiserver.Microblog.PostLib do # Functions @spec icon :: String.t() - def icon, do: "fa-circle-envelope" + def icon, do: "fa-solid fa-envelope" @spec colours :: atom def colours, do: :primary diff --git a/lib/teiserver/moderation/libs/action_lib.ex b/lib/teiserver/moderation/libs/action_lib.ex index 8dd355fe1..25c399808 100644 --- a/lib/teiserver/moderation/libs/action_lib.ex +++ b/lib/teiserver/moderation/libs/action_lib.ex @@ -7,7 +7,7 @@ defmodule Teiserver.Moderation.ActionLib do # Functions @spec icon :: String.t() - def icon, do: "fa-regular fa-triangle" + def icon, do: "fa-regular fa-exclamation" @spec colour :: atom def colour, do: :primary diff --git a/lib/teiserver/moderation/libs/ban_lib.ex b/lib/teiserver/moderation/libs/ban_lib.ex index 1d709ccfa..121648893 100644 --- a/lib/teiserver/moderation/libs/ban_lib.ex +++ b/lib/teiserver/moderation/libs/ban_lib.ex @@ -5,7 +5,7 @@ defmodule Teiserver.Moderation.BanLib do # Functions @spec icon :: String.t() - def icon, do: "fa-regular fa-gavel" + def icon, do: "fa-solid fa-gavel" @spec colour :: atom def colour, do: :danger diff --git a/lib/teiserver/telemetry/libs/infolog_lib.ex b/lib/teiserver/telemetry/libs/infolog_lib.ex index 9079269ab..e8df8ba0a 100644 --- a/lib/teiserver/telemetry/libs/infolog_lib.ex +++ b/lib/teiserver/telemetry/libs/infolog_lib.ex @@ -8,7 +8,7 @@ defmodule Teiserver.Telemetry.InfologLib do def colours(), do: :success2 @spec icon() :: String.t() - def icon(), do: "fa-regular fa-barcode-scan" + def icon(), do: "fa-solid fa-barcode" # Queries @spec query_infologs() :: Ecto.Query.t() diff --git a/lib/teiserver/telemetry/libs/telemetry_lib.ex b/lib/teiserver/telemetry/libs/telemetry_lib.ex index 250e69d54..fd1665b3c 100644 --- a/lib/teiserver/telemetry/libs/telemetry_lib.ex +++ b/lib/teiserver/telemetry/libs/telemetry_lib.ex @@ -7,7 +7,7 @@ defmodule Teiserver.Telemetry.TelemetryLib do def colours(), do: :warning2 @spec icon() :: String.t() - def icon(), do: "fa-regular fa-monitor-heart-rate" + def icon(), do: "fa-regular fa-heart-pulse" @spec get_totals_and_reset :: map() def get_totals_and_reset() do diff --git a/lib/teiserver_web/components/nav_components.ex b/lib/teiserver_web/components/nav_components.ex index 018219f30..44a2573ca 100644 --- a/lib/teiserver_web/components/nav_components.ex +++ b/lib/teiserver_web/components/nav_components.ex @@ -203,7 +203,7 @@ defmodule TeiserverWeb.NavComponents do """ attr :url, :string, required: true attr :icon, :string, required: true - attr :icon_class, :string, default: "duotone" + attr :icon_class, :string, default: "solid" attr :size, :atom, default: nil slot :inner_block, required: true @@ -274,7 +274,7 @@ defmodule TeiserverWeb.NavComponents do
<%= render_slot(@inner_block) %> diff --git a/lib/teiserver_web/live/account/account_components.ex b/lib/teiserver_web/live/account/account_components.ex index 23ef44075..765dc4001 100644 --- a/lib/teiserver_web/live/account/account_components.ex +++ b/lib/teiserver_web/live/account/account_components.ex @@ -51,7 +51,7 @@ defmodule TeiserverWeb.AccountComponents do <.sub_menu_button bsname={@view_colour} - icon="fa-lock" + icon="fa-solid fa-lock" active={@active == "security"} url={~p"/teiserver/account/security"} > diff --git a/lib/teiserver_web/live/account/profile/appearance.html.heex b/lib/teiserver_web/live/account/profile/appearance.html.heex index 64e66f9b5..d1ae8dfee 100644 --- a/lib/teiserver_web/live/account/profile/appearance.html.heex +++ b/lib/teiserver_web/live/account/profile/appearance.html.heex @@ -22,7 +22,7 @@ class="block-link" style={"background-color: #{@current_user.colour}; color: #FFFFFF;"} > -
  +
  @@ -35,7 +35,7 @@ phx-value-role={role.name} > -
+
<%= role.name %> diff --git a/lib/teiserver_web/live/communication/chat/index.html.heex b/lib/teiserver_web/live/communication/chat/index.html.heex index 4236cd1db..bc92c83f0 100644 --- a/lib/teiserver_web/live/communication/chat/index.html.heex +++ b/lib/teiserver_web/live/communication/chat/index.html.heex @@ -3,7 +3,7 @@
<.menu_card icon={Teiserver.Chat.RoomMessageLib.icon()} - icon_class="fa-duotone" + icon_class="fa-solid" url={~p"/chat/room/main"} > Rooms @@ -11,7 +11,7 @@ <.menu_card icon={Teiserver.Battle.MatchLib.icon()} - icon_class="fa-duotone" + icon_class="fa-solid" url={~p"/battle/lobbies"} > Lobbies diff --git a/lib/teiserver_web/live/general/home/index.html.heex b/lib/teiserver_web/live/general/home/index.html.heex index 940c7632f..49735be01 100644 --- a/lib/teiserver_web/live/general/home/index.html.heex +++ b/lib/teiserver_web/live/general/home/index.html.heex @@ -4,7 +4,7 @@ <.menu_card :if={allow_any?(@current_user, ~w(Contributor Overwatch))} icon={Teiserver.icon()} - icon_class="fa-duotone" + icon_class="fa-solid" url={~p"/teiserver/admin"} > Administration @@ -13,7 +13,7 @@ <.menu_card :if={false and allow?(@current_user, "Moderator")} icon="question" - icon_class="fa-duotone" + icon_class="fa-solid" url={~p"/teiserver/admin"} > Appeals @@ -22,7 +22,7 @@ <.menu_card :if={allow?(@current_user, "Overwatch")} icon={Teiserver.Moderation.overwatch_icon()} - icon_class="fa-duotone" + icon_class="fa-solid" url={~p"/moderation/overwatch"} > Overwatch @@ -31,7 +31,7 @@ <.menu_card :if={allow_any?(@current_user, ~w(Contributor Overwatch))} icon={StylingHelper.icon(:summary)} - icon_class="fa-duotone" + icon_class="fa-solid" url={~p"/teiserver/reports"} > Reports @@ -39,17 +39,17 @@
- <.menu_card icon={Teiserver.Chat.RoomMessageLib.icon()} icon_class="fa-duotone" url={~p"/chat"}> + <.menu_card icon={Teiserver.Chat.RoomMessageLib.icon()} icon_class="fa-solid" url={~p"/chat"}> Chat - <.menu_card icon={Teiserver.Lobby.icon()} icon_class="fa-duotone" url={~p"/battle/lobbies"}> + <.menu_card icon={Teiserver.Lobby.icon()} icon_class="fa-solid" url={~p"/battle/lobbies"}> Lobbies <.menu_card icon={Teiserver.Account.PartyLib.icon()} - icon_class="fa-duotone" + icon_class="fa-solid" url={~p"/teiserver/account/parties"} > Parties @@ -57,29 +57,29 @@ <.menu_card icon={Teiserver.Game.QueueLib.icon()} - icon_class="fa-duotone" + icon_class="fa-solid" url={~p"/teiserver/matchmaking/queues"} > Matchmaking - <.menu_card icon={Teiserver.Battle.MatchLib.icon()} icon_class="fa-duotone" url={~p"/battle"}> + <.menu_card icon={Teiserver.Battle.MatchLib.icon()} icon_class="fa-solid" url={~p"/battle"}> Matches - <.menu_card icon={Teiserver.Microblog.icon()} icon_class="fa-duotone" url={~p"/microblog"}> + <.menu_card icon={Teiserver.Microblog.icon()} icon_class="fa-solid" url={~p"/microblog"}> Microblog
- <.menu_card icon={Teiserver.Account.UserLib.icon()} icon_class="fa-duotone" url={~p"/profile"}> + <.menu_card icon={Teiserver.Account.UserLib.icon()} icon_class="fa-solid" url={~p"/profile"}> Account <.menu_card icon={Teiserver.Account.RelationshipLib.icon()} - icon_class="fa-duotone" + icon_class="fa-solid" url={~p"/account/relationship"} > Relationships @@ -89,7 +89,7 @@
<.link href={~p"/logout"} method="post" class="link"> - +
Logout
diff --git a/lib/teiserver_web/templates/account/general/index.html.heex b/lib/teiserver_web/templates/account/general/index.html.heex index 19b17cafb..12d0917d4 100644 --- a/lib/teiserver_web/templates/account/general/index.html.heex +++ b/lib/teiserver_web/templates/account/general/index.html.heex @@ -1,6 +1,6 @@
<%= central_component("menu_card", - icon_class: "fa-duotone", + icon_class: "fa-solid", name: "profile", icon: "fa-solid fa-user-circle", text: "My profile", @@ -8,7 +8,7 @@ ) %> <%= central_component("menu_card", - icon_class: "fa-duotone", + icon_class: "fa-solid", name: "", icon: Teiserver.icon(:relationship), text: "Friends/Mutes/Invites", @@ -16,7 +16,7 @@ ) %> <%= central_component("menu_card", - icon_class: "fa-duotone", + icon_class: "fa-solid", name: "", icon: Teiserver.Config.UserConfigLib.icon(), text: "Preferences", @@ -26,14 +26,14 @@ <%= central_component("menu_card", icon: Teiserver.Account.icon(), text: "Account details", - icon_class: "fa-duotone", + icon_class: "fa-solid", link: Routes.ts_account_general_path(@conn, :edit_details) ) %> <%= central_component("menu_card", - icon: "fa-duotone fa-lock", + icon: "fa-lock", text: "Security", - icon_class: "fa-duotone", + icon_class: "fa-solid", link: Routes.ts_account_security_path(@conn, :index) ) %>
diff --git a/lib/teiserver_web/templates/admin/tool/falist.html.heex b/lib/teiserver_web/templates/admin/tool/falist.html.heex index d729298b0..bce3fe3f0 100644 --- a/lib/teiserver_web/templates/admin/tool/falist.html.heex +++ b/lib/teiserver_web/templates/admin/tool/falist.html.heex @@ -30,7 +30,7 @@ standard = Fontawesome.standard_icons() %> - +
<%= the_icon %> diff --git a/lib/teiserver_web/templates/admin/tool/test_page.html.heex b/lib/teiserver_web/templates/admin/tool/test_page.html.heex index 3a692704f..4957776a5 100644 --- a/lib/teiserver_web/templates/admin/tool/test_page.html.heex +++ b/lib/teiserver_web/templates/admin/tool/test_page.html.heex @@ -53,7 +53,7 @@ output += ""; output += ""; output += ""; - output += ""; + output += ""; output += ""; output += "
"; @@ -135,7 +135,7 @@
One icon per row, no fa- - prefix. Columns on the right are fa-thin, fa-light, fa-regular, fa-solid, fa-duotone, fa-brands.