Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions components/Dropdown/Dropdown.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require('./Dropdown.scss')

import React, { Component } from 'react'
import React, { Component, PropTypes } from 'react'

class Dropdown extends Component {
constructor(props) {
Expand All @@ -25,7 +25,7 @@ class Dropdown extends Component {

currNode = currNode.parentNode

if(!currNode.tagName)
if(!currNode)
break
} while(currNode.tagName)

Expand Down Expand Up @@ -86,15 +86,15 @@ class Dropdown extends Component {
<div className="dropdown-wrap" onClick={ this.onClick } ref="Dropdown">
{
this.props.children.map((child) => {
if(child.props.className.indexOf('dropdown-menu-header') > -1)
if(child.props.className === 'dropdown-menu-header')
return child
})
}

<div className = {ndClasses}>
{
this.props.children.map((child) => {
if(child.props.className.indexOf('dropdown-menu-list') > -1)
if(child.props.className === 'dropdown-menu-list')
return child
})
}
Expand All @@ -104,4 +104,8 @@ class Dropdown extends Component {
}
}

Dropdown.propTypes = {
children: PropTypes.array.isRequired
}

export default Dropdown
1 change: 1 addition & 0 deletions components/Navbar/Navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ $super-wide: 1376px;
width: 25px;
background-color: $placeholder-bg;
margin: auto;
cursor: pointer;
}
}

Expand Down
2 changes: 1 addition & 1 deletion components/SearchBar/SearchBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class SearchBar extends Component {
isPartial = popularList[i].toLowerCase().indexOf(searchValue.toLowerCase()) === 0

if(!typeaheadText && isPartial) {
typeaheadText = popularList[i]
typeaheadText = searchValue + popularList[i].substring(searchValue.length)
}

if(isPartial) {
Expand Down
4 changes: 2 additions & 2 deletions components/SearchBar/SearchBar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ $active-icon-wrap-bg: #888894;

.search-bar__text,
.search-typeahead-text {
font-family: "Roboto", Arial, Helvetica, sans-serif;
outline: 0px;
border: 0px none;
font-size: 17px;
Expand All @@ -95,8 +96,7 @@ $active-icon-wrap-bg: #888894;
color: $accent-gray;
display: none;
z-index: 10;
left: 17.5px;
letter-spacing: 0.05em;
left: 16.5px;
}

.search-bar__clear {
Expand Down
7 changes: 7 additions & 0 deletions components/SearchSuggestions/SearchSuggestions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@
color: $accent-gray-dark;
font-size: 16px;
line-height: 30px;
white-space: nowrap;
text-overflow: ellipsis;
width: 95%;
overflow-x: hidden;
}
}

Expand All @@ -100,6 +104,9 @@
bottom: 0;
border: 0px none;
outline: 0px none;
white-space: nowrap;
text-overflow: ellipsis;
overflow-x: hidden;
}

.footer-link:hover, .footer-link:active {
Expand Down
4 changes: 2 additions & 2 deletions components/StandardListItem/StandardListItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class StandardListItem extends Component {
super(props)
}
render() {
const classes = 'StandardListItem ' + this.props.placeIcon
const classes = 'StandardListItem transition ' + this.props.placeIcon
let label
let icon

Expand All @@ -33,7 +33,7 @@ StandardListItem.propTypes = {
showIcon : PropTypes.bool,
showLabel : PropTypes.bool,
imgSrc : PropTypes.string,
labelText : PropTypes.string,
labelText : PropTypes.node,
placeIcon : PropTypes.string
}

Expand Down
2 changes: 1 addition & 1 deletion components/UserDropdownMenu/UserDropdownMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class UserDropdownMenu extends Component {
<img className="dropdown-arrow" src={ require('./arrow-small-down.svg') } />
</div>

<div className="dropdown-menu-list user-menu-items-list">
<div className="dropdown-menu-list">
{
userDropdownLists.map((list, i) => {
return ( <ul key={ i }>
Expand Down