Merge e1efab9 into fbfd181

microsoft · Oct 18, 2018 · 272aaea · 272aaea
2 parents fbfd181 + e1efab9
commit 272aaea
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 64 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/app/client/src/ui/dialogs/botCreationDialog/botCreationDialog.scss b/packages/app/client/src/ui/dialogs/botCreationDialog/botCreationDialog.scss
@@ -30,7 +30,7 @@
     border: 1px solid transparent;
     color: var(--focused-selected-list-item-bg);
     cursor: pointer;
-    font-family: var(--default-font-semibold);
+    font-weight: 600;
     padding: 0;
     white-space: normal;
     text-decoration: none;

diff --git a/packages/app/client/src/ui/editor/appSettingsEditor/appSettingsEditor.scss b/packages/app/client/src/ui/editor/appSettingsEditor/appSettingsEditor.scss
@@ -13,7 +13,7 @@
     border: 1px solid transparent;
     color: var(--focused-selected-list-item-bg);
     cursor: pointer;
-    font-family: var(--default-font-semibold);
+    font-weight: 600;
     white-space: normal;
     text-decoration: none;
 

diff --git a/packages/app/client/src/ui/editor/welcomePage/welcomePage.scss b/packages/app/client/src/ui/editor/welcomePage/welcomePage.scss
@@ -75,7 +75,9 @@
   position: relative;
   padding: 0 16px;
   border: 1px solid transparent;
-
+  button {
+    font-size: 13px;
+  }
   &:hover {
     background-color: var(--my-bots-entry-bg);
     border: var(--my-bots-entry-border);
@@ -92,7 +94,7 @@
     cursor: pointer;
 
     > span {
-      font-family: var(--default-font-semibold);
+      font-weight: 600;
 
       &:hover {
         text-decoration: underline;
@@ -156,8 +158,9 @@
   border: 1px solid transparent;
   color: var(--focused-selected-list-item-bg);
   cursor: pointer;
-  font-family: var(--default-font-semibold);
+  font-weight: 600;
   padding: 0;
+  font-size: 13px;
   white-space: normal;
 
     &:focus {
@@ -173,7 +176,7 @@
 .how-to-build-section {
   > h3 {
     font-size: 13px;
-    font-family: var(--default-font-semibold);
+    font-weight: 600;
     letter-spacing: 0.35px;
     line-height: 16px;
     margin: 0 0 24px 0;

diff --git a/packages/app/client/src/ui/shell/explorer/servicesExplorer/servicesExplorer.scss b/packages/app/client/src/ui/shell/explorer/servicesExplorer/servicesExplorer.scss
@@ -32,7 +32,7 @@ ul > li.link::before {
     border: 1px solid transparent;
     color: var(--focused-selected-list-item-bg);
     cursor: pointer;
-    font-family: var(--default-font-semibold);
+    font-weight: 600;
     padding: 0;
     text-decoration: none;
     white-space: normal;

diff --git a/packages/app/client/src/ui/styles/globals.scss b/packages/app/client/src/ui/styles/globals.scss
@@ -1,15 +1,33 @@
 @font-face {
   font-family: Segoe UI;
-  font-weight: 300;
-  src: url("./segoe-ui.woff2") format("woff2");
+  font-weight: bold;
+  src: url("./segoe-ui-bold.woff2") format("woff2");
 }
 
 @font-face {
-  font-family: Segoe UI Semibold;
-  font-weight: 500;
+  font-family: Segoe UI;
+  font-weight: 600;
   src: url("./segoe-ui-semibold.woff2") format("woff2");
 }
 
+@font-face {
+  font-family: Segoe UI;
+  font-weight: 400;
+  src: url("./segoe-ui.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: Segoe UI;
+  font-weight: 300;
+  src: url("./segoe-ui-semilight.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: Segoe UI;
+  font-weight: 200;
+  src: url("./segoe-ui-light.woff2") format("woff2");
+}
+
 @font-face {
   font-family: Menlo;
   src: url("./menlo.woff2") format("woff2");
@@ -31,12 +49,24 @@
     overflow: hidden;
     user-select: none;
   }
-  div {
-    box-sizing: border-box;
+
+  h1, h2 {
+    font-family: var(--default-font-family);
+    font-weight: 200;
+  }
+
+  h3 {
+    font-family: var(--default-font-family);
+    font-weight: 600;
   }
 
-  strong {
-    font-family: var(--default-font-semibold);
+  input, textarea, button, select {
+    font-family: var(--default-font-family);
+    font-weight: normal;
+  }
+
+  div {
+    box-sizing: border-box;
   }
 
   *:focus {

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.woff2 b/packages/app/client/src/ui/styles/segoe-ui-light.woff2
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/themes/fonts.css b/packages/app/client/src/ui/styles/themes/fonts.css
@@ -1,5 +1,4 @@
 html {
   --default-font-family: Segoe UI, HelveticaNeue-Light, Ubuntu, Droid Sans, sans-serif;
-  --default-font-semibold: Segoe UI Semibold;
   --monospace-font-family: Menlo, Monaco, Consolas, Droid Sans Mono, Courier New, monospace, Droid Sans Fallback;
 }