Open platform to collect and prioritize feedback
Follow button changes
Matt Roberts3dc728d14edc
diff --git a/public/assets/images/heroicons-plus.svg b/public/assets/images/heroicons-plus.svgnew file mode 100644index 000000000..351702a14--- /dev/null+++ b/public/assets/images/heroicons-plus.svg@@ -0,0 +1,4 @@+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">+ <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />+</svg>+diff --git a/public/assets/styles/utility/outline.scss b/public/assets/styles/utility/outline.scssindex 07541e806..6ffb6693d 100644--- a/public/assets/styles/utility/outline.scss+++ b/public/assets/styles/utility/outline.scss@@ -1,6 +1,8 @@*:focus {outline: 0;- box-shadow: rgb(255, 255, 255) 0px 0px 0px 0px, get("colors.primary.light") 0px 0px 0px 1px, rgba(0, 0, 0, 0) 0px 0px 0px 0px !important;- border-color: get("colors.primary.light") !important;+ &:not(.no-focus) {+ border-color: get("colors.primary.light") !important;+ box-shadow: rgb(255, 255, 255) 0px 0px 0px 0px, get("colors.primary.light") 0px 0px 0px 1px, rgba(0, 0, 0, 0) 0px 0px 0px 0px !important;+ }transition: all 0.3s ease;}diff --git a/public/components/common/Button.scss b/public/components/common/Button.scssindex 58f8b99ee..b11214249 100644--- a/public/components/common/Button.scss+++ b/public/components/common/Button.scss@@ -30,16 +30,6 @@}}- &--quaternary {- // color: get("colors.gray.900");- background-color: transparent;- border: 1px solid get("colors.primary.base");-- &:hover {- text-decoration: underline;- }- }-&--secondary {color: get("colors.gray.900");background-color: get("colors.gray.50");diff --git a/public/components/common/Button.tsx b/public/components/common/Button.tsxindex 208aa5936..ca6623502 100644--- a/public/components/common/Button.tsx+++ b/public/components/common/Button.tsx@@ -10,7 +10,7 @@ interface ButtonProps {rel?: "nofollow"target?: "_self" | "_blank" | "_parent" | "_top"type?: "button" | "submit"- variant?: "primary" | "danger" | "secondary" | "tertiary" | "quaternary"+ variant?: "primary" | "danger" | "secondary" | "tertiary"size?: "small" | "default" | "large"onClick?: (event: ButtonClickEvent) => Promise<any> | void}@@ -42,7 +42,7 @@ export const Button: React.FC<ButtonProps> = (props) => {"c-button--loading": clicked,"c-button--disabled": clicked || props.disabled,[props.className || ""]: props.className,- "shadow-sm": props.variant !== "tertiary",+ "shadow-sm": props.variant == "primary" || props.variant == "secondary",})let buttonContent: JSX.Elementdiff --git a/public/pages/ShowPost/components/DiscussionPanel.tsx b/public/pages/ShowPost/components/DiscussionPanel.tsxindex c4ac3ddd9..279881746 100644--- a/public/pages/ShowPost/components/DiscussionPanel.tsx+++ b/public/pages/ShowPost/components/DiscussionPanel.tsx@@ -2,8 +2,6 @@ import React from "react"import { CurrentUser, Comment, Post } from "@fider/models"import { ShowComment } from "./ShowComment"import { CommentInput } from "./CommentInput"-import PostIllustration from "@fider/assets/images/undraw-post.svg"-import { Icon } from "@fider/components"import { VStack } from "@fider/components/layout"import { Trans } from "@lingui/macro"@@ -27,14 +25,6 @@ export const DiscussionPanel = (props: DiscussionPanelProps) => {))}<CommentInput post={props.post} /></VStack>- {props.comments.length === 0 && (- <div className="text-center mt-4">- <Icon sprite={PostIllustration} height="120" />- <p className="text-xs">- <Trans id="showpost.discussionpanel.emptymessage">No one has commented yet.</Trans>- </p>- </div>- )}</VStack></>)diff --git a/public/pages/ShowPost/components/FollowButton.tsx b/public/pages/ShowPost/components/FollowButton.tsxindex 2cad5a67b..ecb6c6ebf 100644--- a/public/pages/ShowPost/components/FollowButton.tsx+++ b/public/pages/ShowPost/components/FollowButton.tsx@@ -2,8 +2,8 @@ import React, { useState } from "react"import { Button, Icon } from "@fider/components"import { actions } from "@fider/services"import { useFider } from "@fider/hooks"-import IconVolumeOn from "@fider/assets/images/heroicons-volume-on.svg"-import IconVolumeOff from "@fider/assets/images/heroicons-volume-off.svg"+import IconPlus from "@fider/assets/images/heroicons-plus.svg"+import IconCheck from "@fider/assets/images/heroicons-check.svg"import { VStack } from "@fider/components/layout"import { Trans } from "@lingui/macro"import { Post } from "@fider/models"@@ -31,15 +31,15 @@ export const FollowButton = (props: NotificationsPanelProps) => {}const button = subscribed ? (- <Button variant="quaternary" className="w-full text-primary-base" onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>- <Icon sprite={IconVolumeOff} />{" "}+ <Button className="w-full text-gray-800 bg-white border border-gray-800 no-focus" onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>+ <Icon sprite={IconCheck} />{" "}<span>- <Trans id="label.unfollow">Unfollow</Trans>+ <Trans id="label.following">Following</Trans></span></Button>) : (- <Button variant="quaternary" className="w-full text-primary-base" onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>- <Icon sprite={IconVolumeOn} />+ <Button className="w-full text-blue-500 bg-white border border-blue-500 no-focus" onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>+ <Icon sprite={IconPlus} /><span><Trans id="label.follow">Follow</Trans></span>