embed fonts correctly

rancher · Sep 12, 2017 · 9fc1158 · 9fc1158
1 parent 694dc6f
commit 9fc1158
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "api-ui",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "Embedded UI for any service that implements the Rancher API spec",
   "contributors": [
     "Go Daddy Operating Company, LLC. (http://godaddy.com)",

diff --git a/src/HTMLApi.js b/src/HTMLApi.js
@@ -218,8 +218,8 @@ HTMLApi.prototype.schemasLoad = function(link, cb)
     return async.nextTick(function() { cb("No data") });
 
   // Link may come from the page <script>, but override it if one is in the JSON body.
-  if ( this._data.links && this._data.links.schemas )
-    link = this._data.links.schemas;
+  //if ( this._data.links && this._data.links.schemas )
+  //  link = this._data.links.schemas;
 
   if ( link )
   {

diff --git a/styles/main.scss b/styles/main.scss
@@ -1,3 +1,13 @@
+@font-face {
+  font-family: 'Glyphicons Halflings';
+  src: url("fonts/glyphicons-halflings-regular.eot");
+  src: url("fonts/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"),
+        url("fonts/glyphicons-halflings-regular.woff2") format("woff2"),
+        url("fonts/glyphicons-halflings-regular.woff") format("woff"),
+        url("fonts/glyphicons-halflings-regular.ttf") format("truetype"),
+        url("fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg");
+}
+
 .modal {
   overflow: auto;
   position: absolute;