From fa99d9aaedcaf421817cef128243409502c1ab56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bel=C3=A9n=20Albeza?= Date: Tue, 9 Jan 2024 14:24:02 +0100 Subject: [PATCH] :bug: Fix buttons appearance in the feedback form --- frontend/resources/styles/common/refactor/basic-rules.scss | 3 +++ frontend/src/app/main/ui/settings/feedback.cljs | 5 +++-- frontend/src/app/main/ui/settings/feedback.scss | 4 ++++ frontend/src/app/main/ui/settings/profile.scss | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/frontend/resources/styles/common/refactor/basic-rules.scss b/frontend/resources/styles/common/refactor/basic-rules.scss index 5b79ec81d..d8b30487f 100644 --- a/frontend/resources/styles/common/refactor/basic-rules.scss +++ b/frontend/resources/styles/common/refactor/basic-rules.scss @@ -38,10 +38,12 @@ @include buttonStyle; @include flexCenter; @include focusPrimary; + @include tabTitleTipography; background-color: var(--button-primary-background-color-rest); border: $s-1 solid var(--button-primary-border-color-rest); color: var(--button-primary-foreground-color-rest); border-radius: $br-8; + min-height: $s-32; svg, span svg { stroke: var(--button-primary-foreground-color-rest); @@ -54,6 +56,7 @@ span svg { stroke: var(--button-primary-foreground-color-hover); } + text-decoration: none; } &:active { background-color: var(--button-primary-background-color-active); diff --git a/frontend/src/app/main/ui/settings/feedback.cljs b/frontend/src/app/main/ui/settings/feedback.cljs index 82daf3c5b..31d9d374c 100644 --- a/frontend/src/app/main/ui/settings/feedback.cljs +++ b/frontend/src/app/main/ui/settings/feedback.cljs @@ -80,6 +80,7 @@ [:> fm/submit-button* {:label (if @loading (tr "labels.sending") (tr "labels.send")) + :class (stl/css :feedback-button-link) :disabled @loading}] [:hr] @@ -88,7 +89,7 @@ [:p {:class (stl/css :field-text)} (tr "feedback.discourse-subtitle1")] [:a - {:class (stl/css :btn-secondary :btn-large) + {:class (stl/css :feedback-button-link) :href "https://community.penpot.app" :target "_blank"} (tr "feedback.discourse-go-to")] @@ -98,7 +99,7 @@ [:p {:class (stl/css :field-text)} (tr "feedback.twitter-subtitle1")] [:a - {:class (stl/css :btn-secondary :btn-large) + {:class (stl/css :feedback-button-link) :href "https://twitter.com/penpotapp" :target "_blank"} (tr "feedback.twitter-go-to")]])) diff --git a/frontend/src/app/main/ui/settings/feedback.scss b/frontend/src/app/main/ui/settings/feedback.scss index dec2597db..f2638a7f5 100644 --- a/frontend/src/app/main/ui/settings/feedback.scss +++ b/frontend/src/app/main/ui/settings/feedback.scss @@ -23,3 +23,7 @@ } } } + +.feedback-button-link { + @extend .button-primary; +} diff --git a/frontend/src/app/main/ui/settings/profile.scss b/frontend/src/app/main/ui/settings/profile.scss index e33ef5a3a..59e22acbb 100644 --- a/frontend/src/app/main/ui/settings/profile.scss +++ b/frontend/src/app/main/ui/settings/profile.scss @@ -11,7 +11,7 @@ width: 100%; justify-content: center; align-items: center; - a { + a:not(.button-primary) { color: $df-secondary; } } @@ -211,7 +211,7 @@ text-transform: uppercase; } - a { + a:not(.button-primary) { &:hover { text-decoration: underline; }