Skip to content

Commit 6830228

Browse files
committed
fix(navbar): theme btn visible in closed nav
1 parent 5b34161 commit 6830228

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

src/components/BtnTottleTheme.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const BtnToggleTheme = ({ className }) => {
1414

1515
return (
1616
<Button className={className + " btn-toggle"} onClick={toggleTheme}>
17-
<ToggleThemeIcon style={{ marginTop: "10px", fontSize: "25px" }}/>
17+
<ToggleThemeIcon style={{ fontSize: "25px" }}/>
1818
</Button>
1919
);
2020
};

src/components/Footer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ function Footer() {
1717
<Col md="4">
1818
</Col>
1919

20-
<Col md="4">
20+
<Col md="4" className="footer-copyright">
2121
<h3>Copyright © {year} Massimiliano Pronesti</h3>
2222
</Col>
2323

24-
<Col md="4">
25-
<ul className="footer-icons">
24+
<Col md="4" className="footer-social-icons">
25+
<ul>
2626
<li className="social-icons">
2727
<a className="footer-social-icons"
2828
href="https://github.com/mspronesti"

src/components/Navbar.js

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React, { useState } from "react";
22
import Navbar from "react-bootstrap/Navbar";
33
import Nav from "react-bootstrap/Nav";
4-
import Container from "react-bootstrap/Container";
54
import { Link } from "react-router-dom";
65
import BtnToggleTheme from "./BtnTottleTheme";
76

@@ -33,11 +32,6 @@ function NavBar() {
3332
expand="md"
3433
className={navColour ? "sticky" : "navbar"}
3534
>
36-
<Container>
37-
<Navbar.Brand href="/" className="d-flex">
38-
{/* <img src={logo} className="img-fluid logo" alt="brand" /> */}
39-
</Navbar.Brand>
40-
4135
<Navbar.Toggle
4236
aria-controls="responsive-navbar-nav"
4337
onClick={() => {
@@ -48,6 +42,7 @@ function NavBar() {
4842
<span/>
4943
<span/>
5044
</Navbar.Toggle>
45+
5146

5247
<Navbar.Collapse id="responsive-navbar-nav">
5348
<Nav className="mx-auto" defaultActiveKey="#home">
@@ -79,14 +74,9 @@ function NavBar() {
7974
Projects
8075
</Nav.Link>
8176
</Nav.Item>
82-
83-
<Nav.Item>
84-
<BtnToggleTheme className="col-md-12"/>
85-
</Nav.Item>
86-
8777
</Nav>
8878
</Navbar.Collapse>
89-
</Container>
79+
{ !expand && <BtnToggleTheme/> }
9080
</Navbar>
9181
);
9282
}

src/style.css

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ html {
1414
--bg-color: #ffffff;
1515
--text-color: #24292e;
1616

17-
--nav-active: transparent;
17+
--nav-active: #f3f3f3;
1818
--footer-background: transparent;
1919
--footer-social-icons: black;
2020
}
@@ -408,6 +408,7 @@ button:focus {
408408
padding-left: 15px;
409409
}
410410

411+
411412
.icon-colour {
412413
color: var(--green-1) !important;
413414
}
@@ -422,6 +423,7 @@ button:focus {
422423
padding-bottom: 8px !important ;
423424
}
424425
.footer-copywright {
426+
flex: 1;
425427
text-align: center !important;
426428
}
427429

@@ -432,8 +434,14 @@ button:focus {
432434

433435
.footer-social-icons {
434436
color: var(--footer-social-icons) !important;
437+
display: flex !important;
438+
justify-content: center;
439+
margin-top: 0.5rem;
440+
padding: 0;
441+
font-size: 1.1rem;
435442
}
436443

444+
437445
@media (max-width: 767px) {
438446
.footer-copywright {
439447
text-align: center !important;
@@ -516,6 +524,7 @@ button:focus {
516524
color: var(--text-color) !important;
517525
background-color: transparent !important;
518526
border-color: transparent !important;
527+
position: relative !important;
519528
}
520529
.btn-toggle:hover {
521530
color: var(--text-color) !important;

0 commit comments

Comments
 (0)