From 48f11a172a69943701d85123f7a9228c55b9c8b8 Mon Sep 17 00:00:00 2001 From: Owen Conti Date: Sat, 8 Jul 2017 11:33:34 -0600 Subject: [PATCH 01/18] Fixes #2903 - Fix CSS imports so body and html styles are included from .scss files. Update body selector to have a font-family --- src/style/_layout.scss | 18 ------------------ src/style/_reset.scss | 18 ++++++++++++++++++ src/style/main.scss | 10 ++++++---- 3 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 src/style/_reset.scss diff --git a/src/style/_layout.scss b/src/style/_layout.scss index 955e4d54..9e50f8cb 100644 --- a/src/style/_layout.scss +++ b/src/style/_layout.scss @@ -1,21 +1,3 @@ -html -{ - box-sizing: border-box; -} -*, -*:before, -*:after -{ - box-sizing: inherit; -} - -body -{ - margin: 0; - - background: #fafafa; -} - .wrapper { width: 100%; diff --git a/src/style/_reset.scss b/src/style/_reset.scss new file mode 100644 index 00000000..f2cece95 --- /dev/null +++ b/src/style/_reset.scss @@ -0,0 +1,18 @@ +html +{ + box-sizing: border-box; + overflow: -moz-scrollbars-vertical; + overflow-y: scroll; +} +*, +*:before, +*:after +{ + box-sizing: inherit; +} + +body { + background: #fafafa; + margin:0; + @include text_body() +} \ No newline at end of file diff --git a/src/style/main.scss b/src/style/main.scss index f6ff00fb..91e8be20 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -1,9 +1,11 @@ +@import 'mixins'; +@import 'variables'; +@import 'colors'; +@import 'type'; +@import 'reset'; + .swagger-ui { - @import 'mixins'; - @import 'variables'; - @import 'colors'; - @import 'type'; @import 'layout'; @import 'buttons'; @import 'form'; From 5de168994636d535653db493b1e77227782a79e2 Mon Sep 17 00:00:00 2001 From: Owen Conti Date: Sat, 8 Jul 2017 11:34:55 -0600 Subject: [PATCH 02/18] Remove embedded styles from `index.html` files --- dev-helpers/index.html | 19 ------------------- dist/index.html | 19 ------------------- 2 files changed, 38 deletions(-) diff --git a/dev-helpers/index.html b/dev-helpers/index.html index 9058c220..a8b428d3 100644 --- a/dev-helpers/index.html +++ b/dev-helpers/index.html @@ -8,25 +8,6 @@ - diff --git a/dist/index.html b/dist/index.html index f6aaf9e4..3c643f7f 100644 --- a/dist/index.html +++ b/dist/index.html @@ -8,25 +8,6 @@ - From 0622bd71799500a5b56294a340731aacfd911bca Mon Sep 17 00:00:00 2001 From: Owen Conti Date: Mon, 17 Jul 2017 21:09:25 -0600 Subject: [PATCH 03/18] Revert changes based on @Minasokoni's suggestion --- dev-helpers/index.html | 18 ++++++++++++++++++ dist/index.html | 18 ++++++++++++++++++ src/style/_reset.scss | 18 ------------------ src/style/main.scss | 11 ++++++----- 4 files changed, 42 insertions(+), 23 deletions(-) delete mode 100644 src/style/_reset.scss diff --git a/dev-helpers/index.html b/dev-helpers/index.html index f7f5fc9e..8f5ca82d 100644 --- a/dev-helpers/index.html +++ b/dev-helpers/index.html @@ -8,6 +8,24 @@ + diff --git a/dist/index.html b/dist/index.html index 3c643f7f..12d83580 100644 --- a/dist/index.html +++ b/dist/index.html @@ -8,6 +8,24 @@ + diff --git a/src/style/_reset.scss b/src/style/_reset.scss deleted file mode 100644 index f2cece95..00000000 --- a/src/style/_reset.scss +++ /dev/null @@ -1,18 +0,0 @@ -html -{ - box-sizing: border-box; - overflow: -moz-scrollbars-vertical; - overflow-y: scroll; -} -*, -*:before, -*:after -{ - box-sizing: inherit; -} - -body { - background: #fafafa; - margin:0; - @include text_body() -} \ No newline at end of file diff --git a/src/style/main.scss b/src/style/main.scss index 91e8be20..4209976d 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -1,11 +1,10 @@ -@import 'mixins'; -@import 'variables'; -@import 'colors'; -@import 'type'; -@import 'reset'; .swagger-ui { + @import 'mixins'; + @import 'variables'; + @import 'colors'; + @import 'type'; @import 'layout'; @import 'buttons'; @import 'form'; @@ -16,4 +15,6 @@ @import 'information'; @import 'authorize'; @import 'errors'; + + @include text_body(); } From 24882b69a87bbd71eb3840b7822ce2034af1ad37 Mon Sep 17 00:00:00 2001 From: Owen Conti Date: Mon, 17 Jul 2017 21:15:05 -0600 Subject: [PATCH 04/18] File formatting fixes --- dev-helpers/index.html | 8 ++++---- dist/index.html | 9 +++++---- src/style/main.scss | 1 - 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-helpers/index.html b/dev-helpers/index.html index 8f5ca82d..36c8cce9 100644 --- a/dev-helpers/index.html +++ b/dev-helpers/index.html @@ -11,15 +11,15 @@