From 044df29a38038db1a287853eecf00d58d7d18f7c Mon Sep 17 00:00:00 2001 From: "Luna D." Date: Tue, 30 Apr 2024 09:25:23 +0200 Subject: [PATCH] small vite fixes --- assets/css/application.scss | 2 +- assets/css/common/_mixins.scss | 2 +- assets/css/elements/_block.scss | 2 +- assets/css/elements/_button.scss | 2 +- assets/css/elements/_flash.scss | 2 +- assets/css/elements/_heading.scss | 2 +- assets/css/elements/_separator.scss | 2 +- assets/css/themes/dark-blue.scss | 4 ++-- assets/css/themes/dark-purple.scss | 4 ++-- lib/philomena_web/templates/layout/_flash_warnings.html.slime | 2 +- lib/philomena_web/views/staff_view.ex | 2 +- lib/philomena_web/views/user_attribution_view.ex | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/assets/css/application.scss b/assets/css/application.scss index bcaceb47..5cc73042 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -7,7 +7,7 @@ * */ -$fa-font-path: '~@fortawesome/fontawesome-free/webfonts'; +$fa-font-path: "@fortawesome/fontawesome-free/webfonts"; @import "@fortawesome/fontawesome-free/scss/fontawesome.scss"; @import "@fortawesome/fontawesome-free/scss/solid.scss"; diff --git a/assets/css/common/_mixins.scss b/assets/css/common/_mixins.scss index cbd3e31c..687ab402 100644 --- a/assets/css/common/_mixins.scss +++ b/assets/css/common/_mixins.scss @@ -50,7 +50,7 @@ @include even-odd-type(warning); @include even-odd-type(danger); @include even-odd-type(information); - @include even-odd-type(purple); + @include even-odd-type(special); } @mixin animated-transition { diff --git a/assets/css/elements/_block.scss b/assets/css/elements/_block.scss index 54bfaa56..553f1a79 100644 --- a/assets/css/elements/_block.scss +++ b/assets/css/elements/_block.scss @@ -155,4 +155,4 @@ @include block-type(warning); @include block-type(danger); @include block-type(information); -@include block-type(purple); +@include block-type(special); diff --git a/assets/css/elements/_button.scss b/assets/css/elements/_button.scss index 2df9be1c..350017c8 100644 --- a/assets/css/elements/_button.scss +++ b/assets/css/elements/_button.scss @@ -139,4 +139,4 @@ @include button-type(warning); @include button-type(danger); @include button-type(information); -@include button-type(purple); +@include button-type(special); diff --git a/assets/css/elements/_flash.scss b/assets/css/elements/_flash.scss index 14562c37..04755230 100644 --- a/assets/css/elements/_flash.scss +++ b/assets/css/elements/_flash.scss @@ -45,4 +45,4 @@ @include flash-type(warning); @include flash-type(danger); @include flash-type(information); -@include flash-type(purple); +@include flash-type(special); diff --git a/assets/css/elements/_heading.scss b/assets/css/elements/_heading.scss index 9251c0dd..ab9835eb 100644 --- a/assets/css/elements/_heading.scss +++ b/assets/css/elements/_heading.scss @@ -37,4 +37,4 @@ h6 { @include heading-type(warning); @include heading-type(danger); @include heading-type(information); -@include heading-type(purple); +@include heading-type(special); diff --git a/assets/css/elements/_separator.scss b/assets/css/elements/_separator.scss index 5b0e225c..1294459f 100644 --- a/assets/css/elements/_separator.scss +++ b/assets/css/elements/_separator.scss @@ -36,4 +36,4 @@ @include separator-type(warning); @include separator-type(danger); @include separator-type(information); -@include separator-type(purple); +@include separator-type(special); diff --git a/assets/css/themes/dark-blue.scss b/assets/css/themes/dark-blue.scss index 2dcf7cec..6a4b1863 100644 --- a/assets/css/themes/dark-blue.scss +++ b/assets/css/themes/dark-blue.scss @@ -7,7 +7,7 @@ $danger-color: #672a21; $warning-color: #684f2c; $success-color: #25603e; $information-color: #205861; -$purple-color: #561e5e; +$special-color: #561e5e; $upvote-color: #5b9b26; $downvote-color: #da3412; @@ -73,7 +73,7 @@ $spoiler-color: #0f0f0f; @include type-color(warning, $warning-color); @include type-color(danger, $danger-color); @include type-color(information, $information-color); - @include type-color(purple, $purple-color); + @include type-color(special, $special-color); @include tag-color(default, $tag-default-color); @include tag-color(error, $tag-error-color, 37%); diff --git a/assets/css/themes/dark-purple.scss b/assets/css/themes/dark-purple.scss index f2c8b2bd..b7364020 100644 --- a/assets/css/themes/dark-purple.scss +++ b/assets/css/themes/dark-purple.scss @@ -7,7 +7,7 @@ $danger-color: #57261f; $warning-color: #5c472a; $success-color: #255339; $information-color: #1f5057; -$purple-color: #501f57; +$special-color: #501f57; $upvote-color: #5b9b26; $downvote-color: #da3412; @@ -73,7 +73,7 @@ $spoiler-color: #0f0f0f; @include type-color(warning, $warning-color); @include type-color(danger, $danger-color); @include type-color(information, $information-color); - @include type-color(purple, $purple-color); + @include type-color(special, $special-color); @include tag-color(default, $tag-default-color); @include tag-color(error, $tag-error-color, 37%); diff --git a/lib/philomena_web/templates/layout/_flash_warnings.html.slime b/lib/philomena_web/templates/layout/_flash_warnings.html.slime index 8f285f89..065c67fc 100644 --- a/lib/philomena_web/templates/layout/_flash_warnings.html.slime +++ b/lib/philomena_web/templates/layout/_flash_warnings.html.slime @@ -1,5 +1,5 @@ = for notice <- @conn.assigns.site_notices do - .flash.flash--purple + .flash.flash--special .flash__icon i.fa.fa-info-circle .flash__message diff --git a/lib/philomena_web/views/staff_view.ex b/lib/philomena_web/views/staff_view.ex index 6296d3af..c4fa6c40 100644 --- a/lib/philomena_web/views/staff_view.ex +++ b/lib/philomena_web/views/staff_view.ex @@ -32,7 +32,7 @@ defmodule PhilomenaWeb.StaffView do def category_class("Technical Team"), do: "block--warning" def category_class("Public Relations"), do: "block--warning" def category_class("Moderators"), do: "block--success" - def category_class("Assistants"), do: "block--purple" + def category_class("Assistants"), do: "block--special" def category_class(_), do: "" def staff_description(%{description: desc}) when desc not in [nil, ""] do diff --git a/lib/philomena_web/views/user_attribution_view.ex b/lib/philomena_web/views/user_attribution_view.ex index 668ecbc4..ea829032 100644 --- a/lib/philomena_web/views/user_attribution_view.ex +++ b/lib/philomena_web/views/user_attribution_view.ex @@ -119,10 +119,10 @@ defmodule PhilomenaWeb.UserAttributionView do do: [{"label--success", "Moderator"} | labels] defp staff_role(labels, %{hide_default_role: false, role: "assistant", senior_staff: true}), - do: [{"label--purple", "Senior Assistant"} | labels] + do: [{"label--special", "Senior Assistant"} | labels] defp staff_role(labels, %{hide_default_role: false, role: "assistant"}), - do: [{"label--purple", "Assistant"} | labels] + do: [{"label--special", "Assistant"} | labels] defp staff_role(labels, _user), do: labels