-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adaptive Cards 1.0 #849
Merged
eanders-ms
merged 20 commits into
microsoft:master
from
compulim:adaptivecards-1.0-rebased
Mar 3, 2018
Merged
Adaptive Cards 1.0 #849
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
ad3789b
Update to AdaptiveCards 1.0
danmarshall 6975b14
new hostconfig schema
danmarshall 9fa3121
removed cast to any
danmarshall e9eb722
removed carat
danmarshall 0280752
update to beta5
danmarshall c125aaa
vertical buttons
danmarshall 9ed5421
update to beta9
danmarshall 221077c
rename fontColors to foregroundColors
danmarshall 04fe92e
use native AdaptiveCards lib
danmarshall e7ed11d
rename interface
danmarshall b7bdf9b
removed comment
danmarshall 2d375db
set maxActions to 100
danmarshall c7f295a
default version to 0.5
danmarshall f6e097e
Fix broken build
compulim 915574f
Fix broken test
compulim fc7b6bd
Expose HostConfig in React props
compulim 0df032e
Add hostconfig test
compulim 452de5c
Update package-lock.json
compulim 559f974
Update README.md
compulim a39918f
Update README.md
compulim File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,174 +1,121 @@ | ||
| { | ||
| "supportsInteractivity": true, | ||
| "strongSeparation": { | ||
| "spacing": 40, | ||
| "spacing": { | ||
| "small": 4, | ||
| "default": 8, | ||
| "medium": 16, | ||
| "large": 24, | ||
| "extraLarge": 32, | ||
| "padding": 8 | ||
| }, | ||
| "separator": { | ||
| "lineThickness": 1, | ||
| "lineColor": "#eeeeee" | ||
| "lineColor": "#cccccc" | ||
| }, | ||
| "fontFamily": "\"Segoe UI\", sans-serif", | ||
| "fontSizes": { | ||
| "small": 12, | ||
| "normal": 13, | ||
| "default": 13, | ||
| "medium": 15, | ||
| "large": 17, | ||
| "extraLarge": 19 | ||
| }, | ||
| "fontWeights": { | ||
| "lighter": 200, | ||
| "normal": 400, | ||
| "default": 400, | ||
| "bolder": 700 | ||
| }, | ||
| "colors": { | ||
| "dark": { | ||
| "normal": "#000000", | ||
| "subtle": "#808c95" | ||
| }, | ||
| "light": { | ||
| "normal": "#ffffff", | ||
| "subtle": "#88ffff" | ||
| }, | ||
| "accent": { | ||
| "normal": "#2e89fc", | ||
| "subtle": "#802E8901" | ||
| }, | ||
| "attention": { | ||
| "normal": "#ffd800", | ||
| "subtle": "#CCFFD800" | ||
| }, | ||
| "good": { | ||
| "normal": "#00ff00", | ||
| "subtle": "#CC00FF00" | ||
| "containerStyles": { | ||
| "default": { | ||
| "backgroundColor": "#00000000", | ||
| "foregroundColors": { | ||
| "default": { | ||
| "default": "#000000", | ||
| "subtle": "#808c95" | ||
| }, | ||
| "accent": { | ||
| "default": "#2e89fc", | ||
| "subtle": "#802E8901" | ||
| }, | ||
| "attention": { | ||
| "default": "#ffd800", | ||
| "subtle": "#CCFFD800" | ||
| }, | ||
| "good": { | ||
| "default": "#00ff00", | ||
| "subtle": "#CC00FF00" | ||
| }, | ||
| "warning": { | ||
| "default": "#ff0000", | ||
| "subtle": "#CCFF0000" | ||
| } | ||
| } | ||
| }, | ||
| "warning": { | ||
| "normal": "#ff0000", | ||
| "subtle": "#CCFF0000" | ||
| "emphasis": { | ||
| "backgroundColor": "#08000000", | ||
| "foregroundColors": { | ||
| "default": { | ||
| "default": "#333333", | ||
| "subtle": "#EE333333" | ||
| }, | ||
| "accent": { | ||
| "default": "#2e89fc", | ||
| "subtle": "#882E89FC" | ||
| }, | ||
| "attention": { | ||
| "default": "#cc3300", | ||
| "subtle": "#DDCC3300" | ||
| }, | ||
| "good": { | ||
| "default": "#54a254", | ||
| "subtle": "#DD54A254" | ||
| }, | ||
| "warning": { | ||
| "default": "#e69500", | ||
| "subtle": "#DDE69500" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "imageSizes": { | ||
| "small": 40, | ||
| "medium": 64, | ||
| "large": 96 | ||
| "medium": 80, | ||
| "large": 160 | ||
| }, | ||
| "actions": { | ||
| "maxActions": 100, | ||
| "separation": { | ||
| "spacing": 8 | ||
| }, | ||
| "spacing": "default", | ||
| "buttonSpacing": 8, | ||
| "stretch": false, | ||
| "showCard": { | ||
| "actionMode": "inlineEdgeToEdge", | ||
| "inlineTopMargin": 16, | ||
| "backgroundColor": "#00000000", | ||
| "padding": { | ||
| "top": 8, | ||
| "right": 8, | ||
| "bottom": 8, | ||
| "left": 8 | ||
| } | ||
| "actionMode": "inline", | ||
| "inlineTopMargin": 8 | ||
| }, | ||
| "actionsOrientation": "vertical", | ||
| "actionAlignment": "left" | ||
| "actionAlignment": "stretch" | ||
| }, | ||
| "adaptiveCard": { | ||
| "backgroundColor": "#00000000", | ||
| "padding": { | ||
| "left": 8, | ||
| "top": 8, | ||
| "right": 8, | ||
| "bottom": 8 | ||
| } | ||
| }, | ||
| "container": { | ||
| "separation": { | ||
| "spacing": 8 | ||
| }, | ||
| "normal": { | ||
| "backgroundColor": "#00000000" | ||
| }, | ||
| "emphasis": { | ||
| "backgroundColor": "#eeeeee", | ||
| "borderColor": "#aaaaaa", | ||
| "borderThickness": { | ||
| "top": 1, | ||
| "right": 1, | ||
| "bottom": 1, | ||
| "left": 1 | ||
| }, | ||
| "padding": { | ||
| "top": 8, | ||
| "right": 8, | ||
| "bottom": 8, | ||
| "left": 8 | ||
| } | ||
| } | ||
| }, | ||
| "textBlock": { | ||
| "color": "dark", | ||
| "separations": { | ||
| "small": { | ||
| "spacing": 8 | ||
| }, | ||
| "normal": { | ||
| "spacing": 8 | ||
| }, | ||
| "medium": { | ||
| "spacing": 8 | ||
| }, | ||
| "large": { | ||
| "spacing": 8 | ||
| }, | ||
| "extraLarge": { | ||
| "spacing": 8 | ||
| } | ||
| } | ||
| }, | ||
| "image": { | ||
| "size": "medium", | ||
| "separation": { | ||
| "spacing": 8 | ||
| } | ||
| "allowCustomStyle": false | ||
| }, | ||
| "imageSet": { | ||
| "imageSize": "medium", | ||
| "separation": { | ||
| "spacing": 8 | ||
| } | ||
| "maxImageHeight": 100 | ||
| }, | ||
| "factSet": { | ||
| "separation": { | ||
| "spacing": 8 | ||
| }, | ||
| "title": { | ||
| "color": "dark", | ||
| "size": "normal", | ||
| "color": "default", | ||
| "size": "default", | ||
| "isSubtle": false, | ||
| "weight": "bolder", | ||
| "wrap": true, | ||
| "maxWidth": 150 | ||
| }, | ||
| "value": { | ||
| "color": "dark", | ||
| "size": "normal", | ||
| "color": "default", | ||
| "size": "default", | ||
| "isSubtle": false, | ||
| "weight": "normal", | ||
| "weight": "default", | ||
| "wrap": true | ||
| }, | ||
| "spacing": 8 | ||
| }, | ||
| "input": { | ||
| "separation": { | ||
| "spacing": 8 | ||
| } | ||
| }, | ||
| "columnSet": { | ||
| "separation": { | ||
| "spacing": 8 | ||
| } | ||
| }, | ||
| "column": { | ||
| "separation": { | ||
| "spacing": 8 | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
adaptivecards beta09 still seem to use "normal" instead of "default". It was changed in later versions of adaptive cards. Colours in current scheme will be defaulted to black as as properties will not match.