un-inline stuff

pull/1400/head
Rick Carlino 2019-08-28 16:47:10 -05:00
parent 26cb7973f0
commit fa44f39cf3
4 changed files with 15 additions and 14 deletions

View File

@ -58,20 +58,21 @@ export const ModeDropdown = (props: ModeDropdownProps) =>
}))}
selectedItem={{ label: MODES()[props.value], value: props.value }}
list={PIN_MODES()} />;
type ButtonProps =
React.ButtonHTMLAttributes<HTMLButtonElement>;
interface DeleteButtonProps {
interface DeleteButtonProps extends ButtonProps {
dispatch: Function;
uuid: UUID;
children?: React.ReactChild
onDestroy?: Function;
style?: React.CSSProperties;
}
export const DeleteButton = (props: DeleteButtonProps) =>
<button
{...props}
className="red fb-button del-button"
title={t("Delete")}
style={props.style || {}}
onClick={() =>
props.dispatch(destroy(props.uuid))
.then(props.onDestroy || (() => { }))}>

View File

@ -205,13 +205,17 @@
.group-item-count {
@extend .plant-search-item-age;
padding-top: 0.6rem;
// .groups-panel-content padding should be 0
// on the groups list panel, but stay the
// same on the group details panel.
}
.groups-panel-content {
padding: 0px;
}
.groups-list-wrapper {
padding: 0.5em 0em;
}
.groups-delete-btn {
float: left;
margin-top: 1em;
}
.plant-search-item-name {
display: inline-block;
vertical-align: middle;

View File

@ -49,11 +49,7 @@ export const LittleIcon =
onMouseEnter={() => dispatch(toggleHoveredPlant(plantUUID, icon))}
onMouseLeave={() => dispatch(toggleHoveredPlant(undefined, icon))}
onClick={() => dispatch(removePoint(group, body.id || 0))}>
<img
src={icon}
alt={p.body.name}
width={32}
height={32} />
<img src={icon} alt={p.body.name} width={32} height={32} />
</span>;
};
@ -134,11 +130,11 @@ export class GroupDetailActive extends React.Component<GroupDetailActiveProps, S
<p>
{t("Click plants in map to add or remove.")}
</p>
<div style={{ padding: "0.5em 0em" }}>
<div className="groups-list-wrapper">
{this.icons}
</div>
<DeleteButton
style={{ float: "left", marginTop: "1em" }}
className="groups-delete-btn"
dispatch={this.props.dispatch}
uuid={group.uuid}
onDestroy={history.back}>

View File

@ -16,7 +16,7 @@ export function GroupInventoryItem(props: GroupInventoryItemProps) {
<span className="plant-search-item-name">
{props.group.body.name}
</span>
<i className="group-search-item">
<i className="group-item-count">
{t("{{count}} items", { count: props.group.body.point_ids.length })}
</i>
</div>;