From 48f11a172a69943701d85123f7a9228c55b9c8b8 Mon Sep 17 00:00:00 2001 From: Owen Conti Date: Sat, 8 Jul 2017 11:33:34 -0600 Subject: [PATCH] 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';