diff --git a/packages/learn/gatsby-config.js b/packages/learn/gatsby-config.js index fea310e145..8488e014da 100644 --- a/packages/learn/gatsby-config.js +++ b/packages/learn/gatsby-config.js @@ -65,7 +65,7 @@ module.exports = { { resolve: 'gatsby-plugin-google-fonts', options: { - fonts: ['Lato:400,400i,700'] + fonts: ['Lato:400,400i,500'] } }, 'gatsby-plugin-sitemap', diff --git a/packages/learn/gatsby-node.js b/packages/learn/gatsby-node.js index d9d374eb33..e0e8b2c5b6 100644 --- a/packages/learn/gatsby-node.js +++ b/packages/learn/gatsby-node.js @@ -139,11 +139,10 @@ exports.modifyWebpackConfig = ({ config, stage }) => { config.plugin('DefinePlugin', webpack.DefinePlugin, [ { HOME_PATH: JSON.stringify( - process.env.HOME_PATH || - 'http://localhost:3000' + process.env.HOME_PATH || 'http://localhost:3000' ) } -]); + ]); }); }; /* eslint-disable prefer-object-spread/prefer-object-spread */ diff --git a/packages/learn/src/components/Header/components/Login.js b/packages/learn/src/components/Header/components/Login.js index 7c9a990564..30415c25eb 100644 --- a/packages/learn/src/components/Header/components/Login.js +++ b/packages/learn/src/components/Header/components/Login.js @@ -1,11 +1,17 @@ /* global HOME_PATH */ import React from 'react'; +import { Button } from 'react-bootstrap'; function Login() { return ( - - Login - + ); } diff --git a/packages/learn/src/components/Header/components/SignedIn.js b/packages/learn/src/components/Header/components/SignedIn.js index f7e3194c17..34b37e6960 100644 --- a/packages/learn/src/components/Header/components/SignedIn.js +++ b/packages/learn/src/components/Header/components/SignedIn.js @@ -1,10 +1,25 @@ /* global HOME_PATH */ import React from 'react'; +import PropTypes from 'prop-types'; +import { connect } from 'react-redux'; +import { createSelector } from 'reselect'; +import { userSelector } from '../../../redux/app'; -function SignedIn() { - return Settings; +const mapStateToProps = createSelector(userSelector, ({ picture }) => ({ + picture +})); + +function SignedIn({ picture }) { + return ( + + + + ); } SignedIn.displayName = 'SignedIn'; +SignedIn.propTypes = { + picture: PropTypes.string +}; -export default SignedIn; +export default connect(mapStateToProps)(SignedIn); diff --git a/packages/learn/src/components/Header/header.css b/packages/learn/src/components/Header/header.css index 2f42d1f634..ab7b1fddb8 100644 --- a/packages/learn/src/components/Header/header.css +++ b/packages/learn/src/components/Header/header.css @@ -39,6 +39,20 @@ header { list-style: none; } +#top-right-nav a, #top-right-nav img { + max-height: 40px; +} + +#top-right-nav a.btn-cta { + background-color: #ffac33; + background-image: linear-gradient(#ffcc4d, #ffac33); + border-color: #f1a02a; + color: #292f33 !important; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + max-height: 38px; + padding: 4px 12px; +} + #top-right-nav li { display: flex; align-items: center; @@ -48,12 +62,12 @@ header { #top-right-nav li > a, #top-right-nav li > span { color:#fff; font-size: 17px; - font-weight: 700; + font-weight: 500; } #top-right-nav li > a:hover, #top-right-nav li > a:focus { text-decoration: none; - font-weight: 700; + font-weight: 500; } diff --git a/packages/learn/src/components/Map/components/Block.js b/packages/learn/src/components/Map/components/Block.js index 495cef7f20..24144425b1 100644 --- a/packages/learn/src/components/Map/components/Block.js +++ b/packages/learn/src/components/Map/components/Block.js @@ -94,13 +94,9 @@ export class Block extends PureComponent { > {challenge.isCompleted ? ( - + ) : ( - + )} , , - + , + , + , + ]; export default meta; diff --git a/packages/learn/src/layouts/global.css b/packages/learn/src/layouts/global.css index e717ac4f4e..21ab100f58 100644 --- a/packages/learn/src/layouts/global.css +++ b/packages/learn/src/layouts/global.css @@ -624,6 +624,10 @@ pre tt:after { } } +h1, h2, h3, h4, h5, h6 { + font-weight: 400; +} + .fcc-modal { background-color: #006400; color: #fff; diff --git a/packages/learn/src/pages/index.js b/packages/learn/src/pages/index.js index bdfdc3ae80..5cbfebe051 100644 --- a/packages/learn/src/pages/index.js +++ b/packages/learn/src/pages/index.js @@ -9,6 +9,7 @@ import { Button } from 'react-bootstrap'; import { ChallengeNode } from '../redux/propTypes'; import { toggleMapModal } from '../redux/app'; +import Spacer from '../components/util/Spacer'; import './index.css'; @@ -30,10 +31,12 @@ const IndexPage = ({ }) => (
-

Welcome to learn.freeCodeCamp.org

+ + +

Welcome to the freeCodeCamp curriculum

We have thousands of coding lessons to help you improve your skills.

- You can earn verified certifications by completing each sections 5 + You can earn verified certifications by completing each sections 6 required projects.