serve roboto font locally (#2519)

* serve roboto locally * add trailing comma * fix long line for linter
apache · Apr 3, 2017 · dcc6f2a · dcc6f2a
1 parent 0c0666c
commit dcc6f2a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/superset/assets/javascripts/SqlLab/components/QueryAutoRefresh.jsx b/superset/assets/javascripts/SqlLab/components/QueryAutoRefresh.jsx
@@ -19,8 +19,8 @@ class QueryAutoRefresh extends React.PureComponent {
     const { queries } = this.props;
     const queryKeys = Object.keys(queries);
     const queriesAsArray = queryKeys.map(key => queries[key]);
-    return queriesAsArray.some(
-      q => ['running', 'started', 'pending', 'fetching'].indexOf(q.state) >= 0);
+    return queriesAsArray.some(q =>
+      ['running', 'started', 'pending', 'fetching'].indexOf(q.state) >= 0);
   }
   startTimer() {
     if (!(this.timer)) {

diff --git a/superset/assets/stylesheets/fonts/Roboto-Regular.woff b/superset/assets/stylesheets/fonts/Roboto-Regular.woff
diff --git a/superset/assets/stylesheets/fonts/Roboto-Regular.woff2 b/superset/assets/stylesheets/fonts/Roboto-Regular.woff2
diff --git a/superset/assets/stylesheets/less/cosmo/bootswatch.less b/superset/assets/stylesheets/less/cosmo/bootswatch.less
@@ -2,13 +2,6 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700";
-
-.web-font(@path) {
-  @import url("@{path}");
-}
-.web-font(@web-font-path);
-
 // Navbar =====================================================================
 
 .navbar {

diff --git a/superset/assets/stylesheets/superset.css b/superset/assets/stylesheets/superset.css
@@ -1,3 +1,9 @@
+@font-face {
+  font-family: "Roboto";
+  src: url("./fonts/Roboto-Regular.woff2") format("woff2"),
+       url("./fonts/Roboto-Regular.woff") format("woff");
+}
+
 body {
     margin: 0px !important;
 }

diff --git a/superset/assets/webpack.config.js b/superset/assets/webpack.config.js
@@ -85,7 +85,7 @@ const config = {
       /* for font-awesome */
       {
         test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: 'url-loader?limit=10000&minetype=application/font-woff',
+        loader: 'url-loader?limit=10000&mimetype=application/font-woff',
       },
       {
         test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,