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

fix: google font import and allignment of button #391

Merged
merged 10 commits into from
Oct 10, 2024
Merged

fix: google font import and allignment of button #391

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a20b29b
fixed google font import and allignment of button
catosaurusrex2003 Sep 15, 2024
85275b8
Fixed the navbar dropdown missalignment.
catosaurusrex2003 Sep 16, 2024
f2bba7a
fixed rotation of + button
catosaurusrex2003 Sep 16, 2024
5be1d09
pushing unformatted code back again to reduce the number of lines cha…
catosaurusrex2003 Sep 16, 2024
4ca4d38
Merge branch master into this one.
catosaurusrex2003 Sep 27, 2024
3e3aa79
Merge branch 'master' of https://github.com/catosaurusrex2003/confere…
catosaurusrex2003 Oct 4, 2024
a14c2b6
navdrop width increase 140 -> 150
catosaurusrex2003 Oct 7, 2024
fc652fc
Merge branch 'master' into fix/google-font-import-and-button-allignment
asyncapi-bot Oct 8, 2024
c162d31
fixing more UI bugs
catosaurusrex2003 Oct 8, 2024
5c36252
mobile responsive UI bug fixes
catosaurusrex2003 Oct 9, 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
2 changes: 1 addition & 1 deletion components/Buttons/button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function Button({className, children, overlay, onClick, type, disabled}) {
disabled={disabled}
type={type}
onClick={onClick}
className={`${overlay ? '' : 'gradient-bg'} text-white h-[54px] rounded-md p-[8px] ${className}`}
className={`${overlay ? '' : 'gradient-bg'} flex items-center justify-center text-white h-[54px] rounded-md p-[8px] ${className}`}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is causing an alignment issue in the button(check the ticket button section)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i am not able to locate any alignment issue.
whats the browser u using? and if possible can you attach the screenshot.

>{children}</button>
);
}
Expand Down
14 changes: 4 additions & 10 deletions components/Navbar/navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function Navbar() {
if (!isSubMenuHovered) {
setShow(null);
}
}, 300);
}, 300);
};

const handleSubMenuEnter = () => {
Expand Down Expand Up @@ -124,15 +124,9 @@ function Navbar() {
>
{link.subMenu.map((subL) => (
<Link href={subL.ref} key={subL.title}>
{link.subMenu.length === 1 ? (
<div className='h-[32px] flex items-center justify-center text-[16px] hover:scale-95 hover:translate-x-1 transition-all'>
{subL.title}
</div>
) : (
<div className='h-[32px] text-[16px] hover:scale-95 hover:translate-x-1 transition-all'>
{subL.title}
</div>
)}
<div className={`flex items-center ${link.subMenu.length === 1 ? "justify-center" : "justify-start"} min-h-[32px] text-[16px] hover:scale-95 hover:translate-x-1 transition-all`}>
{subL.title}
</div>
</Link>
))}
</div>
Expand Down
6 changes: 3 additions & 3 deletions components/Speaker/guideline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function Guidelines({talkDeadLine,virtual,name,cfp}) {
}}>
<div className={`flex justify-between ${show === i ? "text-white" : "text-gray-400"} hover:text-white`}>
<h2 className={`text-xl w-[90%]`}>{faq.q}</h2>
<button className='pointer border h-[30px] border-[#ffff] mr-[20px] rounded-3xl p-1'><Plus className={`w-[20px] transition-transform duration-700 ${show === i ? 'rotate-12' : 'rotate-90'}`} /></button>
<button className='pointer border h-[30px] border-[#ffff] mr-[20px] rounded-3xl p-1'><Plus className={`w-[20px] transition-transform duration-700 ${show === i ? 'rotate-45' : 'rotate-90'}`} /></button>
</div>


Expand All @@ -78,7 +78,7 @@ function Guidelines({talkDeadLine,virtual,name,cfp}) {
}}>
<div className={`flex justify-between ${show === i ? "text-white" : "text-gray-400"} hover:text-white`}>
<h2 className={`text-xl w-[90%]`}>{faq.q}</h2>
<button className='pointer border h-[30px] border-[#ffff] mr-[20px] rounded-3xl p-1'><Plus className={`w-[20px] transition-transform duration-700 ${show === i ? 'rotate-12' : 'rotate-90'}`} /></button>
<button className='pointer border h-[30px] border-[#ffff] mr-[20px] rounded-3xl p-1'><Plus className={`w-[20px] transition-transform duration-700 ${show === i ? 'rotate-45' : 'rotate-90'}`} /></button>
</div>
{
virtual?<p className={`mt-8 text-md text-white ${show === i ? "block" : "hidden"}`}>{faq.av}</p>:
Expand All @@ -102,7 +102,7 @@ function Guidelines({talkDeadLine,virtual,name,cfp}) {
}}>
<div className={`flex justify-between ${show === i ? "text-white" : "text-gray-400"} hover:text-white`}>
<h2 className={`text-xl w-[90%]`}>{faq.q}</h2>
<button className='pointer border h-[30px] border-[#ffff] mr-[20px] rounded-3xl p-1'><Plus className={`w-[20px] transition-transform duration-700 ${show === i ? 'rotate-12' : 'rotate-90'}`} /></button>
<button className='pointer border h-[30px] border-[#ffff] mr-[20px] rounded-3xl p-1'><Plus className={`w-[20px] transition-transform duration-700 ${show === i ? 'rotate-45' : 'rotate-90'}`} /></button>
</div>
{

Expand Down
4 changes: 1 addition & 3 deletions styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
@import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@300;400;500;600;700&family=Inter:wght@300;400&family=Work+Sans:wght@300;400;500;600;700&display=swap');
@tailwind base;
@tailwind components;
@tailwind utilities;
@import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@300;400;500;600;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400&family=Work+Sans:wght@300;400;500;600;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Work+Sans:wght@700&display=swap');

:root{
--bg-color: white;
Expand Down
Loading