Skip to content

Commit

Permalink
Merge pull request #35 from microsoft/develop
Browse files Browse the repository at this point in the history
dev to master for release 1.1.5
  • Loading branch information
psmacmur authored May 23, 2019
2 parents f9328c4 + 28b03c1 commit 11b86ff
Show file tree
Hide file tree
Showing 15 changed files with 1,596 additions and 1,733 deletions.
95 changes: 77 additions & 18 deletions capabilities.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
}
}
],
"dataReductionAlgorithm": {"window": {"count": 20000}}
"dataReductionAlgorithm": { "window": { "count": 20000 } }
},
"rowCount": {
"preferred": {
Expand All @@ -176,13 +176,6 @@
"objects": {
"presentation": {
"properties": {
"shadow": {
"displayName": "Shadow",
"description": "Control the style of border around cards.",
"type": {
"bool": "true"
}
},
"dateFormat": {
"displayName": "Date Format",
"description": "Subtitle date format using tokens; e.g. YYYY MM DD h:mm:ss",
Expand All @@ -197,13 +190,6 @@
"text": " \u2022 "
}
},
"showImageOnBack": {
"description": "Whether to show Title Images on the card's MetaData face",
"displayName": "Title Image on MetaData",
"type": {
"bool": "true"
}
},
"cardWidth": {
"displayName": "Card Width",
"description": "Width, in pixels, of each card",
Expand Down Expand Up @@ -231,6 +217,27 @@
"type": {
"bool": true
}
},
"shadow": {
"displayName": "Shadow",
"description": "Control the style of border around cards.",
"type": {
"bool": "true"
}
},
"fade": {
"displayName": "Fade Text",
"description": "Fade text toward the bottom of the card",
"type": {
"bool": "true"
}
},
"showImageOnBack": {
"description": "Whether to show Title Images on the card's MetaData face",
"displayName": "Title Image on MetaData",
"type": {
"bool": "true"
}
}
},
"displayName": "Cards"
Expand Down Expand Up @@ -265,6 +272,58 @@
},
"displayName": "Reader"
},
"metadata": {
"properties": {
"fontSize": {
"description": "MetaData text size",
"displayName": "Text Size",
"type": {
"formatting": {
"fontSize": true
}
}
},
"titleFontFamily": {
"displayName": "Title font family",
"type": {
"formatting": {
"fontFamily": true
}
}
},
"valueFontFamily": {
"displayName": "Value font family",
"type": {
"formatting": {
"fontFamily": true
}
}
},
"titleColor": {
"description": "Color for the row titles",
"displayName": "Titles Color",
"type": {
"fill": {
"solid": {
"color": "#bbb"
}
}
}
},
"valueColor": {
"description": "Color for the MetaData values",
"displayName": "Values Color",
"type": {
"fill": {
"solid": {
"color": "#000"
}
}
}
}
},
"displayName": "MetaData Format"
},
"flipState": {
"properties": {
"show": {
Expand All @@ -279,8 +338,8 @@
"displayName": "Card Face",
"type": {
"enumeration": [
{"value": "preview", "displayName": "Preview"},
{"value": "metadata", "displayName": "MetaData"}
{ "value": "preview", "displayName": "Preview" },
{ "value": "metadata", "displayName": "MetaData" }
]
}
}
Expand Down Expand Up @@ -314,4 +373,4 @@
},
"suppressDefaultTitle": true,
"supportsHighlight": false
}
}
Loading

0 comments on commit 11b86ff

Please sign in to comment.