From 1686d3da434ecc6f4bed6fafea8b33546106f5e6 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Mon, 14 Mar 2016 22:48:35 +0200 Subject: [PATCH 1/4] fix css import in demo --- demo/main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/main.css b/demo/main.css index 269620f7..af3c136d 100644 --- a/demo/main.css +++ b/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; From cac8594f1c6e6fad29f94318fd44198c0c13938f Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Mon, 14 Mar 2016 23:15:32 +0200 Subject: [PATCH 2/4] fonts improvements --- .../JsonSchema/json-schema-common.scss | 3 ++- lib/components/Redoc/redoc.scss | 23 +++++++++++++++++++ .../ResponsesList/responses-list.scss | 4 ++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/components/JsonSchema/json-schema-common.scss b/lib/components/JsonSchema/json-schema-common.scss index d61e4899..a939c365 100644 --- a/lib/components/JsonSchema/json-schema-common.scss +++ b/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 { diff --git a/lib/components/Redoc/redoc.scss b/lib/components/Redoc/redoc.scss index fb88a9d9..69b72833 100644 --- a/lib/components/Redoc/redoc.scss +++ b/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 { diff --git a/lib/components/ResponsesList/responses-list.scss b/lib/components/ResponsesList/responses-list.scss index 40f96f63..d9212b11 100644 --- a/lib/components/ResponsesList/responses-list.scss +++ b/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; From c498517a23f52996753924489d6099a6a6b7ad13 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Mon, 14 Mar 2016 23:25:57 +0200 Subject: [PATCH 3/4] minor responsiveness fix --- lib/components/MethodsList/methods-list.scss | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/components/MethodsList/methods-list.scss b/lib/components/MethodsList/methods-list.scss index 72a40189..c4d64f39 100644 --- a/lib/components/MethodsList/methods-list.scss +++ b/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 { diff --git a/package.json b/package.json index d2848030..df021cb5 100644 --- a/package.json +++ b/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" From 6e4c88e4be9ce5e9ea0baab74eb708e61d3003c4 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Mon, 14 Mar 2016 23:29:13 +0200 Subject: [PATCH 4/4] change order of deploy scripts --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43fe36f9..ec37078a 100644 --- a/.travis.yml +++ b/.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