Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix Adaptive Cards text area & bump Adaptive Cards to 1.2.0 #2064

Merged
merged 12 commits into from
Jun 10, 2019
Merged

Fix Adaptive Cards text area & bump Adaptive Cards to 1.2.0 #2064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5df6b71
packages update with a little lint
Jun 3, 2019
2eb1109
Variable-ize one of the defaultStyleSetOptions props
Jun 5, 2019
c474429
Fix #1990 fontFamily from monospace to primaryFont
Jun 7, 2019
f0a2eec
Bump Adaptive Cards to latest
Jun 7, 2019
940a7b7
Fix styling of Adaptive Card textarea
Jun 7, 2019
689137b
Merge branch 'master' of https://github.com/Microsoft/BotFramework-We…
Jun 7, 2019
71848f7
Merge branch 'master' of https://github.com/Microsoft/BotFramework-We…
Jun 10, 2019
b7ec6be
Add test for Adaptive Card textarea
Jun 10, 2019
c64bb65
Merge branch 'master' into 1964-ac-update
corinagum Jun 10, 2019
56b3b85
Update CHANGELOG.md
Jun 10, 2019
102b63c
Merge branch '1964-ac-update' of https://github.com/corinagum/BotFram…
Jun 10, 2019
19ed1b5
Merge branch 'master' into 1964-ac-update
corinagum Jun 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fix [#1947](https://github.com/Microsoft/BotFramework-WebChat/issues/1947). Fix scrollbar in suggested action should be hidden in Firefox, remove gaps, and use style set for customizing `react-film`, by [@compulim](https://github.com/compulim) in PR [#1953](https://github.com/Microsoft/BotFramework-WebChat/pull/1953)
- Fix [#1948](https://github.com/Microsoft/BotFramework-WebChat/issues/1948). Fixed sample 17.chat-send-history to work with Firefox and Edge, by [@tdurnford](https://github.com/tdurnford) in PR [#1956](https://github.com/Microsoft/BotFramework-WebChat/pull/1956)
- Fix [#1304](https://github.com/Microsoft/BotFramework-WebChat/issues/1304). Move Adaptive Cards from component to bundle, by [@compulim](https://github.com/compulim) and [@corinagum](https://github.com/corinagum) in PR [#1936](https://github.com/Microsoft/BotFramework-WebChat/pull/1936)
- Fix [#1990](https://github.com/Microsoft/BotFramework-WebChat/issues/1990). Bump Adaptive Cards & fix textarea font-family from monospace to Web Chat's `primaryFont`, by [@corinagum](https://github.com/corinagum) in PR [#2064](https://github.com/Microsoft/BotFramework-WebChat/pull/2064)

## [4.3.0] - 2019-03-04

Expand Down
Binary file added ...ker/adaptive-cards-js-adaptive-card-textarea-should-not-be-monospace-1-snap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 21 additions & 19 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/bundle/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/bundle/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@babel/runtime": "^7.4.3",
"adaptivecards": "~1.1.3",
"adaptivecards": "~1.2.0",
"botframework-directlinejs": "^0.11.4",
"botframework-webchat-component": "0.0.0-0",
"botframework-webchat-core": "0.0.0-0",
Expand Down
8 changes: 6 additions & 2 deletions packages/bundle/src/adaptiveCards/Styles/StyleSet/AdaptiveCardRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
export default function({ accent, paddingRegular }) {
export default function({ accent, paddingRegular, primaryFont }) {
return {
'& .ac-pushButton': {
backgroundColor: 'White',
borderStyle: 'solid',
borderWidth: 1,
color: accent,
fontWeight: 'bold',
fontWeight: 600,
padding: paddingRegular
},

'& .ac-multichoiceInput': {
padding: paddingRegular
},

'& .ac-input, & .ac-inlineActionButton, & .ac-quickActionButton': {
fontFamily: primaryFont
}
};
}
2 changes: 1 addition & 1 deletion packages/component/src/Styles/defaultStyleOptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const DEFAULT_OPTIONS = {
backgroundColor: 'White',
cardEmphasisBackgroundColor: '#F0F0F0',
paddingRegular: PADDING_REGULAR,
paddingWide: 20,
paddingWide: PADDING_REGULAR * 2,
subtle: DEFAULT_SUBTLE,

// Word break
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"not op_mini all"
],
"dependencies": {
"adaptivecards": "~1.1.3",
"adaptivecards": "~1.2.0",
"botframework-directlinejs": "^0.11.4",
"botframework-webchat": "0.0.0-0",
"botframework-webchat-component": "0.0.0-0",
Expand Down