Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 35 additions & 3 deletions playground/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,7 @@
line-height: 1.33;
letter-spacing: 0.5px;
color: #003b5c;
text-align:left !important;
}


Expand Down Expand Up @@ -1468,8 +1469,40 @@
padding:16px 0px 16px 16px !important;
font-weight: bold;
background-color: #f5f7f7;
border: solid 1px #bdc1c5 !important;
border-right-style:hidden !important;
border: solid 1px #bdc1c5;
}

.customTable-expandedContent {
margin: 12px;
background-color: #ffffff;
}

.customTable-expandedItems {
font-family: Muli , sans-serif;
font-size: 12px;
font-stretch: normal;
font-style: normal;
line-height: 1.33;
letter-spacing: 0.5px;
color: #003b5c;
}

.customTable-itemHeading {
font-weight: bold;
padding: 8px;
}

#root_procedureCodes .react-bs-table .table-bordered>thead>tr:first-child>td, .react-bs-table .table-bordered>thead>tr:first-child>th {
background-color: #f5f7f7;
border: solid 1px #dadada !important;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these !important necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, There are most of the places having border css. To fix that we need to put important

border-right-style: hidden !important;
border-bottom-width: 0px !important;
}

#root_procedureCodes .react-bs-table .table-bordered>tbody>tr >td:first-child {
background-color: #ffffff;
border: solid 1px #dadada !important;
border-right-style: hidden !important;
border-bottom-width: 0px !important;
}

Expand All @@ -1479,4 +1512,3 @@
margin: 0px 0 0px 26px;
object-fit: contain;
}

4 changes: 2 additions & 2 deletions src/table/columnHeadersFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ const toDataFormat = (fieldProp, fieldUIProp, defaultFilterKey) => {
fieldUIProp !== undefined &&
fieldUIProp.columnCustomFormat !== undefined
) {
if (fieldUIProp.columnCustomFormat === "description") {
return (_, row) => `${row.code}-${row.description}`;
if (fieldUIProp.columnCustomFormat === "combineCodeAndDesc") {
return (_, row) => `${row.code} - ${row.description}`;
}
let columnCustomFormat = JSON.parse(fieldUIProp.columnCustomFormat);
let funcBody = JSON.parse(
Expand Down
10 changes: 5 additions & 5 deletions src/table/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ class TableField extends Component {
});
return (
isComponentDataAvailable && (
<div className="expandedItems">
<span className="itemHeading">{title} :</span>
<div className="customTable-expandedItems">
<span className="customTable-itemHeading">{title} :</span>
<br />
<ul>{tableListData}</ul>
</div>
Expand All @@ -333,8 +333,8 @@ class TableField extends Component {
});
return (
isComponentDataAvailable && (
<div className="expandedItems">
<span className="itemHeading">{title} :</span>
<div className="customTable-expandedItems">
<span className="customTable-itemHeading">{title} :</span>
<br />
<ul>{tableListData}</ul>
</div>
Expand All @@ -343,7 +343,7 @@ class TableField extends Component {
}
}
});
return <div className="expandedContent">{tableList}</div>;
return <div className="customTable-expandedContent">{tableList}</div>;
}
expandColumnComponent({ isExpandableRow, isExpanded }) {
let icon = <span className={`fa fa-plus glyphicon`} />;
Expand Down