diff --git a/components/Dropdown/Dropdown.jsx b/components/Dropdown/Dropdown.jsx index 32f4cdf5c..2a06bfc35 100644 --- a/components/Dropdown/Dropdown.jsx +++ b/components/Dropdown/Dropdown.jsx @@ -1,6 +1,6 @@ require('./Dropdown.scss') -import React, { Component } from 'react' +import React, { Component, PropTypes } from 'react' class Dropdown extends Component { constructor(props) { @@ -25,7 +25,7 @@ class Dropdown extends Component { currNode = currNode.parentNode - if(!currNode.tagName) + if(!currNode) break } while(currNode.tagName) @@ -86,7 +86,7 @@ class Dropdown extends Component {
{ this.props.children.map((child) => { - if(child.props.className.indexOf('dropdown-menu-header') > -1) + if(child.props.className === 'dropdown-menu-header') return child }) } @@ -94,7 +94,7 @@ class Dropdown extends Component {
{ this.props.children.map((child) => { - if(child.props.className.indexOf('dropdown-menu-list') > -1) + if(child.props.className === 'dropdown-menu-list') return child }) } @@ -104,4 +104,8 @@ class Dropdown extends Component { } } +Dropdown.propTypes = { + children: PropTypes.array.isRequired +} + export default Dropdown diff --git a/components/Navbar/Navbar.scss b/components/Navbar/Navbar.scss index 1d3f2564d..d78258c95 100755 --- a/components/Navbar/Navbar.scss +++ b/components/Navbar/Navbar.scss @@ -69,6 +69,7 @@ $super-wide: 1376px; width: 25px; background-color: $placeholder-bg; margin: auto; + cursor: pointer; } } diff --git a/components/SearchBar/SearchBar.jsx b/components/SearchBar/SearchBar.jsx index 61d06ddcb..62a39f926 100644 --- a/components/SearchBar/SearchBar.jsx +++ b/components/SearchBar/SearchBar.jsx @@ -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) { diff --git a/components/SearchBar/SearchBar.scss b/components/SearchBar/SearchBar.scss index e38311848..6fb889678 100644 --- a/components/SearchBar/SearchBar.scss +++ b/components/SearchBar/SearchBar.scss @@ -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; @@ -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 { diff --git a/components/SearchSuggestions/SearchSuggestions.scss b/components/SearchSuggestions/SearchSuggestions.scss index 205399bb8..5658fc2a7 100644 --- a/components/SearchSuggestions/SearchSuggestions.scss +++ b/components/SearchSuggestions/SearchSuggestions.scss @@ -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; } } @@ -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 { diff --git a/components/StandardListItem/StandardListItem.jsx b/components/StandardListItem/StandardListItem.jsx index 83883bd66..6e0ff92ed 100644 --- a/components/StandardListItem/StandardListItem.jsx +++ b/components/StandardListItem/StandardListItem.jsx @@ -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 @@ -33,7 +33,7 @@ StandardListItem.propTypes = { showIcon : PropTypes.bool, showLabel : PropTypes.bool, imgSrc : PropTypes.string, - labelText : PropTypes.string, + labelText : PropTypes.node, placeIcon : PropTypes.string } diff --git a/components/UserDropdownMenu/UserDropdownMenu.jsx b/components/UserDropdownMenu/UserDropdownMenu.jsx index 933d23824..0ebf8b393 100644 --- a/components/UserDropdownMenu/UserDropdownMenu.jsx +++ b/components/UserDropdownMenu/UserDropdownMenu.jsx @@ -37,7 +37,7 @@ class UserDropdownMenu extends Component {
-
+
{ userDropdownLists.map((list, i) => { return (