Skip to content

Commit

Permalink
Merge pull request #3887 from terrestris/propertygrid-css
Browse files Browse the repository at this point in the history
fix: adjust some css nesting, allows for use of the table scroll property without breaking the css
  • Loading branch information
simonseyock committed Jun 11, 2024
2 parents 979ae0e + c7cc92c commit 6a082ad
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
46 changes: 23 additions & 23 deletions src/Grid/PropertyGrid/PropertyGrid.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,36 @@
height: 100%;
display: flex;
flex-direction: column;
}
}

.ant-table {
flex: 1;
.ant-table {
flex: 1;

.ant-table-fixed-header .ant-table-header {
margin-bottom: inherit !important; // Inline style from antd
padding-bottom: inherit !important; // Inline style from antd
}
.ant-table-fixed-header .ant-table-header {
margin-bottom: inherit !important; // Inline style from antd
padding-bottom: inherit !important; // Inline style from antd
}

.ant-table-content {
height: 100%;
display: flex;
flex-direction: column;
.ant-table-container {
height: 100%;
display: flex;
flex-direction: column;

.ant-table-header {
overflow: inherit;
}
.ant-table-header {
overflow: inherit;
}

.ant-table-body {
overflow: auto;
}
.ant-table-body {
overflow: auto;
}

.ant-table-cell {
padding: 4px;
}
.ant-table-cell {
padding: 4px;
}

th {
text-align: center;
}
}
th {
text-align: center;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Grid/PropertyGrid/PropertyGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ interface OwnProps {
attributeNameColumnTitle?: string;
/**
* Value in percent representing the width of the attribute name column
* The width of attribute value column wil be calculated depending in this
* The width of the attribute value column will be calculated based on this
*/
attributeNameColumnWidthInPercent?: number;
/**
Expand Down

0 comments on commit 6a082ad

Please sign in to comment.