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

Jump to bottom

closes issue #97 #106

Merged
merged 7 commits into from
May 17, 2024
Merged

closes issue #97 #106

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9f20b66
closes issue #97
AMISH-KHAN May 13, 2024
9c490dd
resolved merge conflicts
AMISH-KHAN May 14, 2024
d9db795
Merge branch 'main' of github.com:AMISH-KHAN/Draw-it-out into issue_#97
AMISH-KHAN May 14, 2024
8b00905
Merge branch 'main' of github.com:AMISH-KHAN/Draw-it-out into issue_#97
AMISH-KHAN May 16, 2024
4776612
made required changes
AMISH-KHAN May 16, 2024
046a1e4
add some minor change
AMISH-KHAN May 16, 2024
9f1339b
conflict resilved
AMISH-KHAN May 17, 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
11 changes: 7 additions & 4 deletions src/components/Menu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,18 @@ const Menu = ({
}`}
onClick={toggleIsDrawing}
title="Draw"
/>
/>
<span>Pencil</span>
</button>
<button>
<FaFeatherPointed
className={`text-[2rem] md:text-[3rem] p-[0.5rem] md:p-[0.8rem] shadow-vsm rounded-[0.5rem] cursor-pointer hover:bg-[#B7BABF] ${
className={`text-[2rem] md:text-[3rem] p-[0.5rem] md:p-[0.8rem] shadow-vsm mx-auto rounded-[0.5rem] cursor-pointer hover:bg-[#B7BABF] ${
pencilWidth ? "bg-gray-400" : ""
}`}
onClick={() => setPencilWidth(!pencilWidth)}
title="Brush Thickness"
/>
/>
<span>Thickness</span>
</button>
{pencilWidth && (
<input
Expand All @@ -69,7 +71,7 @@ const Menu = ({
className="cursor-pointer"
/>
)}
<div className="p-[1rem] px-[1.5rem] rounded-[0.5rem] relative shadow-vsm hover:bg-[#B7BABF] cursor-pointer">
<div className="py-[1rem] px-[1.5rem] rounded-[0.5rem] w-12 h-12 relative shadow-vsm hover:bg-[#B7BABF] cursor-pointer">
<input
type="color"
name="color"
Expand All @@ -78,6 +80,7 @@ const Menu = ({
onChange={(e) => setColor(e.target.value)}
className={`bg-[#CBCCCF] p-[0.5rem] shadow-vsm rounded-[0.5rem] cursor-pointer outline-none hover:bg-[#B7BABF] flex-[0.5] w-full h-full z-[5] absolute top-0 left-0`}
/>
<span className="absolute top-12 left-[0.4rem]">color</span>
</div>
<div className="relative">
<button
Expand Down