Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some minor fixes #107

Merged
merged 3 commits into from
Jul 5, 2024
Merged

Some minor fixes #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50084c8
Some minor fixes
gsthanhnguyen Jul 4, 2024
677e7ec
solve conflicts
gsthanhnguyen Jul 5, 2024
db264c4
solve conflicts
gsthanhnguyen Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/Home/Home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
font-size: 1.3rem;
text-align: center;
margin-top: 0;
padding-top: 25px;
}
4 changes: 2 additions & 2 deletions src/components/Home/Home.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ const Home = () => {
<div className="app-intro__container">
<h1>Bridging gaps, healing minds</h1>
<p className="app-intro__description">
❤️‍🩹Welcome to a gentle space for your heart and mind. Share your story
Welcome to a gentle space for your heart and mind. Share your story
with a caring listener or enjoy a soothing meditation made just for
you. Here, healing unfolds at your own pace.❤️‍🩹
you. Here, healing unfolds at your own pace ❤️‍🩹
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/NewsFeed/Posts/NormalPost.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ const NormalPost = ({ post }) => {
</GridItem>

<GridItem w="100%" h="100%" onClick={handleFlip}>
<Text mt={3} fontSize={"xl"}>
<Text mt={3} fontSize={"xl"} marginTop={7}>
From: {username}
</Text>
{content.length > preview.length ? (
Expand Down
1 change: 1 addition & 0 deletions src/components/NewsFeed/Prompts/Prompt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Icon } from "@chakra-ui/react";
import axios from "axios";
import { PromptResponsesContext } from "../../../context/PromptResponseContext";
import PromptModal from "./PromptModal";
import { StyledButton } from '../../../styles/components/StyledComponents';

const Prompt = () => {
const { dispatch } = useContext(PromptResponsesContext);
Expand Down
4 changes: 2 additions & 2 deletions src/pages/NewsFeed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ const NewsFeed = () => {
<Tabs align="center" isFitted mt={5}>
<TabList>
<Tab p={0} h={10}>
<Text fontSize={20}>Catch a Postcard flying in the Sky</Text>
<Text fontSize={20}><b>Catch a Postcard flying in the Sky</b></Text>
</Tab>
<Tab p={0} h={10}>
<Text fontSize={20}>The Waterfall of Messages</Text>
<Text fontSize={20}><b>The Waterfall of Messages</b></Text>
</Tab>
</TabList>

Expand Down
Loading