Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Lot's of dark mode improvements

Matt Roberts426191e946d1
diff --git a/public/assets/styles/variables.scss b/public/assets/styles/variables.scss
index 38b566e85..f11504fc2 100644
--- a/public/assets/styles/variables.scss
+++ b/public/assets/styles/variables.scss
@@ -74,3 +74,15 @@ $xl2-width: 1400px;
background-image: none !important;
pointer-events: none !important;
}
+
+@mixin dark-mode() {
+ body[data-theme="dark"] & {
+ @content;
+ }
+}
+
+@mixin light-mode() {
+ body[data-theme="light"] & {
+ @content;
+ }
+}
diff --git a/public/components/VoteCounter.scss b/public/components/VoteCounter.scss
index 2d531215c..b0f977b77 100644
--- a/public/components/VoteCounter.scss
+++ b/public/components/VoteCounter.scss
@@ -19,14 +19,30 @@
background-color: var(--colors-blue-50);
border: 2px solid var(--colors-blue-100);
+ @include dark-mode {
+ background-color: var(--colors-blue-900);
+ border-color: var(--colors-blue-800);
+ color: var(--colors-blue-300);
+ }
+
&:hover {
background-color: var(--colors-blue-100);
border-color: var(--colors-primary-base);
color: var(--colors-primary-base);
+ @include dark-mode {
+ background-color: var(--colors-blue-800);
+ border-color: var(--colors-blue-500);
+ color: var(--colors-blue-200);
+ }
+
.c-vote-counter__icon {
color: var(--colors-primary-base);
transform: translateY(-1px);
+
+ @include dark-mode {
+ color: var(--colors-blue-200);
+ }
}
}
@@ -38,8 +54,18 @@
color: var(--colors-primary-base);
border-color: var(--colors-primary-base);
+ @include dark-mode {
+ background-color: var(--colors-blue-800);
+ color: var(--colors-blue-200);
+ border-color: var(--colors-blue-500);
+ }
+
.c-vote-counter__icon {
color: var(--colors-primary-base);
+
+ @include dark-mode {
+ color: var(--colors-blue-200);
+ }
}
.c-vote-counter__count {
@@ -49,6 +75,11 @@
&:hover {
background-color: var(--colors-blue-200);
border-color: var(--colors-primary-base);
+
+ @include dark-mode {
+ background-color: var(--colors-blue-700);
+ border-color: var(--colors-blue-400);
+ }
}
}
@@ -85,6 +116,10 @@
color: var(--colors-primary-base);
transition: all 0.2s ease;
flex-shrink: 0;
+
+ @include dark-mode {
+ color: var(--colors-blue-300);
+ }
}
&__count {
diff --git a/public/components/common/Avatar.scss b/public/components/common/Avatar.scss
index a725df538..c00ef9682 100644
--- a/public/components/common/Avatar.scss
+++ b/public/components/common/Avatar.scss
@@ -5,5 +5,8 @@
vertical-align: middle;
display: inline-block;
border: 2px solid var(--colors-white);
+ @include dark-mode {
+ border: 2px solid var(--colors-gray-200);
+ }
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1);
}
diff --git a/public/components/common/form/CommentEditor.scss b/public/components/common/form/CommentEditor.scss
index ae33d3b62..3cb547d71 100644
--- a/public/components/common/form/CommentEditor.scss
+++ b/public/components/common/form/CommentEditor.scss
@@ -75,6 +75,10 @@
overflow: hidden;
background-color: var(--colors-white);
+ @include dark-mode {
+ background-color: var(--colors-gray-100);
+ }
+
&.m-error {
border-color: var(--colors-red-600);
}
diff --git a/public/pages/Home/Home.page.scss b/public/pages/Home/Home.page.scss
index c7b8d1ca1..74475f864 100644
--- a/public/pages/Home/Home.page.scss
+++ b/public/pages/Home/Home.page.scss
@@ -15,6 +15,12 @@
row-gap: 0;
}
+ @include dark-mode {
+ input {
+ background-color: var(--colors-gray-100);
+ }
+ }
+
.p-home {
&__welcome-col {
@include media("lg") {
@@ -59,6 +65,10 @@
color: var(--colors-gray-700);
text-align: left;
+ @include dark-mode {
+ background-color: var(--colors-gray-200);
+ }
+
&:hover {
box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
}
diff --git a/public/pages/Home/components/PostFilter.scss b/public/pages/Home/components/PostFilter.scss
index 6895e6a53..2ef6e4485 100644
--- a/public/pages/Home/components/PostFilter.scss
+++ b/public/pages/Home/components/PostFilter.scss
@@ -10,6 +10,21 @@
cursor: pointer;
transition: all 0.2s ease-in-out;
box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+ height: 40px;
+ color: var(--colors-gray-700);
+ font-weight: get("font.weight.semibold");
+ font-size: get("font.size.xs");
+ border: 1px solid var(--colors-gray-200);
+ text-transform: uppercase;
+ background-color: var(--colors-white);
+ padding-inline: spacing(3) spacing(2);
+ border-radius: sizing(2);
+
+ @include dark-mode {
+ background-color: var(--colors-gray-300);
+ color: var(--colors-gray-800);
+ border-color: var(--colors-gray-400);
+ }
&:hover {
background-color: var(--colors-white);
diff --git a/public/pages/Home/components/PostFilter.tsx b/public/pages/Home/components/PostFilter.tsx
index 96d818a35..e9567f384 100644
--- a/public/pages/Home/components/PostFilter.tsx
+++ b/public/pages/Home/components/PostFilter.tsx
@@ -151,7 +151,7 @@ export const PostFilter = (props: PostFilterProps) => {
<Dropdown
onToggled={() => setQuery("")}
renderHandle={
- <HStack className="c-post-filter-btn h-10 text-medium text-xs rounded-md uppercase border border-gray-200 text-gray-700 p-2 px-3 bg-white">
+ <HStack className="c-post-filter-btn">
<Icon sprite={HeroIconFilter} className="h-5 pr-1" />
{i18n._({ id: "home.filter.label", message: "Filter" })}
{filterCount > 0 && <div className="bg-gray-200 inline-block rounded-full px-2 py-1 w-min-4 text-2xs text-center">{filterCount}</div>}
diff --git a/public/pages/Home/components/PostsContainer.scss b/public/pages/Home/components/PostsContainer.scss
index f5a2e9536..7935ff2c0 100644
--- a/public/pages/Home/components/PostsContainer.scss
+++ b/public/pages/Home/components/PostsContainer.scss
@@ -44,6 +44,9 @@
&__post {
background-color: var(--colors-white);
+ @include dark-mode {
+ background-color: var(--colors-gray-200);
+ }
border-radius: get("border.radius.xlarge");
padding: spacing(6) spacing(7);
box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1);
diff --git a/public/pages/Home/components/PostsSort.tsx b/public/pages/Home/components/PostsSort.tsx
index c285b6e37..37d1b6520 100644
--- a/public/pages/Home/components/PostsSort.tsx
+++ b/public/pages/Home/components/PostsSort.tsx
@@ -1,11 +1,11 @@
import React from "react"
import { Dropdown } from "@fider/components"
-import { HStack } from "@fider/components/layout"
import { i18n } from "@lingui/core"
import IconSparkles from "@fider/assets/images/heroicons-sparkles-outline.svg"
import IconThumbsUp from "@fider/assets/images/heroicons-thumbsup.svg"
import IconChat from "@fider/assets/images/heroicons-chat-alt-2.svg"
import IconClock from "@fider/assets/images/heroicons-clock.svg"
+import { HStack } from "@fider/components/layout"
interface PostsSortProps {
value: string
@@ -23,12 +23,12 @@ export const PostsSort: React.FC<PostsSortProps> = ({ value = "trending", onChan
const selectedItem = options.find((x) => x.value === value) || options[0]
return (
- <HStack>
+ <div>
<Dropdown
renderHandle={
- <div className="c-post-sort-btn h-10 flex flex-items-center text-medium text-xs rounded-md uppercase border border-gray-200 text-gray-700 p-2 px-3 bg-white">
+ <HStack className="c-post-sort-btn">
{i18n._({ id: "home.postsort.label", message: "Sort by:" })} {selectedItem.label}
- </div>
+ </HStack>
}
>
{options.map((o) => (
@@ -37,6 +37,6 @@ export const PostsSort: React.FC<PostsSortProps> = ({ value = "trending", onChan
</Dropdown.ListItem>
))}
</Dropdown>
- </HStack>
+ </div>
)
}
diff --git a/public/pages/Home/components/ShareFeedback.scss b/public/pages/Home/components/ShareFeedback.scss
index 44936000a..3bc081735 100644
--- a/public/pages/Home/components/ShareFeedback.scss
+++ b/public/pages/Home/components/ShareFeedback.scss
@@ -2,12 +2,28 @@
.c-share-feedback {
background-color: var(--colors-gray-200);
+
+ @include dark-mode {
+ background-color: var(--colors-gray-100);
+ }
+
+ @include dark-mode {
+ input {
+ background-color: var(--colors-gray-100);
+ }
+ }
+
display: flex;
flex-direction: column;
height: 100%;
&__content {
background-color: var(--colors-white);
+
+ @include dark-mode {
+ background-color: var(--colors-gray-200);
+ }
+
padding: spacing(6);
border-radius: get("border.radius.large");
max-width: 720px;
diff --git a/public/pages/ShowPost/ShowPost.page.scss b/public/pages/ShowPost/ShowPost.page.scss
index 378342111..27fa618cf 100644
--- a/public/pages/ShowPost/ShowPost.page.scss
+++ b/public/pages/ShowPost/ShowPost.page.scss
@@ -9,6 +9,12 @@
flex-grow: 1;
}
+ @include dark-mode {
+ input {
+ background-color: var(--colors-gray-100);
+ }
+ }
+
.p-show-post {
&__main-col {
display: flex;
@@ -18,6 +24,9 @@
&__post-card {
background-color: var(--colors-white);
+ @include dark-mode {
+ background-color: var(--colors-gray-200);
+ }
border-radius: get("border.radius.xlarge");
padding: spacing(7);
box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1);
@@ -69,6 +78,20 @@
margin-bottom: spacing(2);
}
+ &__discussion-count {
+ width: 25px;
+ height: 25px;
+ margin-left: spacing(4);
+ border-radius: 9999px;
+ text-align: center;
+ background-color: var(--colors-blue-100);
+ color: var(--colors-blue-400);
+ @include dark-mode {
+ background-color: var(--colors-blue-500);
+ color: var(--colors-blue-800);
+ }
+ }
+
&__action-col {
display: flex;
flex-direction: column;
@@ -76,16 +99,35 @@
> * {
background-color: var(--colors-white);
+ @include dark-mode {
+ background-color: var(--colors-gray-200);
+ }
border-radius: get("border.radius.xlarge");
padding: spacing(6);
box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1);
}
+
+ &__follow-button--follow,
+ &__follow-button--following {
+ text-align: center;
+ color: var(--colors-gray-800);
+ background-color: var(--colors-white);
+ border: 1px solid var(--colors-gray-800);
+ width: 100%;
+ @include dark-mode {
+ background-color: var(--colors-gray-100);
+ border: 1px solid var(--colors-gray-400);
+ }
+ }
}
}
.c-comment-input-card {
flex-grow: 1;
background-color: var(--colors-white);
+ @include dark-mode {
+ background-color: var(--colors-gray-200);
+ }
border-radius: get("border.radius.xlarge");
padding: spacing(6);
box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1);
diff --git a/public/pages/ShowPost/ShowPost.page.tsx b/public/pages/ShowPost/ShowPost.page.tsx
index 46afc53bb..d389bcc0a 100644
--- a/public/pages/ShowPost/ShowPost.page.tsx
+++ b/public/pages/ShowPost/ShowPost.page.tsx
@@ -320,9 +320,7 @@ export default function ShowPostPage(props: ShowPostPageProps) {
<Trans id="label.discussion">Discussion</Trans>
</span>
</h2>
- <div style={{ width: "25px", height: "25px" }} className="text-blue-300 ml-4 rounded-full bg-blue-100 text-center ">
- {props.comments.length}
- </div>
+ <div className="p-show-post__discussion-count">{props.comments.length}</div>
</HStack>
{/* Comment Input at top */}
diff --git a/public/pages/ShowPost/components/ShowComment.scss b/public/pages/ShowPost/components/ShowComment.scss
index 0f199c493..dd8d6e946 100644
--- a/public/pages/ShowPost/components/ShowComment.scss
+++ b/public/pages/ShowPost/components/ShowComment.scss
@@ -4,6 +4,9 @@
&__card {
flex-grow: 1;
background-color: var(--colors-white);
+ @include dark-mode {
+ background-color: var(--colors-gray-200);
+ }
border-radius: get("border.radius.xlarge");
padding: spacing(6);
box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1);
diff --git a/public/pages/ShowPost/components/StayUpdatedCard.tsx b/public/pages/ShowPost/components/StayUpdatedCard.tsx
index d0bc8e147..a0619f052 100644
--- a/public/pages/ShowPost/components/StayUpdatedCard.tsx
+++ b/public/pages/ShowPost/components/StayUpdatedCard.tsx
@@ -31,14 +31,14 @@ export const StayUpdatedCard = (props: StayUpdatedCardProps) => {
}
const button = subscribed ? (
- <Button className="w-full text-gray-800 bg-white border border-gray-800 no-focus" onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>
+ <Button className="p-show-post__action-col__follow-button--following no-focus" onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>
<Icon sprite={IconCheck} />{" "}
<span>
<Trans id="label.following">Following</Trans>
</span>
</Button>
) : (
- <Button className="w-full text-blue-600 bg-white border border-blue-600 no-focus" onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>
+ <Button className="p-show-post__action-col__follow-button--follow no-focus" onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>
<Icon sprite={IconPlus} />
<span>
<Trans id="label.follow">Follow</Trans>
diff --git a/public/pages/ShowPost/components/VotesPanel.scss b/public/pages/ShowPost/components/VotesPanel.scss
index 786bfbc51..e9aec1624 100644
--- a/public/pages/ShowPost/components/VotesPanel.scss
+++ b/public/pages/ShowPost/components/VotesPanel.scss
@@ -46,6 +46,12 @@
justify-content: center;
flex-shrink: 0;
+ @include dark-mode {
+ border: 2px dashed var(--colors-gray-600);
+ background-color: var(--colors-gray-200);
+ color: var(--colors-gray-600);
+ }
+
svg {
width: 20px;
height: 20px;