Skip to content

Commit

Permalink
Merge removal of interview banner down to staging (#129)
Browse files Browse the repository at this point in the history
* 11867 updating Source element id to match data source

* Upgrade to node 16

* Update nvmrc to new node

* Update package.json

Co-authored-by: Tyler Matteo <[email protected]>

* Revert "Merge user interview sign up banner to master"

---------

Co-authored-by: horatio <[email protected]>
Co-authored-by: dhochbaum-dcp <[email protected]>
Co-authored-by: Matt Gardner <[email protected]>
  • Loading branch information
4 people authored Jul 30, 2024
1 parent 84ce2cf commit 41cbd26
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 75 deletions.
8 changes: 1 addition & 7 deletions app/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,10 @@ h1, h2, h3, h4, h5 {
bottom: 0;
left: 0;
background: #fff;
margin-top: 171px;
margin-top: 71px;
overflow: hidden;
}

@media (min-width: 992px) {
.full-screen {
margin-top: 119px;
}
}

.fluid-content {
position: absolute;
top: 0;
Expand Down
53 changes: 18 additions & 35 deletions app/common/Nav.jsx
Original file line number Diff line number Diff line change
@@ -1,28 +1,17 @@
import React from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";
import { connect } from "react-redux";
import React from 'react';
import PropTypes from 'prop-types';
import { Link } from 'react-router';
import { connect } from 'react-redux';

import * as authActions from "../actions/auth";
import * as authActions from '../actions/auth';

import "./Nav.scss";
import './Nav.scss';

const Nav = (props) => {
const profile = props.profile;

return (
<nav className={"navbar navbar-default navbar-fixed-top"}>
<div className="info-banner">
<p>
In an effort to better serve the needs of users like you, we'd like to
hear from you about how we can improve services like this site.&nbsp;
<a
href="https://cdn.forms-content.sg-form.com/28f9b3d0-9909-11ee-8461-5ad38fb68638"
target="_blank"
>
Click here to sign up.
</a>
</p>
</div>
<nav className={'navbar navbar-default navbar-fixed-top'}>
<div className="navbar-header">
<button
type="button"
Expand All @@ -37,32 +26,26 @@ const Nav = (props) => {
<span className="icon-bar" />
<span className="icon-bar" />
</button>
<Link className="navbar-brand" to="/">
&#8291;
</Link>
<div className="navbar-title">Capital Planning Explorer</div>
<Link className="navbar-brand" to="/">&#8291;</Link>
<div className="navbar-title">
Capital Planning Explorer
</div>
</div>
<div id="navbar" className="navbar-collapse collapse">
<ul className="nav navbar-nav navbar-right ">
<li>
<Link to="/map"> Map</Link>
</li>
<li>
<Link to="/table"> Table</Link>
</li>
<li style={{ padding: "13px 0", fontSize: "17px" }}> | </li>
<li>
<Link to={props.about}>About</Link>
</li>
<li><Link to="/map"> Map</Link></li>
<li><Link to="/table"> Table</Link></li>
<li style={{ padding: '13px 0', fontSize: '17px' }}> | </li>
<li><Link to={props.about}>About</Link></li>
</ul>
</div>
</nav>
);
};

Nav.defaultProps = {
title: "",
about: "/about",
title: '',
about: '/about',
children: null,
profile: {},
};
Expand Down
33 changes: 1 addition & 32 deletions app/common/Nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,39 +45,8 @@
}
}

.info-banner {
background-color: #2C7A7B;
color: white;
text-align: center;
position: relative;
z-index: 2;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
font-family: 'Oswald', sans-serif;
padding: 0 16px;
font-size: 16px;
height: 100px;

p {
margin-bottom: 0;
}

a {
color: white;
font-family: 'Oswald', sans-serif;
text-decoration: underline;
}
}

@media (min-width: 992px) {
.info-banner {
height: 48px;
}
}

nav {
height: 50px;
font-family: 'Oswald', sans-serif;
}

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 41cbd26

Please sign in to comment.