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

Final Adjustment #46

Merged
merged 5 commits into from
Oct 8, 2023
Merged

Final Adjustment #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a085dd1
Removed mr-14 and replaced flex-grow with w-full
Satoshi-Sh Oct 8, 2023
b6e7bec
Input box overflowed from the parent div. Replaced flex-grow with w-f…
Satoshi-Sh Oct 8, 2023
03821d6
Replaced flex-grow with w-full, and adjust other elements
Satoshi-Sh Oct 8, 2023
129963c
Alined error message to the center.
Satoshi-Sh Oct 8, 2023
541ea7a
Added pb to the bottom of form to make the button visible for shorter…
Satoshi-Sh Oct 8, 2023
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
22 changes: 10 additions & 12 deletions src/views/AddItem.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export function AddItem({ listId, data }) {
)}
</div>
</div>
<form onSubmit={handleSubmit}>
<form onSubmit={handleSubmit} className="pb-20">
<div className="flex flex-col justify-center items-center">
<label htmlFor="item" className="px-3 mt-2 font-semibold">
Item:
Expand All @@ -131,7 +131,7 @@ export function AddItem({ listId, data }) {
className="text-gray-500 mr-2 sm:mr-4"
/>
<input
className="pl-2 flex-grow border-none bg-transparent placeholder-light dark:placeholder-dark"
className="pl-2 w-full border-none bg-transparent placeholder-light dark:placeholder-dark"
type="text"
id="item"
name="item"
Expand All @@ -143,8 +143,8 @@ export function AddItem({ listId, data }) {
/>
</div>
</div>
<p className="mt-3 pt-10">How soon will you buy this item?</p>
<div className="flex flex-col sm:flex-row sm:gap-6 justify-center mb-10 sm:py-44">
<p className="mt-3 pt-5 sm:pt-20">How soon will you buy this item?</p>
<div className="flex flex-col sm:flex-row sm:gap-6 justify-center mb-10 sm:py-10">
<UrgencyTag
color={'bg-light-blue'}
value={'soon'}
Expand Down Expand Up @@ -173,14 +173,12 @@ export function AddItem({ listId, data }) {
order={'3'}
/>
</div>
<div className="pb-10">
<Button
text="ADD ITEM"
withIcon={true}
onClick={handleSubmit}
className="mb-5 sm:m-16"
/>
</div>
<Button
text="ADD ITEM"
withIcon={true}
onClick={handleSubmit}
className="mb-5 sm:m-16"
/>
</form>
</div>
);
Expand Down
6 changes: 3 additions & 3 deletions src/views/Home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function Home({ createToken, setListToken }) {
<input
type="text"
id="tokenInput"
className="flex-grow border-none bg-transparent dark:text-black text-center text-2xl mr-14 dark:placeholder:text-green"
className="w-full border-none bg-transparent dark:text-black text-center text-2xl dark:placeholder:text-green"
value={tokenInput}
onChange={handleTokenInputChange}
placeholder="my list token"
Expand Down Expand Up @@ -104,8 +104,8 @@ export function Home({ createToken, setListToken }) {

return (
<div className="Home">
<div className="mt-48 flex items-center justify-center">
<div className="flex flex-col items-center gap-10">
<div className="mt-24 flex-col items-center justify-center">
<div className="flex flex-col h-10 items-center gap-10">
<div>
{existingListMessage && (
<RoughNotation
Expand Down
2 changes: 1 addition & 1 deletion src/views/List.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export function List({ data, listId }) {
className="text-gray-500 mr-2 sm:mr-4"
/>
<input
className="flex-grow border-none bg-transparent placeholder-light dark:placeholder-dark"
className="w-full border-none bg-transparent placeholder-light dark:placeholder-dark"
type="text"
name="filter"
id="filter"
Expand Down