Skip to content

Commit

Permalink
Merge pull request #6185 from MinaProtocol/website/bugs
Browse files Browse the repository at this point in the history
Website: Navbar fixes
  • Loading branch information
mergify[bot] authored Oct 2, 2020
2 parents 368bdf3 + ad1f2ef commit 37c2bd7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ module Styles = {
marginLeft(`rem(0.4)),
marginRight(`rem(0.2)),
cursor(`pointer),
hover([borderBottom(`px(1), `solid, Theme.Colors.orange)]),
]),
]);

Expand Down
10 changes: 6 additions & 4 deletions frontend/website-redesign/src/components/Nav.re
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ module Styles = {
flexDirection(`column),
position(`absolute),
left(`zero),
right(`zero),
top(`rem(4.25)),
width(`percent(100.)),
width(`percent(90.)),
background(Theme.Colors.digitalBlack),
margin2(~h=`auto, ~v=`zero),
media(Theme.MediaQuery.tablet, [top(`rem(6.25))]),
media(
Theme.MediaQuery.desktop,
Expand Down Expand Up @@ -80,7 +82,7 @@ module Styles = {
Theme.MediaQuery.desktop,
[
position(`relative),
marginRight(`rem(1.25)),
marginRight(`rem(2.5)),
width(`auto),
height(`auto),
padding(`zero),
Expand Down Expand Up @@ -227,8 +229,8 @@ let make = (~dark=false) => {
</Next.Link>
<input type_="checkbox" id="nav_toggle" className=Styles.hiddenToggle />
<label htmlFor="nav_toggle" className=Styles.navToggle>
<span id="open-nav"> <Icon kind=Icon.BurgerMenu /> </span>
<span id="close-nav"> <Icon kind=Icon.CloseMenu /> </span>
<span id="open-nav"> <Icon kind=Icon.BurgerMenu size=2./> </span>
<span id="close-nav"> <Icon kind=Icon.CloseMenu size=2./> </span>
</label>
<nav className=Styles.nav>
<NavLink label="About" href="/about" dark />
Expand Down
16 changes: 9 additions & 7 deletions frontend/website-redesign/src/components/Page.re
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ module Styles = {

let fadeIn = keyframes([(0, [opacity(0.)]), (100, [opacity(1.)])]);

let main = style([
opacity(0.),
animationName(fadeIn),
animationDuration(1000),
animationDelay(200),
animationFillMode(`forwards),
]);
let main =
style([
position(`relative),
opacity(0.),
animationName(fadeIn),
animationDuration(1000),
animationDelay(200),
animationFillMode(`forwards),
]);
};

let siteDescription = "Mina is the first cryptocurrency with a succinct blockchain. Our lightweight blockchain means anyone can use Mina directly from any device, in less data than a few tweets.";
Expand Down

0 comments on commit 37c2bd7

Please sign in to comment.