diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a00b884..e699a18 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -15,11 +15,9 @@ @import 'settings/variables'; @import 'settings/fonts'; -@import 'settings/reset'; /*= require normalize-css/normalize */ +@import 'settings/reset'; // @import 'elements/'; // @import 'objects/'; -// @import 'components/'; -// @import 'trumps/'; diff --git a/app/assets/stylesheets/settings/_reset.scss b/app/assets/stylesheets/settings/_reset.scss index 99a5d52..e7aa7bd 100644 --- a/app/assets/stylesheets/settings/_reset.scss +++ b/app/assets/stylesheets/settings/_reset.scss @@ -4,7 +4,20 @@ html { box-sizing: border-box; } -*, +main, +section, +article, +aside, +footer, +h1, +h2, +h3, +h4, +h5, +h6, +div, +p, +ul, *::before, *::after { box-sizing: inherit;