merged from develop, #824

swagger-api · Jan 29, 2015 · b7a7607 · b7a7607
1 parent d9a3c65
commit b7a7607
Show file tree

Hide file tree

Showing 24 changed files with 3,396 additions and 24 deletions.
diff --git a/dist/fonts/droid-sans-v6-latin-700.eot b/dist/fonts/droid-sans-v6-latin-700.eot
diff --git a/dist/fonts/droid-sans-v6-latin-700.svg b/dist/fonts/droid-sans-v6-latin-700.svg
diff --git a/dist/fonts/droid-sans-v6-latin-700.ttf b/dist/fonts/droid-sans-v6-latin-700.ttf
diff --git a/dist/fonts/droid-sans-v6-latin-700.woff b/dist/fonts/droid-sans-v6-latin-700.woff
diff --git a/dist/fonts/droid-sans-v6-latin-700.woff2 b/dist/fonts/droid-sans-v6-latin-700.woff2
diff --git a/dist/fonts/droid-sans-v6-latin-regular.eot b/dist/fonts/droid-sans-v6-latin-regular.eot
diff --git a/dist/fonts/droid-sans-v6-latin-regular.svg b/dist/fonts/droid-sans-v6-latin-regular.svg
diff --git a/dist/fonts/droid-sans-v6-latin-regular.ttf b/dist/fonts/droid-sans-v6-latin-regular.ttf
diff --git a/dist/fonts/droid-sans-v6-latin-regular.woff b/dist/fonts/droid-sans-v6-latin-regular.woff
diff --git a/dist/fonts/droid-sans-v6-latin-regular.woff2 b/dist/fonts/droid-sans-v6-latin-regular.woff2
diff --git a/dist/index.html b/dist/index.html
@@ -2,10 +2,9 @@
 <html>
 <head>
   <title>Swagger UI</title>
-  <link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
+  <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
   <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
-  <link href='css/typography.css' media='print' rel='stylesheet' type='text/css'/>
   <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
   <link href='css/screen.css' media='print' rel='stylesheet' type='text/css'/>
   <script type="text/javascript" src="lib/shred.bundle.js"></script>
@@ -16,10 +15,10 @@
   <script src='lib/handlebars-1.0.0.js' type='text/javascript'></script>
   <script src='lib/underscore-min.js' type='text/javascript'></script>
   <script src='lib/backbone-min.js' type='text/javascript'></script>
-  <script src='lib/swagger.js' type='text/javascript'></script>
   <script src='lib/swagger-client.js' type='text/javascript'></script>
   <script src='swagger-ui.js' type='text/javascript'></script>
   <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
+  <script src='lib/marked.js' type='text/javascript'></script>
 
   <!-- enabling this will enable oauth2 implicit scope support -->
   <script src='lib/swagger-oauth.js' type='text/javascript'></script>