Merge pull request #1 from microsoft/master

Merging Microsoft/AdaptiveCards master into Identifier/AdaptiveCards master
Identifier · Jul 30, 2019 · e11621b · e11621b
2 parents 03d14bd + 28bd5a9
commit e11621b
Show file tree

Hide file tree

Showing 472 changed files with 50,118 additions and 22,585 deletions.
diff --git a/samples/HostConfig/sample.json b/samples/HostConfig/sample.json
@@ -1,12 +1,11 @@
 {
- "preExpandSingleShowCardAction": false,
  "spacing": {
  "small": 3,
  "default": 8,
  "medium": 20,
  "large": 30,
  "extraLarge": 40,
- "padding": 20
+ "padding": 10
  },
  "separator": {
  "lineThickness": 1,
@@ -15,7 +14,7 @@
  "supportsInteractivity": true,
  "fontTypes": {
  "default": {
- "fontFamily": "'Segoe UI', Tahoma, Geneva, Verdana, sans-serif",
+ "fontFamily": "'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif",
  "fontSizes": {
  "small": 12,
  "default": 14,
@@ -47,200 +46,184 @@
  },
  "containerStyles": {
  "default": {
+ "backgroundColor": "#FFFFFF",
  "foregroundColors": {
  "default": {
- "default": "#ffffffff",
- "subtle": "#bfffffff"
- },
- "dark": {
- "default": "#ff201f1f",
- "subtle": "#ff2d2c2c"
- },
- "light": {
- "default": "#ffffffff",
- "subtle": "#bfffffff"
+ "default": "#000000",
+ "subtle": "#767676"
  },
  "accent": {
- "default": "#ffa6a7dc",
- "subtle": "#ff8b8cc7"
+ "default": "#0063B1",
+ "subtle": "#0063B1"
+ },
+ "attention": {
+ "default": "#FF0000",
+ "subtle": "#DDFF0000"
  },
  "good": {
- "default": "#ff92c353",
- "subtle": "#e592c353"
+ "default": "#54a254",
+ "subtle": "#DD54a254"
  },
  "warning": {
- "default": "#fff8d22a",
- "subtle": "#e5f8d22a"
- },
- "attention": {
- "default": "#ffd74654",
- "subtle": "#e5d74654"
+ "default": "#c3ab23",
+ "subtle": "#DDc3ab23"
  }
- },
- "backgroundColor": "#ff2d2c2c"
+ }
  },
  "emphasis": {
+ "backgroundColor": "#F0F0F0",
  "foregroundColors": {
  "default": {
- "default": "#ffffffff",
- "subtle": "#bfffffff"
- },
- "dark": {
- "default": "#ff201f1f",
- "subtle": "#ff2d2c2c"
- },
- "light": {
- "default": "#ffffffff",
- "subtle": "#bfffffff"
+ "default": "#000000",
+ "subtle": "#767676"
  },
  "accent": {
- "default": "#ffa6a7dc",
- "subtle": "#ff8b8cc7"
+ "default": "#2E89FC",
+ "subtle": "#882E89FC"
+ },
+ "attention": {
+ "default": "#FF0000",
+ "subtle": "#DDFF0000"
  },
  "good": {
- "default": "#ff92c353",
- "subtle": "#e592c353"
+ "default": "#54a254",
+ "subtle": "#DD54a254"
  },
  "warning": {
- "default": "#fff8d22a",
- "subtle": "#e5f8d22a"
- },
- "attention": {
- "default": "#ffd74654",
- "subtle": "#e5d74654"
+ "default": "#c3ab23",
+ "subtle": "#DDc3ab23"
  }
- },
- "backgroundColor": "#ff292828"
+ }
  },
  "accent": {
  "backgroundColor": "#C7DEF9",
  "foregroundColors": {
  "default": {
- "default": "#ff201f1f",
- "subtle": "#ff2d2c2c"
+ "default": "#333333",
+ "subtle": "#EE333333"
  },
  "dark": {
- "default": "#ff201f1f",
- "subtle": "#ff2d2c2c"
+ "default": "#000000",
+ "subtle": "#66000000"
  },
  "light": {
- "default": "#ffffffff",
- "subtle": "#bfffffff"
+ "default": "#FFFFFF",
+ "subtle": "#33000000"
  },
  "accent": {
- "default": "#ffa6a7dc",
- "subtle": "#ff8b8cc7"
+ "default": "#2E89FC",
+ "subtle": "#882E89FC"
+ },
+ "attention": {
+ "default": "#cc3300",
+ "subtle": "#DDcc3300"
  },
  "good": {
- "default": "#ff92c353",
- "subtle": "#e592c353"
+ "default": "#54a254",
+ "subtle": "#DD54a254"
  },
  "warning": {
- "default": "#fff8d22a",
- "subtle": "#e5f8d22a"
- },
- "attention": {
- "default": "#ffd74654",
- "subtle": "#e5d74654"
+ "default": "#e69500",
+ "subtle": "#DDe69500"
  }
  }
  },
  "good": {
  "backgroundColor": "#CCFFCC",
  "foregroundColors": {
  "default": {
- "default": "#ff201f1f",
- "subtle": "#ff2d2c2c"
+ "default": "#333333",
+ "subtle": "#EE333333"
  },
  "dark": {
- "default": "#ff201f1f",
- "subtle": "#ff2d2c2c"
+ "default": "#000000",
+ "subtle": "#66000000"
  },
  "light": {
- "default": "#ffffffff",
- "subtle": "#bfffffff"
+ "default": "#FFFFFF",
+ "subtle": "#33000000"
  },
  "accent": {
- "default": "#ffa6a7dc",
- "subtle": "#ff8b8cc7"
+ "default": "#2E89FC",
+ "subtle": "#882E89FC"
+ },
+ "attention": {
+ "default": "#cc3300",
+ "subtle": "#DDcc3300"
  },
  "good": {
- "default": "#ff92c353",
- "subtle": "#e592c353"
+ "default": "#54a254",
+ "subtle": "#DD54a254"
  },
  "warning": {
- "default": "#fff8d22a",
- "subtle": "#e5f8d22a"
- },
- "attention": {
- "default": "#ffd74654",
- "subtle": "#e5d74654"
+ "default": "#e69500",
+ "subtle": "#DDe69500"
  }
  }
  },
  "attention": {
  "backgroundColor": "#FFC5B2",
  "foregroundColors": {
  "default": {
- "default": "#ff201f1f",
- "subtle": "#ff2d2c2c"
+ "default": "#333333",
+ "subtle": "#EE333333"
  },
  "dark": {
- "default": "#ff201f1f",
- "subtle": "#ff2d2c2c"
+ "default": "#000000",
+ "subtle": "#66000000"
  },
  "light": {
- "default": "#ffffffff",
- "subtle": "#bfffffff"
+ "default": "#FFFFFF",
+ "subtle": "#33000000"
  },
  "accent": {
- "default": "#ffa6a7dc",
- "subtle": "#ff8b8cc7"
+ "default": "#2E89FC",
+ "subtle": "#882E89FC"
+ },
+ "attention": {
+ "default": "#cc3300",
+ "subtle": "#DDcc3300"
  },
  "good": {
- "default": "#ff92c353",
- "subtle": "#e592c353"
+ "default": "#54a254",
+ "subtle": "#DD54a254"
  },
  "warning": {
- "default": "#fff8d22a",
- "subtle": "#e5f8d22a"
- },
- "attention": {
- "default": "#ffd74654",
- "subtle": "#e5d74654"
+ "default": "#e69500",
+ "subtle": "#DDe69500"
  }
  }
  },
  "warning": {
  "backgroundColor": "#FFE2B2",
  "foregroundColors": {
  "default": {
- "default": "#ff201f1f",
- "subtle": "#ff2d2c2c"
+ "default": "#333333",
+ "subtle": "#EE333333"
  },
  "dark": {
- "default": "#ff201f1f",
- "subtle": "#ff2d2c2c"
+ "default": "#000000",
+ "subtle": "#66000000"
  },
  "light": {
- "default": "#ffffffff",
- "subtle": "#bfffffff"
+ "default": "#FFFFFF",
+ "subtle": "#33000000"
  },
  "accent": {
- "default": "#ffa6a7dc",
- "subtle": "#ff8b8cc7"
+ "default": "#2E89FC",
+ "subtle": "#882E89FC"
+ },
+ "attention": {
+ "default": "#cc3300",
+ "subtle": "#DDcc3300"
  },
  "good": {
- "default": "#ff92c353",
- "subtle": "#e592c353"
+ "default": "#54a254",
+ "subtle": "#DD54a254"
  },
  "warning": {
- "default": "#fff8d22a",
- "subtle": "#e5f8d22a"
- },
- "attention": {
- "default": "#ffd74654",
- "subtle": "#e5d74654"
+ "default": "#e69500",
+ "subtle": "#DDe69500"
  }
  }
  }
@@ -253,14 +236,13 @@
  "actions": {
  "maxActions": 5,
  "spacing": "default",
- "buttonSpacing": 20,
+ "buttonSpacing": 8,
  "showCard": {
  "actionMode": "inline",
- "inlineTopMargin": 16,
- "style": "emphasis"
+ "inlineTopMargin": 8
  },
  "actionsOrientation": "horizontal",
- "actionAlignment": "left"
+ "actionAlignment": "stretch"
  },
  "adaptiveCard": {
  "allowCustomStyle": false
@@ -285,6 +267,6 @@
  "weight": "default",
  "wrap": true
  },
- "spacing": 10
+ "spacing": 8
  }
 }
diff --git a/samples/v1.0/Elements/FactSet.Markdown.json b/samples/v1.0/Elements/FactSet.Markdown.json
@@ -0,0 +1,22 @@
+{
+ "$schema": "http:https://adaptivecards.io/schemas/adaptive-card.json",
+ "type": "AdaptiveCard",
+ "version": "1.0",
+ "body": [
+
+ {
+ "type": "Container",
+ "items": [
+ {
+ "type": "FactSet",
+ "facts": [
+ {
+ "title": "Test Markdown Link :",
+ "value": "This is a [Link](https://adaptivecards.io)"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}