apply theme to adaptive cards (#1299)

* update segoe font * apply theme to adaptive cards * bump webchat
microsoft · Feb 5, 2019 · 520029d · 520029d
1 parent 04e0339
commit 520029d
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/app/client/package.json b/packages/app/client/package.json
@@ -102,7 +102,7 @@
     "@uifabric/styling": "^5.20.0",
     "base64url": "2.0.0",
     "botframework-config": "4.0.0-preview1.3.4",
-    "botframework-webchat": "4.2.1-master.17b253d",
+    "botframework-webchat": "4.2.1-master.9d738b7",
     "eslint-plugin-react": "7.12.3",
     "react": "~16.3.2",
     "react-dom": "~16.3.2",

diff --git a/packages/app/client/src/ui/editor/emulator/parts/chat/chat.scss b/packages/app/client/src/ui/editor/emulator/parts/chat/chat.scss
@@ -44,7 +44,7 @@
   }
 
   // the user-agent stylesheet sets background color to white.
-  input {
+  & > div > div[role=form] input {
     background-color: transparent;
   }
 
@@ -86,9 +86,10 @@
 
 
 .selected-activity :global .bubble,
-.selected-activity :global .ac-container {
+.selected-activity :global .ac-container,
+.selected-activity :global .ac-textBlock {
   background: var(--webchat-selected-activity-bg);
-  color: var(--webchat-selected-activity-text);
+  color: var(--webchat-selected-activity-text) !important;
 }
 
 .disconnected {

diff --git a/packages/app/client/src/ui/editor/emulator/parts/chat/webChatTheme.ts b/packages/app/client/src/ui/editor/emulator/parts/chat/webChatTheme.ts
@@ -32,6 +32,10 @@
 //
 export default {
   backgroundColor: 'var(--webchat-bg)',
+  accent: '#3062D6',
+  subtle: 'var(--webchat-bubble-text)',
+
+  primaryFont: 'var(--default-font-family)',
 
   bubbleBackground: 'var(--webchat-bubble-bg)',
   bubbleFromUserBackground: 'var(--webchat-user-bubble-bg)',

diff --git a/packages/app/client/src/ui/styles/globals.scss b/packages/app/client/src/ui/styles/globals.scss
@@ -1,31 +1,31 @@
 @font-face {
   font-family: Segoe UI;
   font-weight: bold;
-  src: url("./segoe-ui-bold.woff2") format("woff2");
+  src: url("./segoe-ui-bold.woff") format("woff");
 }
 
 @font-face {
   font-family: Segoe UI;
   font-weight: 600;
-  src: url("./segoe-ui-semibold.woff2") format("woff2");
+  src: url("./segoe-ui-semibold.woff") format("woff");
 }
 
 @font-face {
   font-family: Segoe UI;
   font-weight: 400;
-  src: url("./segoe-ui.woff2") format("woff2");
+  src: url("./segoe-ui.woff") format("woff");
 }
 
 @font-face {
   font-family: Segoe UI;
   font-weight: 300;
-  src: url("./segoe-ui-semilight.woff2") format("woff2");
+  src: url("./segoe-ui-semilight.woff") format("woff");
 }
 
 @font-face {
   font-family: Segoe UI;
   font-weight: 200;
-  src: url("./segoe-ui-light.woff2") format("woff2");
+  src: url("./segoe-ui-light.woff") format("woff");
 }
 
 @font-face {

diff --git a/packages/app/client/src/ui/styles/segoe-ui-bold.woff b/packages/app/client/src/ui/styles/segoe-ui-bold.woff
diff --git a/packages/app/client/src/ui/styles/segoe-ui-bold.woff2 b/packages/app/client/src/ui/styles/segoe-ui-bold.woff2
diff --git a/packages/app/client/src/ui/styles/segoe-ui-light.woff b/packages/app/client/src/ui/styles/segoe-ui-light.woff
diff --git a/packages/app/client/src/ui/styles/segoe-ui-light.woff2 b/packages/app/client/src/ui/styles/segoe-ui-light.woff2
diff --git a/packages/app/client/src/ui/styles/segoe-ui-semibold.woff b/packages/app/client/src/ui/styles/segoe-ui-semibold.woff
diff --git a/packages/app/client/src/ui/styles/segoe-ui-semibold.woff2 b/packages/app/client/src/ui/styles/segoe-ui-semibold.woff2
diff --git a/packages/app/client/src/ui/styles/segoe-ui-semilight.woff b/packages/app/client/src/ui/styles/segoe-ui-semilight.woff
diff --git a/packages/app/client/src/ui/styles/segoe-ui-semilight.woff2 b/packages/app/client/src/ui/styles/segoe-ui-semilight.woff2
diff --git a/packages/app/client/src/ui/styles/segoe-ui.woff b/packages/app/client/src/ui/styles/segoe-ui.woff
diff --git a/packages/app/client/src/ui/styles/segoe-ui.woff2 b/packages/app/client/src/ui/styles/segoe-ui.woff2