Skip to content

[MDL2]: Dropdown #61

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.

Sign up for GitHub

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

Merged
atneik merged 4 commits into from
Aug 3, 2016
Merged

[MDL2]: Dropdown #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de3144e
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 2, 2016
43794bd
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 3, 2016
b52dbc3
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 3, 2016
a543666
Fix alignment, Icon. consolidate overrides
Aug 3, 2016
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
32 changes: 5 additions & 27 deletions src/components/Dropdown/Dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
margin-bottom: 10px;
position: relative;
outline: 0;
user-select: none;

&:hover,
&:focus,
Expand Down Expand Up @@ -120,11 +121,6 @@
}
}

// Hide the original dropdown
.ms-Dropdown-select {
display: none;
}

.ms-Dropdown-caretDown {
color: $ms-color-neutralDark;
font-size: $ms-icon-size-s;
Expand Down Expand Up @@ -166,6 +162,9 @@
bottom: auto;
left: auto;
max-width: 100%;
box-shadow: 0 0px 15px -5px rgba(0, 0, 0, 0.4);
border: 1px solid $ms-color-neutralLight;


&::before {
content: '';
Expand All @@ -175,7 +174,7 @@
left: 0;
right: 0;
bottom: 0;
border: 1px solid $ms-color-neutralLight;
border: none;
}

@media screen and (-ms-high-contrast: active) {
Expand Down Expand Up @@ -222,7 +221,6 @@
background: $ms-color-white;
color: $ms-color-neutralTertiary;
cursor: default;
line-height: 40px;
}
}

Expand All @@ -233,30 +231,10 @@
.ms-Dropdown-item.ms-Dropdown-item--selected {
background-color: $ms-color-themeLight;
color: $ms-color-black;
line-height: 40px;

&:hover {
background-color: $ms-color-themeLight;
}

@include highContrastListItemState;
}

// TODO: remove overrides below.

.ms-Dropdown {
user-select: none;
}

.ms-Dropdown-items {
box-shadow: 0 0px 15px -5px rgba(0, 0, 0, 0.4);
border: 1px solid $ms-color-neutralLight;

&:before {
border: none;
}
}

.ms-Dropdown-item.is-selected {
line-height: 38px;
}
2 changes: 1 addition & 1 deletion src/components/Dropdown/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export class Dropdown extends React.Component<IDropdownProps, any> {
aria-activedescendant={ selectedIndex >= 0 ? (id + '-list' + selectedIndex) : (id + '-list') }
aria-controls={ id + '-list' }
>
<i className='ms-Dropdown-caretDown ms-Icon ms-Icon--CaretDownSolid8'></i>
<i className='ms-Dropdown-caretDown ms-Icon ms-Icon--ChevronDown'></i>
<span className='ms-Dropdown-title'>{ selectedOption ? selectedOption.text : '' }</span>
<ul ref={ (c: HTMLElement) => this._optionList = c }
id={ id + '-list' }
Expand Down