Skip to content

Commit

Permalink
Merge pull request openshift#2319 from rhamilto/role-rule-filter-fix
Browse files Browse the repository at this point in the history
Fix Role Rules filter bar layout bug
  • Loading branch information
rhamilto authored May 10, 2018
2 parents 0cf53ce + 97c9fb3 commit f1c3c86
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 4 additions & 2 deletions frontend/public/components/RBAC/role.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,13 @@ class Details extends React.Component {
</div>
<Heading text="Rules" />
<div className="co-m-pane__body">
<div className="row">
<div className="col-xs-12">
<div className="co-m-pane__filter-bar co-m-pane__filter-bar--alt">
<div className="co-m-pane__filter-bar-group">
<Link to={addHref(name, namespace)}>
<button className="btn btn-primary">Add Rule</button>
</Link>
</div>
<div className="co-m-pane__filter-bar-group co-m-pane__filter-bar-group--filter">
<TextFilter label="Rules by action or resource" onChange={this.changeFilter} />
</div>
</div>
Expand Down
6 changes: 6 additions & 0 deletions frontend/public/style/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
}
}

.co-m-pane__filter-bar--alt {
padding-left: 0;
padding-right: 0;
padding-top: 0;
}

.co-m-pane__filter-bar-group {
display: flex;
flex: 1 1 auto;
Expand Down

0 comments on commit f1c3c86

Please sign in to comment.