forked from freeCodeCamp/freeCodeCamp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/staging' into feature/custom_i…
…mage * upstream/staging: (36 commits) docs(documentation): Update readme.md and contributor.md (freeCodeCamp#16990) feat: Allows sharing of network (freeCodeCamp#16937) fix(seed): Correct typos in es6.json (freeCodeCamp#16972) fix(seed): Add test for checking the length of buttons is 2 (freeCodeCamp#16921) fix(challenges): Change Symmetric Differences Title (freeCodeCamp#16962) fix(challenges): Fix typo in css-grid justify-self challenge (freeCodeCamp#16961) chore(package): Update react-freecodecamp-search (freeCodeCamp#16943) fix(seed): Fixed issue with approximately always failing (freeCodeCamp#16752) fix(lang): Refetch mapUi on language change (freeCodeCamp#16844) fix(seed): Make element naming optional (freeCodeCamp#16926) fix(seed): Chall seed and test are modified to allow better t (freeCodeCamp#16928) fix(projects): Add user stories to projects' description (freeCodeCamp#16924) feat(seed): An HTML illustration added (freeCodeCamp#16939) fix(gulp): run babel-node with inspect flag in debug (freeCodeCamp#16901) fix: remove flash saying JS is disabled fix(common): Added expected homeURL that was missing (freeCodeCamp#16922) fix(settings): Night mode settings and profile page UI improvements (freeCodeCamp#16806) style(settings): Remove extra whitespace fix(settings): Report user modal centered to the page fix(settings): Fix modal success button hover animation ...
- Loading branch information
Showing
48 changed files
with
2,750 additions
and
409 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,3 +13,8 @@ | |
| flex: 1 0 0px; | ||
| color: #37474f; | ||
| } | ||
|
|
||
| #@{ns}-board { | ||
| margin-top: 50px; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| import React from 'react'; | ||
| import Media from 'react-media'; | ||
| import { Col, Navbar, Row } from 'react-bootstrap'; | ||
| import FCCSearchBar from 'react-freecodecamp-search'; | ||
| import { NavLogo, BinButtons, NavLinks } from './components'; | ||
|
|
||
| import propTypes from './navPropTypes'; | ||
|
|
||
| function LargeNav({ clickOnLogo, clickOnMap, shouldShowMapButton, panes }) { | ||
| return ( | ||
| <Media | ||
| query='(min-width: 956px)' | ||
| render={ | ||
| () => ( | ||
| <Row> | ||
| <Col className='nav-component' sm={ 4 } xs={ 6 }> | ||
| <Navbar.Header> | ||
| <NavLogo clickOnLogo={ clickOnLogo } /> | ||
| <FCCSearchBar /> | ||
| </Navbar.Header> | ||
| </Col> | ||
| <Col className='nav-component bins' sm={ 4 } xs={ 6 }> | ||
| <BinButtons panes={ panes } /> | ||
| </Col> | ||
| <Col className='nav-component nav-links' sm={ 4 } xs={ 0 }> | ||
| <Navbar.Collapse> | ||
| <NavLinks | ||
| clickOnMap={ clickOnMap } | ||
| shouldShowMapButton={ shouldShowMapButton } | ||
| /> | ||
| </Navbar.Collapse> | ||
| </Col> | ||
| </Row> | ||
| ) | ||
| } | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| LargeNav.displayName = 'LargeNav'; | ||
| LargeNav.propTypes = propTypes; | ||
|
|
||
| export default LargeNav; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| import React from 'react'; | ||
| import Media from 'react-media'; | ||
| import { Navbar, Row } from 'react-bootstrap'; | ||
| import FCCSearchBar from 'react-freecodecamp-search'; | ||
| import { NavLogo, BinButtons, NavLinks } from './components'; | ||
|
|
||
| import propTypes from './navPropTypes'; | ||
|
|
||
| function MediumNav({ clickOnLogo, clickOnMap, shouldShowMapButton, panes }) { | ||
| return ( | ||
| <Media | ||
| query={{ maxWidth: 955, minWidth: 751 }} | ||
| > | ||
| { | ||
| matches => matches && typeof window !== 'undefined' && ( | ||
| <div> | ||
| <Row> | ||
| <Navbar.Header className='medium-nav'> | ||
| <div className='nav-component header'> | ||
| <Navbar.Toggle /> | ||
| <NavLogo clickOnLogo={ clickOnLogo } /> | ||
| <FCCSearchBar /> | ||
| </div> | ||
| <div className='nav-component bins'> | ||
| <BinButtons panes={ panes } /> | ||
| </div> | ||
| </Navbar.Header> | ||
| </Row> | ||
| <Row className='collapse-row'> | ||
| <Navbar.Collapse> | ||
| <NavLinks | ||
| clickOnMap={ clickOnMap } | ||
| shouldShowMapButton={ shouldShowMapButton } | ||
| /> | ||
| </Navbar.Collapse> | ||
| </Row> | ||
| </div> | ||
| ) | ||
| } | ||
| </Media> | ||
| ); | ||
| } | ||
|
|
||
| MediumNav.displayName = 'MediumNav'; | ||
| MediumNav.propTypes = propTypes; | ||
|
|
||
| export default MediumNav; |
Oops, something went wrong.