Skip to content

Commit

Permalink
fix(dropdowns): Fixes the highlighting on hover of dropdown items
Browse files Browse the repository at this point in the history
Allows for users to add borders to dropdowns by providing a border prop.

[Finishes #102024260]

Signed-off-by: Caroline Taymor <ctaymor@pivotal.io>
Signed-off-by: Kenny Wang <kwang@pivotal.io>
  • Loading branch information
clairethompson authored and pivotal committed Sep 9, 2015
1 parent d07cb1a commit 718bfdd
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 8 deletions.
18 changes: 12 additions & 6 deletions src/pivotal-ui-react/dropdowns/dropdowns.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,21 @@ function defDropdown(props) {
id: React.PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.number]),
buttonClassName: React.PropTypes.string,
style: React.PropTypes.any,
title: React.PropTypes.any
title: React.PropTypes.any,
border: React.PropTypes.bool
},
render: function render() {
const {buttonClassName, style, title, children, ...others} = this.props;
const {buttonClassName, style, title, children, border, ...others} = this.props;
const {buttonClassName: defaultBtnClassName, bsStyle} = props;

const btnClass = classnames(buttonClassName, defaultBtnClassName);
const borderClass = border ? 'dropdown-border' : null;
return (
<BsDropdown {...others}>
<BsDropdown.Toggle className={btnClass} bsStyle={bsStyle} style={style}>
{title}
</BsDropdown.Toggle>
<BsDropdown.Menu>
<BsDropdown.Menu className={borderClass}>
{children}
</BsDropdown.Menu>
</BsDropdown>
Expand Down Expand Up @@ -164,7 +166,6 @@ This is the basic bootstrap dropdown:
```react_example_table
<Dropdown title='DropDown'>
<DropdownItem href="http://media.giphy.com/media/13py6c5BSnBkic/giphy.gif">Booyeah</DropdownItem>
<DropdownItem divider />
<DropdownItem href="http://media.giphy.com/media/TlK63EQERmiAVzMEgO4/giphy.gif">Adorable</DropdownItem>
</Dropdown>
```
Expand Down Expand Up @@ -202,10 +203,15 @@ If you want to customize the dropdown, you can use `className` to add a modifier
To customize the dropdown button, you can add modifier classes to it
using the `buttonClassName` property. `id` and `style` will also be applied to the dropdown button.
If you want to add borders between items, you can pass a border attribute to any of our dropdown classes.
```react_example
<DefaultAltDropdown title='DropDown' buttonClassName='btn-lg'>
<DefaultAltDropdown title='DropDown' buttonClassName='btn-lg' border>
<DropdownItem href="http://media.giphy.com/media/13py6c5BSnBkic/giphy.gif">Booyeah</DropdownItem>
<DropdownItem href="http://media.giphy.com/media/TlK63EQERmiAVzMEgO4/giphy.gif">Adorable</DropdownItem>
<DropdownItem href="http://media.giphy.com/media/13py6c5BSnBkic/giphy.gif">Booyeah</DropdownItem>
<DropdownItem href="http://media.giphy.com/media/TlK63EQERmiAVzMEgO4/giphy.gif">Adorable</DropdownItem>
<DropdownItem href="http://media.giphy.com/media/13py6c5BSnBkic/giphy.gif">Booyeah</DropdownItem>
<DropdownItem divider />
<DropdownItem href="http://media.giphy.com/media/TlK63EQERmiAVzMEgO4/giphy.gif">Adorable</DropdownItem>
</DefaultAltDropdown>
```
Expand Down
11 changes: 10 additions & 1 deletion src/pivotal-ui/components/dropdowns/dropdowns.scss
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Here's a crazy-complex dropdown. Not for the faint of heart.
*/

.dropdown-menu {
@include box-shadow(0 2px 0 rgba(211,217,217,0.50));
@include box-shadow(0 2px 0 rgba(211, 217, 217, 0.50));
background-color: white;
border: 1px solid $neutral-7;
padding: 0 0;
Expand All @@ -152,6 +152,15 @@ Here's a crazy-complex dropdown. Not for the faint of heart.
}
}
}
&.dropdown-border {
> li {
> a {
padding-top: 7px;
padding-bottom: 7px;
border-bottom: 1px solid $dropdown-border;
}
}
}
}

/*doc
Expand Down
2 changes: 1 addition & 1 deletion src/pivotal-ui/components/pui-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ $cursor-disabled: not-allowed !default;
// -------------------------

$dropdown-bg: $neutral-10 !default;
$dropdown-border: transparent !default;
$dropdown-border: $neutral-9 !default;
$dropdown-fallback-border: transparent !default;
$dropdown-divider-bg: #e5e5e5 !default;

Expand Down

0 comments on commit 718bfdd

Please sign in to comment.