Skip to content

Commit

Permalink
Replace regular icons with solid
Browse files Browse the repository at this point in the history
Also replace a few icons for a free alternative
  • Loading branch information
geekingfrog committed Jun 7, 2024
1 parent 8c2db29 commit 7325fda
Show file tree
Hide file tree
Showing 39 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion lib/teiserver/account/exports/player_count_export.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/exports/retention_rate_export.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/libs/accolade_lib.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/libs/code_lib.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/libs/rating_lib.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/libs/relationship_lib.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/active_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/ban_evasion_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/growth_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/new_smurf_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/new_user_funnel_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/open_skill_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/population_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/relationship_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/retention_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/review_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/time_compare_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/time_spent_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/user_age_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/account/reports/verified_report.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/battle/libs/match_lib.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/communication/libs/text_callback_lib.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/game/exports/match_datatable_export.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/game/exports/match_ratings_export.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/game/exports/player_ratings_export.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/game/exports/rating_logs_export.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/helpers/styling_helpers.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/lobby.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/microblog/libs/post_lib.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/moderation/libs/action_lib.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/moderation/libs/ban_lib.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/telemetry/libs/infolog_lib.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver/telemetry/libs/telemetry_lib.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver_web/components/nav_components.ex
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ defmodule TeiserverWeb.NavComponents do
<Fontawesome.icon
:if={@icon}
icon={@icon}
style={if @active, do: "solid", else: "regular"}
style="solid"
size="2x"
/><br />
<%= render_slot(@inner_block) %>
Expand Down
2 changes: 1 addition & 1 deletion lib/teiserver_web/live/account/account_components.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
) %>

<%= central_component("menu_card",
icon: "fa-solid fa-lock",
icon: "fa-lock",
text: "Security",
icon_class: "fa-solid",
link: Routes.ts_account_security_path(@conn, :index)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
label: "Tournament",
active: @active,
url: ~p"/tournament/lobbies",
icon: "fa-regular fa-trophy"
icon: "fa-solid fa-trophy"
) %>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions lib/teiserver_web/templates/report/general/index.html.heex
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<%= central_component("menu_card",
size: :small,
icon: "fa-regular fa-download",
icon: "fa-solid fa-download",
name: "exports",
text: "Data exports",
link: Routes.ts_reports_exports_path(@conn, :index)
Expand Down Expand Up @@ -202,7 +202,7 @@
<%= if allow?(@current_user, Teiserver.Account.TournamentReport.permissions()) do %>
<%= central_component("menu_card",
size: :small,
icon: "fa-regular fa-ranking-star",
icon: "fa-solid fa-ranking-star",
name: "tournament",
text: "Tournament",
link: Routes.ts_reports_report_path(@conn, :show, "tournament")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
label: "Data exports",
active: @active,
url: ~p"/teiserver/reports/exports",
icon: "fa-regular fa-download"
icon: "fa-solid fa-download"
) %>

<%= if allow_any?(@conn, ~w(Contributor Overwatch)) do %>
Expand Down

0 comments on commit 7325fda

Please sign in to comment.