Skip to content
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

Jump to bottom

add styles for content parts of select options #122

Merged
merged 1 commit into from Jun 27, 2017
Merged

add styles for content parts of select options #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions silk-react-components/src/HierarchicalMapping/Components/MappingRule/Forms/AutoComplete.jsx
View file
Open in desktop
Expand Up @@ -33,18 +33,18 @@ const AutoComplete = React.createClass({

if ($userCreated) {
return (
<div>
<strong>{label}</strong>
</div>
<strong className="Select-option__label">
{label}
</strong>
);
}

return (
<div>
<strong><Highlight textToHighlight={label} searchWord={this._inputValue}/></strong>
<small><Highlight textToHighlight={value} searchWord={this._inputValue}/></small>
<small><Highlight textToHighlight={description} searchWord={this._inputValue}/></small>
</div>
[
<strong className="Select-option__label"><Highlight textToHighlight={label} searchWord={this._inputValue}/></strong>,
<code className="Select-option__value"><Highlight textToHighlight={value} searchWord={this._inputValue}/></code>,
<span className="Select-option__description"><Highlight textToHighlight={description} searchWord={this._inputValue}/></span>
]
);
},
newOptionCreator({label, labelKey, valueKey}) {
Expand Down Expand Up @@ -93,4 +93,4 @@ const AutoComplete = React.createClass({

});

export default AutoComplete;
export default AutoComplete;
31 changes: 29 additions & 2 deletions silk-react-components/src/HierarchicalMapping/HierarchicalMapping.scss
View file
Open in desktop
@@ -1,12 +1,39 @@
.ecc-silk-mapping {
margin: 1rem;

.mdl-dialog {
width: 40rem;
}

.Select-menu-outer {
z-index: 3;
}

.mdl-dialog {
width: 40rem;
.Select-option {
@include typo-body-1();
}

.Select-option__label,
.Select-option__value,
.Select-option__description {
display: block;
white-space: nowrap;
max-width: 100%;
overflow: hidden;
text-overflow: ellipsis;
line-height: 1.25;
}

.Select-option__label {
font-weight: 500;
}

.Select-option__value {
font-size: 0.8em;
}

.Select-option__description {
font-size: 0.9em;
}
}

Expand Down