Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1019 from influxdata/admin-polish 

Admin Polish
pull/1034/head
Andrew Watkins 2017-03-15 08:38:05 -07:00 committed by GitHub
parent 9a3f46a6e1 71393f4c60
commit 9e36c82d51
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/src/admin/components/FilterBar.js
View File

@ -23,13 +23,16 @@ class FilterBar extends Component {
render() {
const {type, isEditing, onClickCreate} = this.props
const placeholderText = type.replace(/\w\S*/g, function(txt) {
return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
});
return (
<div className="panel-heading u-flex u-ai-center u-jc-space-between">
<div className="users__search-widget input-group admin__search-widget">
<input
type="text"
className="form-control"
placeholder={`Filter ${type}...`}
placeholder={`Filter ${placeholderText}...`}
value={this.state.filterText}
onChange={this.handleText}
/>
@ -37,7 +40,7 @@ class FilterBar extends Component {
<span className="icon search" aria-hidden="true"></span>
</div>
</div>
<button className="btn btn-primary" disabled={isEditing} onClick={() => onClickCreate(type)}>Create {type.substring(0, type.length - 1)}</button>
<button className="btn btn-primary" disabled={isEditing} onClick={() => onClickCreate(type)}>Create {placeholderText.substring(0, placeholderText.length - 1)}</button>
</div>
)
}

4
ui/src/shared/components/MultiSelectDropdown.js
View File

@ -97,9 +97,9 @@ class MultiSelectDropdown extends Component {
return (
<div className="dropdown-options">
<li className="multi-select-dropdown__apply" onClick={this.onApplyFunctions} style={{listStyle: 'none'}}>
<div className="multi-select-dropdown__apply" onClick={this.onApplyFunctions} style={{listStyle: 'none'}}>
<div className="btn btn-xs btn-info btn-block">Apply</div>
</li>
</div>
<ul className="dropdown-menu multi-select-dropdown__menu" aria-labelledby="dropdownMenu1">
{items.map((listItem, i) => {
return (

7
ui/src/style/pages/admin.scss
View File

@ -81,6 +81,7 @@
.caret {opacity: 0;}
.multi-select-dropdown__label {left: 0;}
}
.open .dropdown-toggle .multi-select-dropdown__label {left: 9px;}
tbody tr:hover {
.admin-table--delete {
visibility: visible;
@ -99,6 +100,12 @@
}
}
}
.multi-select-dropdown.open .dropdown-toggle {
color: $g20-white !important;
background-color: $c-laser !important;
font-weight: 600;
.multi-select-dropdown__label {left: 9x !important;}
}
}
.admin-table--edit-row {
background-color: $g4-onyx;