From 0622bd71799500a5b56294a340731aacfd911bca Mon Sep 17 00:00:00 2001 From: Owen Conti Date: Mon, 17 Jul 2017 21:09:25 -0600 Subject: [PATCH] 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(); }