From 3a132119a0fce77a0af88e11c1b37b6a36978014 Mon Sep 17 00:00:00 2001 From: Daniel Wilkowski Date: Fri, 6 Dec 2024 16:35:52 +0100 Subject: [PATCH] Style primary button in forum --- .../feature/lookAndFeel/lookAndFeel.scss | 30 +++++++++++++++++++ resources/js/components/forum/form.vue | 2 +- resources/sass/core/_dark_topic.scss | 11 ------- resources/views/forum/partials/topics.twig | 4 +-- resources/views/forum/topic.twig | 4 +-- 5 files changed, 35 insertions(+), 16 deletions(-) diff --git a/resources/feature/lookAndFeel/lookAndFeel.scss b/resources/feature/lookAndFeel/lookAndFeel.scss index bf0549584d..654b6131f3 100644 --- a/resources/feature/lookAndFeel/lookAndFeel.scss +++ b/resources/feature/lookAndFeel/lookAndFeel.scss @@ -155,3 +155,33 @@ $forum-aside-radius: 8px; border-radius: 4px; } } + +.look-and-feel-modern { + .neon-primary-button { + border: none; + + @include theme.light { + color: style.$white; + background: style.$green-500; + &:hover {background: #007e2b;} + &:active {background: #006522;} + &:disabled {background: rgba(style.$green-500, 0.3);} + } + + @include theme.dark { + color: style.$neutral-400; + background: style.$green-500; + &:hover {background: #00c041;} + &:active {background: #00e34d;} + &:disabled {background: rgba(style.$green-500, 0.3);} + } + } +} + +.look-and-feel-legacy { + .neon-primary-button { + @include theme.dark { + color: #1a1a1a; + } + } +} diff --git a/resources/js/components/forum/form.vue b/resources/js/components/forum/form.vue index fbd44dc7cc..80ca48fa93 100644 --- a/resources/js/components/forum/form.vue +++ b/resources/js/components/forum/form.vue @@ -158,7 +158,7 @@
- + diff --git a/resources/sass/core/_dark_topic.scss b/resources/sass/core/_dark_topic.scss index 05da4c7b82..ee9ccabf0e 100644 --- a/resources/sass/core/_dark_topic.scss +++ b/resources/sass/core/_dark_topic.scss @@ -287,12 +287,6 @@ body.theme-dark { } form { - .btn.btn-primary { - color: #1d1d1d; - background-color: #789b17; - border: none; - } - .btn.btn-danger { color: #1d1d1d; background-color: #9f3835; @@ -461,11 +455,6 @@ body.theme-dark { } } - .btn.btn-primary { - background-color: #789b17; - color: #1a1a1a; - } - .btn.btn-secondary { color: #dedede; background: #1a1a1a; diff --git a/resources/views/forum/partials/topics.twig b/resources/views/forum/partials/topics.twig index 1adf6085a9..78908967bd 100644 --- a/resources/views/forum/partials/topics.twig +++ b/resources/views/forum/partials/topics.twig @@ -7,7 +7,7 @@ {% if forum is defined and not forum.is_locked %} - + Nowy wątek {% endif %} @@ -42,7 +42,7 @@
{% if topics.count() > 10 and forum is defined and not forum.is_locked %} - + Nowy wątek
diff --git a/resources/views/forum/topic.twig b/resources/views/forum/topic.twig index 306eb620c1..14d6a28d02 100644 --- a/resources/views/forum/topic.twig +++ b/resources/views/forum/topic.twig @@ -34,7 +34,7 @@
{% if is_writeable %} {% endif %}
@@ -120,7 +120,7 @@ {% if is_writeable %}
- Nowy wątek + Nowy wątek
{% endif %}