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.

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

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

Merged
merged 12 commits into from
Jun 10, 2019
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

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

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
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
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
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

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
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