3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-07 21:22:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3988 from penpot/ladybenko-fix-your-account-ui

Browse source 
🐛 Fix "Your Account/Give Feedback" UI
This commit is contained in:
Eva Marco 2024-01-10 10:20:22 +01:00 • committed by GitHub
commit 4a991ef3f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/resources/styles/common/refactor/basic-rules.scss
View file

@ -38,10 +38,12 @@
@include buttonStyle; @include buttonStyle;
@include flexCenter; @include flexCenter;
@include focusPrimary; @include focusPrimary;
@include tabTitleTipography;
background-color: var(--button-primary-background-color-rest); background-color: var(--button-primary-background-color-rest);
border: $s-1 solid var(--button-primary-border-color-rest); border: $s-1 solid var(--button-primary-border-color-rest);
color: var(--button-primary-foreground-color-rest); color: var(--button-primary-foreground-color-rest);
border-radius: $br-8; border-radius: $br-8;
min-height: $s-32;
svg, svg,
span svg { span svg {
stroke: var(--button-primary-foreground-color-rest); stroke: var(--button-primary-foreground-color-rest);
@ -54,6 +56,7 @@
span svg { span svg {
stroke: var(--button-primary-foreground-color-hover); stroke: var(--button-primary-foreground-color-hover);
} }
text-decoration: none;
} }
&:active { &:active {
background-color: var(--button-primary-background-color-active); background-color: var(--button-primary-background-color-active);

5
frontend/src/app/main/ui/settings/feedback.cljs
View file

@ -80,6 +80,7 @@
[:> fm/submit-button* [:> fm/submit-button*
{:label (if @loading (tr "labels.sending") (tr "labels.send")) {:label (if @loading (tr "labels.sending") (tr "labels.send"))
:class (stl/css :feedback-button-link)
:disabled @loading}] :disabled @loading}]
[:hr] [:hr]
@ -88,7 +89,7 @@
[:p {:class (stl/css :field-text)} (tr "feedback.discourse-subtitle1")] [:p {:class (stl/css :field-text)} (tr "feedback.discourse-subtitle1")]
[:a [:a
{:class (stl/css :btn-secondary :btn-large) {:class (stl/css :feedback-button-link)
:href "https://community.penpot.app" :href "https://community.penpot.app"
:target "_blank"} :target "_blank"}
(tr "feedback.discourse-go-to")] (tr "feedback.discourse-go-to")]
@ -98,7 +99,7 @@
[:p {:class (stl/css :field-text)} (tr "feedback.twitter-subtitle1")] [:p {:class (stl/css :field-text)} (tr "feedback.twitter-subtitle1")]
[:a [:a
{:class (stl/css :btn-secondary :btn-large) {:class (stl/css :feedback-button-link)
:href "https://twitter.com/penpotapp" :href "https://twitter.com/penpotapp"
:target "_blank"} :target "_blank"}
(tr "feedback.twitter-go-to")]])) (tr "feedback.twitter-go-to")]]))

4
frontend/src/app/main/ui/settings/feedback.scss
View file

@ -23,3 +23,7 @@
} }
} }
} }
.feedback-button-link {
@extend .button-primary;
}

4
frontend/src/app/main/ui/settings/profile.scss
View file

@ -11,7 +11,7 @@
width: 100%; width: 100%;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
a { a:not(.button-primary) {
color: $df-secondary; color: $df-secondary;
} }
} }
@ -211,7 +211,7 @@
text-transform: uppercase; text-transform: uppercase;
} }
a { a:not(.button-primary) {
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
} }

11
frontend/src/app/main/ui/settings/sidebar.scss
View file

@ -49,6 +49,7 @@
display: flex; display: flex;
flex-shrink: 0; flex-shrink: 0;
padding: $s-8 $s-8 $s-8 $s-24; padding: $s-8 $s-8 $s-8 $s-24;
color: $df-secondary;
a { a {
font-weight: $fw400; font-weight: $fw400;
@ -59,14 +60,13 @@
} }
svg { svg {
fill: $db-secondary; fill: currentColor;
margin-right: $s-8; margin-right: $s-8;
height: $s-12; height: $s-12;
width: $s-12; width: $s-12;
} }
span { span {
color: $df-secondary;
font-size: $fs-14; font-size: $fs-14;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -119,12 +119,11 @@
&.current { &.current {
background-color: $db-cuaternary; background-color: $db-cuaternary;
color: $da-primary;
a { a {
font-weight: $fw400; font-weight: $fw400;
color: $da-primary; color: currentColor;
}
span {
color: $da-primary;
} }
&::before { &::before {