Merge branch 'master' into releases

.travis.yml

@@ -34,12 +34,6 @@ before_script:
 before_deploy:
 - npm run build-dist
 deploy:
-  - skip_cleanup: true
-    provider: script
-    script: npm run deploy
-    on:
-      branch: master
-      condition: $JOB != e2e
   - provider: npm
     skip_cleanup: true
     email: gotsijroman@gmail.com
@@ -53,3 +47,9 @@ deploy:
     on:
       branch: master
       condition: $JOB != e2e
+  - skip_cleanup: true
+    provider: script
+    script: npm run deploy
+    on:
+      branch: master
+      condition: $JOB != e2e

demo/main.css

@@ -1,5 +1,5 @@
-@import url(http://fonts.googleapis.com/css?family=#{$base-font}:#{$light},#{$regular},#{$bold});
-@import url(http://fonts.googleapis.com/css?family=#{$headers-font}:#{$light},#{$regular});
+@import url(http://fonts.googleapis.com/css?family=Roboto:300,400,700);
+@import url(http://fonts.googleapis.com/css?family=Montserrat:300,400);
 
 body {
     margin: 0;

lib/components/JsonSchema/json-schema-common.scss

@@ -37,6 +37,7 @@ $sub-schema-offset: ($bullet-size/2) + $bullet-margin;
 .param-name-content {
   padding-right: $cell-spacing;
   display: inline-block;
+  font-family: $headers-font, $headers-font-family;
 }
 
 .param-info {
@@ -109,7 +110,7 @@ $sub-schema-offset: ($bullet-size/2) + $bullet-margin;
   border-top: $line-border;
   width: $bullet-margin;
   left: 0;
-  top: ($param-name-height/2) + $cell-padding;
+  top: ($param-name-height/2) + $cell-padding + 1px;
 }
 
  .param:first-of-type > .param-name:before {

lib/components/MethodsList/methods-list.scss

@@ -6,6 +6,10 @@
   box-sizing: border-box;
   background-color: white;
   width: 60%;
+
+  @media (max-width: 1100px) {
+    width: 100%;
+  }
 }
 
 .tag-info:after, .tag-info:before {

lib/components/Redoc/redoc.scss

@@ -3,6 +3,29 @@
 :host {
     display: block;
     box-sizing: border-box;
+
+    -webkit-tap-highlight-color: rgba(0,0,0,0);
+    -moz-tap-highlight-color: rgba(0,0,0,0);
+    -ms-tap-highlight-color: rgba(0,0,0,0);
+    -o-tap-highlight-color: rgba(0,0,0,0);
+    tap-highlight-color: rgba(0,0,0,0);
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    font-smoothing: antialiased;
+    -webkit-osx-font-smoothing: grayscale;
+    -moz-osx-font-smoothing: grayscale;
+    osx-font-smoothing: grayscale;
+    -webkit-text-size-adjust: 100%;
+    -moz-text-size-adjust: 100%;
+    text-size-adjust: 100%;
+    -webkit-text-shadow: 1px 1px 1px rgba(0,0,0,0.004);
+    -ms-text-shadow: 1px 1px 1px rgba(0,0,0,0.004);
+    text-shadow: 1px 1px 1px rgba(0,0,0,0.004);
+    text-rendering: optimizeSpeed!important;
+    font-smooth: always;
+    -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+    text-size-adjust: 100%;
 }
 
 .redoc-wrap {

lib/components/ResponsesList/responses-list.scss

@@ -8,6 +8,10 @@
   font-weight: normal;
 }
 
+:host .zippy-title {
+  font-family: $headers-font, $headers-font-family;
+}
+
 .header-name {
   font-weight: bold;
   display: inline-block;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "redoc",
   "description": "Swagger-generated API Reference Documentation",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/Rebilly/ReDoc"