-
Notifications
You must be signed in to change notification settings - Fork 66
Removed unnecessary files #29
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| 'use strict' | ||
|
|
||
| import MenuBar from '../MenuBar/MenuBar.jsx' | ||
|
|
||
| require('./Navbar.scss') | ||
| const React = require('react') | ||
| const SearchBar = require('../SearchBar/SearchBar.jsx') | ||
| const QuickLinks = require('../QuickLinks/QuickLinks.jsx') | ||
| const UserDropdownMenu = require('../UserDropdownMenu/UserDropdownMenu.jsx') | ||
|
|
||
| const primaryNavigationItems = [ | ||
| {img: '../components/MenuBar/nav-community.svg', text: 'Community', link: 'javascript:;'}, | ||
| {img: '../components/MenuBar/nav-compete.svg', text: 'Compete', link: 'javascript:;', selected: true}, | ||
| {img: '../components/MenuBar/nav-learn.svg', text: 'Learn', link: 'javascript:;'} | ||
| ] | ||
|
|
||
| const Navbar = { | ||
| render() { | ||
| const dom = ( | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Return jsx code directly (no |
||
| <div className="Navbar flex middle space-between"> | ||
| <div className="topcoder-logo"></div> | ||
| <div className="search-bar-wrap"> | ||
| <div className="icon-placeholder"></div> | ||
| <SearchBar /> | ||
| </div> | ||
| <MenuBar items={primaryNavigationItems} mobileBreakPoint={767} orientation="horizontal" /> | ||
| <div className="collapse-group"> | ||
| <div className="icon-placeholder"></div> | ||
| <div className="quick-links-wrap"><QuickLinks /></div> | ||
| <UserDropdownMenu username="vic-tor" /> | ||
| </div> | ||
| </div> | ||
| ) | ||
|
|
||
| return dom | ||
| } | ||
| } | ||
|
|
||
| module.exports = React.createClass(Navbar) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| @import "work/work-includes"; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Use |
||
|
|
||
| $navbar-bg: #FAFAFB; | ||
| $border-color: #CFCFD2; | ||
| $placeholder-bg: #B47DD6; | ||
|
|
||
| $iphone6: 768px; | ||
|
|
||
| .Navbar { | ||
| height: 60px; | ||
| background-color: $navbar-bg; | ||
| border-bottom: 1px solid $border-color; | ||
| padding: 10px 20px; | ||
| position: fixed; | ||
| top: 0; | ||
| left: 0; | ||
| width: 100%; | ||
|
|
||
| @media screen and (max-width: $iphone6) { | ||
| height: 40px; | ||
| padding-top: 0; | ||
| padding-bottom: 0; | ||
| } | ||
|
|
||
| .topcoder-logo { | ||
| width: 56px; | ||
| height: 24px; | ||
| background-color: $placeholder-bg; | ||
| margin-right: 40px; | ||
| flex: 0 0 auto; | ||
|
|
||
| @media screen and (min-width: 1376px) { | ||
| width: 155px; | ||
| } | ||
|
|
||
| @media screen and (max-width: $iphone6) { | ||
| width: 40px; | ||
| margin-right: 26px; | ||
| order: 1; | ||
| } | ||
| } | ||
|
|
||
| .search-bar-wrap { | ||
| .icon-placeholder { | ||
| display: none; | ||
|
|
||
| @media screen and (max-width: $iphone6) { | ||
| display: block; | ||
| height: 25px; | ||
| width: 25px; | ||
| background-color: $placeholder-bg; | ||
| margin: 9.5px; | ||
| order: 2; | ||
| } | ||
| } | ||
|
|
||
| .SearchBar { | ||
| margin-right: 45px; | ||
| max-width: 789px; | ||
|
|
||
| @media screen and (max-width: $iphone6) { | ||
| display: none; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .MenuBar { | ||
| margin-right: 30px; | ||
|
|
||
| @media screen and (max-width: $iphone6) { | ||
| order: 1; | ||
| } | ||
| } | ||
|
|
||
| .collapse-group { | ||
| flex: 1 0 auto; | ||
| position: relative; | ||
|
|
||
| @media screen and (max-width :$iphone6) { | ||
| width: 43px; | ||
| height: 43px; | ||
| background-color: #A3A3AE; | ||
| order: 3; | ||
| } | ||
|
|
||
| .icon-placeholder { | ||
| display: none; | ||
|
|
||
| @media screen and (max-width: $iphone6) { | ||
| display: initial; | ||
| height: 24px; | ||
| width: 24px; | ||
| background-color: $placeholder-bg; | ||
| margin: 10px; | ||
| } | ||
| } | ||
|
|
||
| .quick-links-wrap { | ||
| margin-right: 30px; | ||
| display: inline-block; | ||
|
|
||
| @media screen and (max-width: $iphone6) { | ||
| display: none; | ||
| } | ||
|
|
||
| .Dropdown { | ||
| right: -46px; | ||
| top: 10px; | ||
| } | ||
| } | ||
|
|
||
| .UserDropdownMenu { | ||
| flex-shrink: 0; | ||
| background-color: transparent; | ||
|
|
||
| @media screen and (max-width: $iphone6) { | ||
| display: none; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| 'use strict' | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same comments as above regarding use strict/imports |
||
| const Navbar = require('./Navbar.jsx') | ||
| const React = require('react') | ||
|
|
||
| const NavbarExample = { | ||
| render() { | ||
| return <Navbar /> | ||
| } | ||
| } | ||
|
|
||
| module.exports = React.createClass(NavbarExample) | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same as 'use strict' / imports comments here 3118fed