diff --git a/assets/css/themes/dark-purple.css b/assets/css/themes/dark-purple.css
index f667c0688..6af47f5aa 100644
--- a/assets/css/themes/dark-purple.css
+++ b/assets/css/themes/dark-purple.css
@@ -53,6 +53,7 @@ $tag-category-content-official-color: #b9b541;
$tag-category-content-fanmade-color: #cc8eb5;
$tag-category-species-color: #b16b50;
$tag-category-body-type-color: #b8b8b8;
+$tag-category-gender-color: #0b9d88;
$commission-category-color: #e07b27;
diff --git a/assets/css/themes/dark-red.css b/assets/css/themes/dark-red.css
index 02ab9b9ff..9bed52762 100644
--- a/assets/css/themes/dark-red.css
+++ b/assets/css/themes/dark-red.css
@@ -54,6 +54,7 @@ $tag-category-content-official-color: #d1cf84;
$tag-category-content-fanmade-color: #ebb1d6;
$tag-category-species-color: #d2b48c;
$tag-category-body-type-color: #b8b8b8;
+$tag-category-gender-color: #0b9d88;
$commission-category-color: #e02727;
diff --git a/assets/static/favicon.svg b/assets/static/favicon.svg
index 78295dddd..1d42e9673 100644
--- a/assets/static/favicon.svg
+++ b/assets/static/favicon.svg
@@ -1,2 +1,2 @@
-
+
diff --git a/assets/static/images/tagblocked.svg b/assets/static/images/tagblocked.svg
index ad17669be..eb532e1d5 100644
--- a/assets/static/images/tagblocked.svg
+++ b/assets/static/images/tagblocked.svg
@@ -1,3 +1,2 @@
-
-
+
diff --git a/lib/philomena/commissions/commission.ex b/lib/philomena/commissions/commission.ex
index c4108cee6..d9481afff 100644
--- a/lib/philomena/commissions/commission.ex
+++ b/lib/philomena/commissions/commission.ex
@@ -55,17 +55,17 @@ defmodule Philomena.Commissions.Commission do
def categories do
[
Anthro: "Anthro",
- "Canon Characters": "Canon Characters",
+ "Cyberchase Characters": "Cyberchase Characters",
Comics: "Comics",
- "Fetish Art": "Fetish Art",
- "Human and EqG": "Human and EqG",
+ "Fetish Content": "Fetish Content",
+ "Human": "Human",
NSFW: "NSFW",
- "Original Characters": "Original Characters",
+ "OCs": "OCs",
"Original Species": "Original Species",
- Pony: "Pony",
Requests: "Requests",
- Safe: "Safe",
+ SFW: "SFW",
Shipping: "Shipping",
+ Transformation: "Transformation",
"Violence and Gore": "Violence and Gore"
]
end
@@ -85,6 +85,8 @@ defmodule Philomena.Commissions.Commission do
"Crafted Item",
"Sculpture",
"Plushie",
+ "Trading Card",
+ "Reference Sheet",
"Other"
]
end
diff --git a/lib/philomena_web/controllers/admin/user_ban_controller.ex b/lib/philomena_web/controllers/admin/user_ban_controller.ex
index a023d204b..236ae71b8 100644
--- a/lib/philomena_web/controllers/admin/user_ban_controller.ex
+++ b/lib/philomena_web/controllers/admin/user_ban_controller.ex
@@ -56,7 +56,7 @@ defmodule PhilomenaWeb.Admin.UserBanController do
case Bans.create_user(conn.assigns.current_user, user_ban_params) do
{:ok, user_ban} ->
conn
- |> put_flash(:info, "User was successfully banned.")
+ |> put_flash(:info, "User Was Successfully Banned.")
|> moderation_log(details: &log_details/2, data: user_ban)
|> redirect(to: ~p"/admin/user_bans")
@@ -74,7 +74,7 @@ defmodule PhilomenaWeb.Admin.UserBanController do
case Bans.update_user(conn.assigns.user, user_ban_params) do
{:ok, user_ban} ->
conn
- |> put_flash(:info, "User ban successfully updated.")
+ |> put_flash(:info, "User Ban Successfully Updated.")
|> moderation_log(details: &log_details/2, data: user_ban)
|> redirect(to: ~p"/admin/user_bans")
@@ -87,7 +87,7 @@ defmodule PhilomenaWeb.Admin.UserBanController do
{:ok, user_ban} = Bans.delete_user(conn.assigns.user)
conn
- |> put_flash(:info, "User ban successfully deleted.")
+ |> put_flash(:info, "User Ban Successfully Deleted.")
|> moderation_log(details: &log_details/2, data: user_ban)
|> redirect(to: ~p"/admin/user_bans")
end
diff --git a/lib/philomena_web/templates/image/_description.html.slime b/lib/philomena_web/templates/image/_description.html.slime
index 5f1fa052f..3964aec00 100644
--- a/lib/philomena_web/templates/image/_description.html.slime
+++ b/lib/philomena_web/templates/image/_description.html.slime
@@ -13,4 +13,4 @@
= if String.length(@image.description) > 0 do
= @body
- else
- em No description provided.
+ em No description set yet.
diff --git a/lib/philomena_web/templates/profile/commission/_form.html.slime b/lib/philomena_web/templates/profile/commission/_form.html.slime
index 1936edf1f..e185de873 100644
--- a/lib/philomena_web/templates/profile/commission/_form.html.slime
+++ b/lib/philomena_web/templates/profile/commission/_form.html.slime
@@ -16,6 +16,10 @@
=> label f, :will_create, "Content you are particularly interested in drawing or creating (optional):"
= textarea f, :will_create, class: "input input--wide input--text", placeholder: "List specific content you are willing to accept commissions for."
= error_tag f, :will_create
+ .field
+ => label f, :neither_create, "Something that I sometimes draw (optional):"
+ = textarea f, :neither_create, class: "input input--wide input--text", placeholder: "List specific content you are sometimes willing to accept commissions for."
+ = error_tag f, :neither_create
.field
=> label f, :will_not_create, "Content you will not draw or create (optional):"
= textarea f, :will_not_create, class: "input input--wide input--text", placeholder: "List specific content you are not willing to accept commissions for."
diff --git a/lib/philomena_web/templates/profile/commission/_listing_sidebar.html.slime b/lib/philomena_web/templates/profile/commission/_listing_sidebar.html.slime
index 93db5128d..c7cadcf0a 100644
--- a/lib/philomena_web/templates/profile/commission/_listing_sidebar.html.slime
+++ b/lib/philomena_web/templates/profile/commission/_listing_sidebar.html.slime
@@ -8,7 +8,7 @@
br
strong> Status:
- = if @commission.open, do: "Open", else: "Closed"
+ = if @commission.open, do: "Open", else: "No"
br
@@ -50,11 +50,19 @@
.block__content.commission__block_body
= @rendered.will_create
+/ Will neither create block
+= if @commission.neither_create not in [nil, ""] do
+ .block
+ .block__header
+ span.block__header__title Will maybe draw/create
+ .block__content.commission__block_body
+ = @rendered.will_n_create
+
/ Will not create block
= if @commission.will_not_create not in [nil, ""] do
.block
.block__header
- span.block__header__title Will not draw/create
+ span.block__header__title Won't draw/create
.block__content.commission__block_body
= @rendered.will_not_create
diff --git a/lib/philomena_web/templates/profile/commission/show.html.slime b/lib/philomena_web/templates/profile/commission/show.html.slime
index d3814e94d..dab10ab4d 100644
--- a/lib/philomena_web/templates/profile/commission/show.html.slime
+++ b/lib/philomena_web/templates/profile/commission/show.html.slime
@@ -1,6 +1,6 @@
h1
= @commission.user.name
- | 's Commissions
+ | 's Commissions Info!
.column-layout