Skip to content
Snippets Groups Projects
Unverified Commit 8f3a30c5 authored by Nick Fitzpatrick's avatar Nick Fitzpatrick Committed by GitHub
Browse files

fix broken css rule, remove description from field table (#49286)

* fix broken css rule, remove description from field table

* adding back description
parent 3ed6cb81
No related branches found
No related tags found
No related merge requests found
......@@ -53,7 +53,8 @@
}
.itemBody {
display: flex 1 1 auto;
display: flex;
flex: 1 1 auto;
overflow: hidden;
}
......
......@@ -30,7 +30,7 @@ const ListItem = ({
<div className={S.itemIcons}>
{icon && <Icon className={S.chartIcon} name={icon} size={16} />}
</div>
<div className={S.itemBody}>
<div className={cx(S.itemBody, CS.flexColumn)}>
<div className={S.itemTitle}>
<Ellipsified tooltip={name}>{name}</Ellipsified>
</div>
......
......@@ -16,9 +16,12 @@ import { isTypeFK } from "metabase-lib/v1/types/utils/isa";
import F from "./Field.module.css";
const Field = ({ field, foreignKeys, url, icon, isEditing, formField }) => (
<div className={cx(S.item, CS.pt1, CS.borderTop)}>
<div className={S.itemBody} style={{ maxWidth: "100%", borderTop: "none" }}>
<div className={F.field}>
<div className={cx(S.item, CS.py1, CS.borderTop)}>
<div
className={cx(S.itemBody, CS.flexColumn)}
style={{ maxWidth: "100%", borderTop: "none" }}
>
<div className={F.field} style={{ flexGrow: "1" }}>
<div className={cx(S.itemTitle, F.fieldName)}>
{isEditing ? (
<input
......@@ -59,7 +62,7 @@ const Field = ({ field, foreignKeys, url, icon, isEditing, formField }) => (
optionSectionFn={o => o.section}
/>
) : (
<div className={CS.flex}>
<div className={cx(CS.flex, CS.alignCenter)}>
<div className={S.leftIcons}>
{icon && <Icon className={S.chartIcon} name={icon} size={20} />}
</div>
......@@ -83,7 +86,7 @@ const Field = ({ field, foreignKeys, url, icon, isEditing, formField }) => (
</div>
<div className={F.fieldDataType}>{field.base_type}</div>
</div>
<div className={cx(S.itemSubtitle, F.fieldSecondary, { [CS.mt1]: true })}>
<div className={cx(S.itemSubtitle, { [CS.mt1]: true })}>
<div className={F.fieldForeignKey}>
{isEditing
? (isTypeFK(formField.semantic_type.value) ||
......@@ -107,13 +110,12 @@ const Field = ({ field, foreignKeys, url, icon, isEditing, formField }) => (
</span>
)}
</div>
<div className={F.fieldOther} />
{field.description && (
<div className={cx(S.itemSubtitle, CS.mb2, { [CS.mt1]: isEditing })}>
{field.description}
</div>
)}
</div>
{field.description && (
<div className={cx(S.itemSubtitle, CS.mb2, { [CS.mt1]: isEditing })}>
{field.description}
</div>
)}
</div>
</div>
);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment