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

- Removed navbar since it wasn't being used #52

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

- Removed navbar since it wasn't being used #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@
color: #61dafb;
}

.nav-pills .nav-link.active {
background-color: #6ab445;
}
.nav-link {
color: black;
}
.nav-link:hover {
color: darkgrey;
}

@keyframes App-logo-spin {
from {
transform: rotate(0deg);
Expand Down
22 changes: 0 additions & 22 deletions src/Navbar.js
View file
Open in desktop

This file was deleted.

16 changes: 4 additions & 12 deletions src/components/Components.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Col, Container, Nav, Row, Tab } from "react-bootstrap"
import { Link, useParams } from "react-router-dom"
import { useParams } from "react-router-dom"
import Builder from "./Builder"
import CustomBuilder from "./CustomBuilder"
import PDFForm from "./PDFForm"
Expand All @@ -14,48 +14,40 @@ const Components = () => {
<Tab.Container id="left-tabs-example" defaultActiveKey={'renderer'}>
<Row>
<Col sm={2}>
<Nav.Item variant="pills" className="flex-column">
<Nav variant="pills" className="flex-column">
<Nav.Item >
<Nav.Item>
<Link to="component">
<Nav.Link eventKey="renderer">
Form Renderer
</Nav.Link>
</Link>
</Nav.Item>
<Nav.Item>
<Link to="component">
<Nav.Link eventKey="builder">
Form Builder
</Nav.Link>
</Link>
</Nav.Item>
<Nav.Item>
<Link to="component">
<Nav.Link eventKey="simple">
Simple Form
</Nav.Link>
</Link>
</Nav.Item>
<Nav.Item>
<Link to="component">
<Nav.Link eventKey="wizard">
Wizard Form
</Nav.Link>
</Link>
</Nav.Item>
<Nav.Item>
<Link to="component">
<Nav.Link eventKey="pdf">
PDF Form
</Nav.Link>
</Link>
</Nav.Item>
{/* <Nav.Item>
<Nav.Link eventKey="custom" href="/components/custom">
Custom Builder
</Nav.Link>
</Nav.Item> */}
</Nav.Item>
</Nav>
</Col>
<Col sm={10} style={{borderLeft: '1px solid #eaeaea', padding: '10px 20px'}}>
<Tab.Content>
Expand Down
32 changes: 15 additions & 17 deletions src/components/Navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
import { Container, Nav, NavDropdown, Navbar } from "react-bootstrap"
import { Container, Nav, Navbar } from "react-bootstrap"
import Image from 'react-bootstrap/Image'
import { Link } from "react-router-dom";
import logo from '../Light-Background.png';

function Navigation() {
return (
<Navbar bg="light" expand="lg">
<Container>
<Navbar.Brand >
<Link to={'/'}>
<Image src={logo} style={{height: '2.2rem'}}></Image> React Demo
</Link>
</Navbar.Brand>
<Navbar.Toggle aria-controls="basic-navbar-nav" />
<Navbar.Collapse id="basic-navbar-nav">
<Nav>
<Nav.Link><Link to="components">Components </Link></Nav.Link>
<Nav.Link><Link to="components">Examples</Link></Nav.Link>
<Nav.Link href="https://github.com/formio/react"><i className="fa fa-book"></i> Docs</Nav.Link>
<Nav.Link href="https://github.com/formio/react">Star</Nav.Link>
<Nav.Link href="https://github.com/formio/react/fork">Fork</Nav.Link>
</Nav>
</Navbar.Collapse>
<Image src={logo} style={{height: '2.5rem', paddingRight: '.8rem'}}></Image>
<Navbar.Brand href="/react-app-starterkit/">
React Demo
</Navbar.Brand>
<Navbar.Toggle aria-controls="basic-navbar-nav" />
<Navbar.Collapse id="basic-navbar-nav">
<Nav className="me-auto">
<Nav.Link href="components">Components</Nav.Link>
<Nav.Link href="examples">Examples</Nav.Link>
<Nav.Link href="https://github.com/formio/react"><i className="fa fa-book"></i> Docs</Nav.Link>
<Nav.Link href="https://github.com/formio/react">Star</Nav.Link>
<Nav.Link href="https://github.com/formio/react/fork">Fork</Nav.Link>
</Nav>
</Navbar.Collapse>
</Container>
</Navbar>
);
Expand Down