Merge branch 'master' into master

This commit is contained in:
conorlennon
2017-11-17 09:37:35 +00:00
committed by GitHub
3 changed files with 7 additions and 2 deletions

View File

@@ -70,7 +70,7 @@
"react-motion": "^0.5.2", "react-motion": "^0.5.2",
"react-object-inspector": "0.2.1", "react-object-inspector": "0.2.1",
"react-redux": "^4.x.x", "react-redux": "^4.x.x",
"react-split-pane": "0.1.57", "react-split-pane": "0.1.70",
"redux": "^3.x.x", "redux": "^3.x.x",
"redux-immutable": "3.0.8", "redux-immutable": "3.0.8",
"redux-logger": "*", "redux-logger": "*",

View File

@@ -76,13 +76,14 @@ export default class ObjectModel extends Component {
{ {
!(properties && properties.size) ? null : properties.entrySeq().map( !(properties && properties.size) ? null : properties.entrySeq().map(
([key, value]) => { ([key, value]) => {
let isDeprecated = isOAS3() && value.get("deprecated")
let isRequired = List.isList(requiredProperties) && requiredProperties.contains(key) let isRequired = List.isList(requiredProperties) && requiredProperties.contains(key)
let propertyStyle = { verticalAlign: "top", paddingRight: "0.2em" } let propertyStyle = { verticalAlign: "top", paddingRight: "0.2em" }
if ( isRequired ) { if ( isRequired ) {
propertyStyle.fontWeight = "bold" propertyStyle.fontWeight = "bold"
} }
return (<tr key={key}> return (<tr key={key} className={isDeprecated && "deprecated"}>
<td style={ propertyStyle }> <td style={ propertyStyle }>
{ key }{ isRequired && <span style={{ color: "red" }}>*</span> } { key }{ isRequired && <span style={{ color: "red" }}>*</span> }
</td> </td>

View File

@@ -12,6 +12,10 @@
{ {
color: $model-deprecated-font-color !important; color: $model-deprecated-font-color !important;
} }
> td:first-of-type {
text-decoration: line-through;
}
} }
&-toggle &-toggle
{ {