Merge branch 'master' into bug/3500-missing-name-for-primitives

This commit is contained in:
Kyle
2017-08-04 16:27:35 -07:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -59,7 +59,7 @@ export default class ObjectModel extends Component {
}
<span className="inner-object">
{
<table className="model" style={{ marginLeft: "2em" }}><tbody>
<table className="model"><tbody>
{
!description ? null : <tr style={{ color: "#999", fontStyle: "italic" }}>
<td>description:</td>

View File

@@ -19,8 +19,8 @@ table
&:first-of-type
{
width: 100px;
padding: 0;
width: 124px;
padding: 0 0 0 2em;
}
}
}