Skip to content

Make storage class dropdown consistent #2869

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
openshift-merge-robot merged 1 commit into from
Oct 1, 2019
Merged

Make storage class dropdown consistent #2869

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions frontend/public/components/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,6 @@ $dropdown-background--hover: $color-pf-black-200; // pf-c-dropdown__menu-item--h
}
}

.co-storage-class-dropdown .pf-c-dropdown__menu {
min-width: 290px;
}

.dropdown-menu__autocomplete-filter {
max-height: 60vh;
overflow-x: hidden;
Expand Down
1 change: 1 addition & 0 deletions frontend/public/components/_resource.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
min-width: 18px;
padding: 1px 4px;
text-align: center;
white-space: nowrap;
&--lg {
font-size: ($font-size-base + 3);
line-height: 20px;
Expand Down
28 changes: 11 additions & 17 deletions frontend/public/components/utils/storage-class-dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ export class StorageClassDropdownInner extends React.Component<
</label>
<Dropdown
className="co-storage-class-dropdown"
dropDownClassName="dropdown--full-width"
autocompleteFilter={this.autocompleteFilter}
autocompletePlaceholder="Select storage class"
items={items}
Expand Down Expand Up @@ -189,28 +190,21 @@ const StorageClassDropdownEntry = (props) => {
];
const storageClassDescriptionLine = _.compact(storageClassProperties).join(' | ');
return (
<div className="form__storage-class-dropdown__flex-column">
<div className="form__storage-class-dropdown__flex-row">
<span className="form__storage-class-dropdown__icon-column">
<ResourceIcon kind={props.kindLabel} />
</span>{' '}
<span>{props.name}</span>
</div>
<div className="form__storage-class-dropdown__flex-row">
<div className="form__storage-class-dropdown__icon-column"> &nbsp;</div>
<div className="text-muted"> {storageClassDescriptionLine}</div>
</div>
</div>
<span className="co-resource-item">
<ResourceIcon kind={props.kindLabel} />
<span className="co-resource-item__resource-name">
{props.name}
<div className="text-muted small"> {storageClassDescriptionLine}</div>
</span>
</span>
);
};

const StorageClassDropdownNoStorageClassOption = (props) => {
return (
<div className="form__storage-class-dropdown__flex-column">
<div className="form__storage-class-dropdown__flex-row">
<span className="form__storage-class-dropdown__icon-column" /> <span>{props.name}</span>
</div>
</div>
<span className="co-resource-item">
<span className="co-resource-item__resource-name">{props.name}</span>
</span>
);
};

Expand Down
14 changes: 0 additions & 14 deletions frontend/public/style/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,6 @@
top: 1px;
}

.form__storage-class-dropdown__flex-column {
display: flex;
flex-direction: column;
}

.form__storage-class-dropdown__flex-row {
display: flex;
}

.form__storage-class-dropdown__icon-column {
flex-basis: 30px;
max-width: 30px;
}

.has-feedback .pf-c-form-control {
padding-right: 25px;
}
Expand Down