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

Bug/shashank kavli/158# #159

Closed
wants to merge 5 commits into from
Closed

Bug/shashank kavli/158# #159

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
72734e7
[UX] Theme Toggle icon Fix
shashank-kavli Sep 26, 2023
f242a09
[UX] Theme Toggle icon Fix
shashank-kavli Sep 26, 2023
d49ea2b
[UI] Theme Toggle
shashank-kavli Sep 28, 2023
4707f59
[UI] Theme Toggle
shashank-kavli Sep 28, 2023
7d041f8
Merge branch 'master' into bug/shashank-kavli/158#
shashank-kavli Sep 28, 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
13 changes: 6 additions & 7 deletions site/src/components/Navigation/Navigation.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ export const Header = styled.header`
max-width: 400px;
height: auto;
}
.container{
display: flex;
align-items: center;
}
.themeToggle {
margin: auto .5rem;
padding: auto .5rem;
Expand Down Expand Up @@ -177,9 +181,7 @@ export const Header = styled.header`
padding: 10px 0;
display: flex;
justify-content: center;
align-items:center;
border-radius:20px;
border: 1px solid gray
align-items:center
}
.btn-container{
display: none;
Expand All @@ -201,9 +203,6 @@ export const Header = styled.header`
box-shadow: rgba(0, 179, 159, 0.2) 0 20px 20px -2px;
padding: 20px 0px;
}
.mode-btn{
width:95%;
}
.action-btns{
display: flex;
width: 95%;
Expand All @@ -213,4 +212,4 @@ export const Header = styled.header`
}
`

export default Header;
export default Header;
31 changes: 15 additions & 16 deletions site/src/components/Navigation/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,24 @@ function Navigation({theme, toggleTheme, showSignUpButton}) {
<Header>
<nav className={scroll ? "scrolled" : ""}>
<img className="logo" src={Logo} alt="Meshery Logo" />
<div className="btn-container">
<div className="container">
<Toggle theme={theme} toggleTheme={toggleTheme} />
{showSignUpButton && <a href="#signup-form" className="signup-btn" role="button">Sign Up</a>}
{/* <a href="https://playground.meshery.io" className="login-btn" role="button">Login</a> */}
</div>
<div className="dropdown_btn" onClick={handleNavOpen}>
{openNav ?
(<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="hamburger-icon">
<path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" />
</svg>)
: (<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="hamburger-icon" >
<path strokeLinecap="round" strokeLinejoin="round" d="M3.75 9h16.5m-16.5 6.75h16.5" />
</svg>)}
<div className="btn-container">
{showSignUpButton && <a href="#signup-form" className="signup-btn" role="button">Sign Up</a>}
{/* <a href="https://playground.meshery.io" className="login-btn" role="button">Login</a> */}
</div>
<div className="dropdown_btn" onClick={handleNavOpen}>
{openNav ?
(<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="hamburger-icon">
<path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" />
</svg>)
: (<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="hamburger-icon" >
<path strokeLinecap="round" strokeLinejoin="round" d="M3.75 9h16.5m-16.5 6.75h16.5" />
</svg>)}
</div>
</div>
</nav>
<div className={openNav ? "dropdown_menu_opened" : "dropdown_menu_closed"}>
<div className="mode-btn">
<Toggle theme={theme} toggleTheme={toggleTheme} />
</div>
<div className="action-btns">
<a href="#signup-form" className="signup-btn" role="button">Sign Up</a>
{/* <a href="https://demo.meshery.io" className="login-btn" role="button">Login</a> */}
Expand All @@ -55,4 +54,4 @@ function Navigation({theme, toggleTheme, showSignUpButton}) {
)
}

export default Navigation
export default Navigation
Loading