Enforce theme fonts.

client/.sass-lint.yml

@@ -14,5 +14,6 @@ rules:
       - 'border-top-right-radius'
       - 'border-bottom-left-radius'
       - 'border-bottom-right-radius'
+      - 'font-family'
       - 'font-size'
       - 'z-index'

client/.stylelintrc

@@ -22,6 +22,7 @@
       "border-top-right-radius",
       "border-bottom-left-radius",
       "border-bottom-right-radius",
+      "font-family",
       "font-size",
       "z-index"
     ]],

client/app/styles/_base.scss

@@ -2,13 +2,18 @@
 @import '~font-awesome/scss/font-awesome.scss';
 @import '~rc-slider/dist/rc-slider.css';
 
+/* sass-lint:disable variable-for-property */
 @font-face {
-  font-family: "Roboto";
-  src: url("../../node_modules/materialize-css/fonts/roboto/Roboto-Regular.woff2"),
-    url("../../node_modules/materialize-css/fonts/roboto/Roboto-Regular.woff"),
-    url("../../node_modules/materialize-css/fonts/roboto/Roboto-Regular.ttf");
+  font-family: 'proxima-nova';
+  src: url('../fonts/proximanova-regular.woff');
 }
 
+@font-face {
+  font-family: 'Roboto Mono';
+  src: url('../fonts/robotomono-regular.ttf');
+}
+/* sass-lint:enable variable-for-property */
+
 a {
   text-decoration: none;
 }
@@ -158,7 +163,7 @@ a {
   background: $body-background-color;
   bottom: 0;
   color: $text-color;
-  font-family: $base-font;
+  font-family: $font-family-regular;
   font-size: $font-size-small;
   height: auto;
   left: 0;
@@ -433,7 +438,7 @@ a {
   }
 
   text {
-    font-family: $base-font;
+    font-family: $font-family-regular;
     fill: $text-secondary-color;
   }
 
@@ -709,7 +714,7 @@ a {
       border-radius: $border-radius-soft;
 
       span {
-        font-family: $base-font;
+        font-family: $font-family-regular;
         font-size: $font-size-small;
         margin-left: 4px;
 
@@ -1311,7 +1316,7 @@ a {
   &-app &-inner { top: 0; }
   &-inner {
     cursor: text;
-    font-family: $mono-font;
+    font-family: $font-family-monospace;
     position: absolute;
     bottom: 0;
     left: 0;
@@ -1326,7 +1331,7 @@ a {
   }
 
   &-status-bar {
-    font-family: $base-font;
+    font-family: $font-family-regular;
     position: absolute;
     bottom: 16px;
     right: 16px;

client/app/styles/_variables.scss

@@ -1,6 +1,4 @@
 $fa-font-path: "~font-awesome/fonts";
-$base-font: "Roboto", sans-serif;
-$mono-font: "Menlo", "DejaVu Sans Mono", "Liberation Mono", monospace;
 
 $base-ease: ease-in-out;
 

client/package.json

@@ -44,7 +44,7 @@
     "reselect": "3.0.1",
     "reselect-map": "1.0.3",
     "styled-components": "2.2.4",
-    "weaveworks-ui-components": "0.4.73",
+    "weaveworks-ui-components": "0.4.76",
     "whatwg-fetch": "2.0.3",
     "xterm": "3.3.0"
   },

client/yarn.lock

@@ -8339,9 +8339,9 @@ wd@^0.4.0:
     underscore.string "~3.0.3"
     vargs "~0.1.0"
 
-weaveworks-ui-components@0.4.73:
-  version "0.4.73"
-  resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.4.73.tgz#0090afa71c3957e4e447a427d6134477f8158c48"
+weaveworks-ui-components@0.4.76:
+  version "0.4.76"
+  resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.4.76.tgz#0e0a28f128eb233a28db12397399bac3e395a218"
   dependencies:
     classnames "2.2.5"
     d3-drag "1.2.1"