From c5f484387238701c7bc97269240d56136edb5a5e Mon Sep 17 00:00:00 2001 From: Aaron Pinero Date: Fri, 16 Feb 2018 20:20:46 -0500 Subject: [PATCH] removing unnecessary customizations --- dist/style/tyfy-bootstrap.css | 178 ++++++++++++++++---------------- source/scss/_customization.scss | 8 -- 2 files changed, 89 insertions(+), 97 deletions(-) diff --git a/dist/style/tyfy-bootstrap.css b/dist/style/tyfy-bootstrap.css index 27699e6..9c0171e 100644 --- a/dist/style/tyfy-bootstrap.css +++ b/dist/style/tyfy-bootstrap.css @@ -33,7 +33,7 @@ --breakpoint-md: 768px; --breakpoint-lg: 992px; --breakpoint-xl: 1200px; - --font-family-sans-serif: "Overpass", Helvetica, Arial, sans-serif; + --font-family-sans-serif: "Overpass", "Helvetica", "Arial", sans-serif; --font-family-monospace: "Overpass Mono", monospace; } /* line 21, node_modules/bootstrap/scss/_reboot.scss */ @@ -58,10 +58,10 @@ article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, s /* line 57, node_modules/bootstrap/scss/_reboot.scss */ body { margin: 0; - font-family: "Overpass", Helvetica, Arial, sans-serif; - font-size: 1.125rem; + font-family: "Overpass", "Helvetica", "Arial", sans-serif; + font-size: 1rem; font-weight: 400; - line-height: 1.44444; + line-height: 1.625; color: #212529; text-align: left; background-color: #fff; } @@ -356,61 +356,61 @@ template { h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { margin-bottom: 0; - font-family: "Zilla Slab", Georgia, Times, serif; + font-family: "Zilla Slab", "Georgia", serif; font-weight: 700; line-height: 1.2; color: inherit; } /* line 16, node_modules/bootstrap/scss/_type.scss */ h1, .h1 { - font-size: 3.35923rem; } + font-size: 2.98598rem; } /* line 17, node_modules/bootstrap/scss/_type.scss */ h2, .h2 { - font-size: 2.3328rem; } + font-size: 2.0736rem; } /* line 18, node_modules/bootstrap/scss/_type.scss */ h3, .h3 { - font-size: 1.944rem; } + font-size: 1.728rem; } /* line 19, node_modules/bootstrap/scss/_type.scss */ h4, .h4 { - font-size: 1.62rem; } + font-size: 1.44rem; } /* line 20, node_modules/bootstrap/scss/_type.scss */ h5, .h5 { - font-size: 1.35rem; } + font-size: 1.2rem; } /* line 21, node_modules/bootstrap/scss/_type.scss */ h6, .h6 { - font-size: 1.125rem; } + font-size: 1rem; } /* line 23, node_modules/bootstrap/scss/_type.scss */ .lead { - font-size: 1.62rem; + font-size: 1.44rem; font-weight: 300; } /* line 29, node_modules/bootstrap/scss/_type.scss */ .display-1 { - font-size: 6.9657rem; + font-size: 6.19174rem; font-weight: 500; line-height: 1.2; } /* line 34, node_modules/bootstrap/scss/_type.scss */ .display-2 { - font-size: 5.80475rem; + font-size: 5.15978rem; font-weight: 500; line-height: 1.2; } /* line 39, node_modules/bootstrap/scss/_type.scss */ .display-3 { - font-size: 4.83729rem; + font-size: 4.29982rem; font-weight: 500; line-height: 1.2; } /* line 44, node_modules/bootstrap/scss/_type.scss */ .display-4 { - font-size: 4.03108rem; + font-size: 3.58318rem; font-weight: 500; line-height: 1.2; } @@ -458,7 +458,7 @@ mark, /* line 112, node_modules/bootstrap/scss/_type.scss */ .blockquote { margin-bottom: 1.625rem; - font-size: 1.35rem; } + font-size: 1.2rem; } /* line 117, node_modules/bootstrap/scss/_type.scss */ .blockquote-footer { @@ -1759,8 +1759,8 @@ pre { display: block; width: 100%; padding: 0.33854rem 0.74479rem; - font-size: 1.125rem; - line-height: 1.44444; + font-size: 1rem; + line-height: 1.625; color: #495057; background-color: #fff; background-clip: padding-box; @@ -1811,21 +1811,21 @@ select.form-control:focus::-ms-value { padding-bottom: calc(0.33854rem + 0.06771rem); margin-bottom: 0; font-size: inherit; - line-height: 1.44444; } + line-height: 1.625; } /* line 97, node_modules/bootstrap/scss/_forms.scss */ .col-form-label-lg { padding-top: calc(0.74479rem + 0.06771rem); padding-bottom: calc(0.74479rem + 0.06771rem); - font-size: 1.35rem; - line-height: 1.2037; } + font-size: 1.2rem; + line-height: 1.35417; } /* line 104, node_modules/bootstrap/scss/_forms.scss */ .col-form-label-sm { padding-top: calc(0.13542rem + 0.06771rem); padding-bottom: calc(0.13542rem + 0.06771rem); - font-size: 0.9375rem; - line-height: 1.73333; } + font-size: 0.83333rem; + line-height: 1.95; } /* line 117, node_modules/bootstrap/scss/_forms.scss */ .form-control-plaintext { @@ -1834,7 +1834,7 @@ select.form-control:focus::-ms-value { padding-top: 0.33854rem; padding-bottom: 0.33854rem; margin-bottom: 0; - line-height: 1.44444; + line-height: 1.625; background-color: transparent; border: solid transparent; border-width: 0.06771rem 0; } @@ -1858,8 +1858,8 @@ select.form-control:focus::-ms-value { .input-group-sm > .input-group-prepend > .btn, .input-group-sm > .input-group-append > .btn { padding: 0.13542rem 0.54167rem; - font-size: 0.9375rem; - line-height: 1.73333; + font-size: 0.83333rem; + line-height: 1.95; border-radius: 0.13544rem; } /* line 152, node_modules/bootstrap/scss/_forms.scss */ @@ -1877,8 +1877,8 @@ select.form-control-sm:not([size]):not([multiple]), .input-group-sm > select.for .input-group-lg > .input-group-prepend > .btn, .input-group-lg > .input-group-append > .btn { padding: 0.74479rem 1.15104rem; - font-size: 1.35rem; - line-height: 1.2037; + font-size: 1.2rem; + line-height: 1.35417; border-radius: 0.26813rem; } /* line 165, node_modules/bootstrap/scss/_forms.scss */ @@ -2213,8 +2213,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for user-select: none; border: 0.06771rem solid transparent; padding: 0.33854rem 0.74479rem; - font-size: 1.125rem; - line-height: 1.44444; + font-size: 1rem; + line-height: 1.625; border-radius: 0.20312rem; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } /* line 19, node_modules/bootstrap/scss/mixins/_hover.scss */ @@ -2726,15 +2726,15 @@ fieldset:disabled a.btn { /* line 113, node_modules/bootstrap/scss/_buttons.scss */ .btn-lg, .btn-group-lg > .btn { padding: 0.74479rem 1.15104rem; - font-size: 1.35rem; - line-height: 1.2037; + font-size: 1.2rem; + line-height: 1.35417; border-radius: 0.26813rem; } /* line 117, node_modules/bootstrap/scss/_buttons.scss */ .btn-sm, .btn-group-sm > .btn { padding: 0.13542rem 0.54167rem; - font-size: 0.9375rem; - line-height: 1.73333; + font-size: 0.83333rem; + line-height: 1.95; border-radius: 0.13544rem; } /* line 126, node_modules/bootstrap/scss/_buttons.scss */ @@ -2814,7 +2814,7 @@ tbody.collapse.show { min-width: 10rem; padding: 0.40625rem 0; margin: 0.125rem 0 0; - font-size: 1.125rem; + font-size: 1rem; color: #212529; text-align: left; list-style: none; @@ -2951,7 +2951,7 @@ tbody.collapse.show { display: block; padding: 0.40625rem 0.8125rem; margin-bottom: 0; - font-size: 0.9375rem; + font-size: 0.83333rem; color: #6c757d; white-space: nowrap; } @@ -3176,9 +3176,9 @@ tbody.collapse.show { align-items: center; padding: 0.33854rem 0.74479rem; margin-bottom: 0; - font-size: 1.125rem; + font-size: 1rem; font-weight: 400; - line-height: 1.44444; + line-height: 1.625; color: #495057; text-align: center; white-space: nowrap; @@ -3214,7 +3214,7 @@ tbody.collapse.show { .custom-control { position: relative; display: block; - min-height: 1.44444rem; + min-height: 1.625rem; padding-left: 1.5rem; } /* line 17, node_modules/bootstrap/scss/_custom-forms.scss */ @@ -3252,7 +3252,7 @@ tbody.collapse.show { /* line 63, node_modules/bootstrap/scss/_custom-forms.scss */ .custom-control-label::before { position: absolute; - top: 0.22222rem; + top: 0.3125rem; left: 0; display: block; width: 1rem; @@ -3265,7 +3265,7 @@ tbody.collapse.show { /* line 78, node_modules/bootstrap/scss/_custom-forms.scss */ .custom-control-label::after { position: absolute; - top: 0.22222rem; + top: 0.3125rem; left: 0; display: block; width: 1rem; @@ -3325,7 +3325,7 @@ tbody.collapse.show { width: 100%; height: calc(2.30209rem + 0.13541rem); padding: 0.375rem 1.75rem 0.375rem 0.75rem; - line-height: 1.44444; + line-height: 1.625; color: #495057; vertical-align: middle; background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right 0.75rem center; @@ -3406,7 +3406,7 @@ tbody.collapse.show { z-index: 1; height: calc(2.30209rem + 0.13541rem); padding: 0.33854rem 0.74479rem; - line-height: 1.44444; + line-height: 1.625; color: #495057; background-color: #fff; border: 0.06771rem solid #ced4da; @@ -3421,7 +3421,7 @@ tbody.collapse.show { display: block; height: calc(calc(2.30209rem + 0.13541rem) - 0.06771rem * 2); padding: 0.33854rem 0.74479rem; - line-height: 1.44444; + line-height: 1.625; color: #495057; content: "Browse"; background-color: #e9ecef; @@ -3538,7 +3538,7 @@ tbody.collapse.show { padding-top: 0.24375rem; padding-bottom: 0.24375rem; margin-right: 1.625rem; - font-size: 1.35rem; + font-size: 1.2rem; line-height: inherit; white-space: nowrap; } /* line 19, node_modules/bootstrap/scss/mixins/_hover.scss */ @@ -3581,7 +3581,7 @@ tbody.collapse.show { /* line 108, node_modules/bootstrap/scss/_navbar.scss */ .navbar-toggler { padding: 0.25rem 0.75rem; - font-size: 1.35rem; + font-size: 1.2rem; line-height: 1; background-color: transparent; border: 0.06771rem solid transparent; @@ -4252,8 +4252,8 @@ tbody.collapse.show { /* line 4, node_modules/bootstrap/scss/mixins/_pagination.scss */ .pagination-lg .page-link { padding: 0.75rem 1.5rem; - font-size: 1.35rem; - line-height: 1.2037; } + font-size: 1.2rem; + line-height: 1.35417; } /* line 12, node_modules/bootstrap/scss/mixins/_pagination.scss */ .pagination-lg .page-item:first-child .page-link { @@ -4268,8 +4268,8 @@ tbody.collapse.show { /* line 4, node_modules/bootstrap/scss/mixins/_pagination.scss */ .pagination-sm .page-link { padding: 0.25rem 0.5rem; - font-size: 0.9375rem; - line-height: 1.73333; } + font-size: 0.83333rem; + line-height: 1.95; } /* line 12, node_modules/bootstrap/scss/mixins/_pagination.scss */ .pagination-sm .page-item:first-child .page-link { @@ -4422,7 +4422,7 @@ tbody.collapse.show { /* line 29, node_modules/bootstrap/scss/_alert.scss */ .alert-dismissible { - padding-right: 4.125rem; } + padding-right: 3.9375rem; } /* line 33, node_modules/bootstrap/scss/_alert.scss */ .alert-dismissible .close { position: absolute; @@ -4545,7 +4545,7 @@ tbody.collapse.show { display: flex; height: 1rem; overflow: hidden; - font-size: 0.84375rem; + font-size: 0.75rem; background-color: #e9ecef; border-radius: 0.20312rem; } @@ -4771,7 +4771,7 @@ tbody.collapse.show { /* line 1, node_modules/bootstrap/scss/_close.scss */ .close { float: right; - font-size: 1.6875rem; + font-size: 1.5rem; font-weight: 700; line-height: 1; color: #000; @@ -4891,7 +4891,7 @@ button.close { /* line 109, node_modules/bootstrap/scss/_modal.scss */ .modal-title { margin-bottom: 0; - line-height: 1.44444; } + line-height: 1.625; } /* line 116, node_modules/bootstrap/scss/_modal.scss */ .modal-body { @@ -4948,10 +4948,10 @@ button.close { z-index: 1070; display: block; margin: 0; - font-family: "Overpass", Helvetica, Arial, sans-serif; + font-family: "Overpass", "Helvetica", "Arial", sans-serif; font-style: normal; font-weight: 400; - line-height: 1.44444; + line-height: 1.625; text-align: left; text-align: start; text-decoration: none; @@ -4962,7 +4962,7 @@ button.close { word-spacing: normal; white-space: normal; line-break: auto; - font-size: 0.9375rem; + font-size: 0.83333rem; word-wrap: break-word; opacity: 0; } /* line 15, node_modules/bootstrap/scss/_tooltip.scss */ @@ -5050,10 +5050,10 @@ button.close { z-index: 1060; display: block; max-width: 276px; - font-family: "Overpass", Helvetica, Arial, sans-serif; + font-family: "Overpass", "Helvetica", "Arial", sans-serif; font-style: normal; font-weight: 400; - line-height: 1.44444; + line-height: 1.625; text-align: left; text-align: start; text-decoration: none; @@ -5064,7 +5064,7 @@ button.close { word-spacing: normal; white-space: normal; line-break: auto; - font-size: 0.9375rem; + font-size: 0.83333rem; word-wrap: break-word; background-color: #fff; background-clip: padding-box; @@ -5181,7 +5181,7 @@ button.close { .popover-header { padding: 0.5rem 0.75rem; margin-bottom: 0; - font-size: 1.125rem; + font-size: 1rem; color: inherit; background-color: #f7f7f7; border-bottom: 0.06771rem solid #ebebeb; @@ -8183,8 +8183,8 @@ html { body { background: white; color: #111; - font-family: "Overpass", Helvetica, Arial, sans-serif; - font-size: 1.125rem; + font-family: "Overpass", "Helvetica", "Arial", sans-serif; + font-size: 1rem; line-height: 1.625rem; } /* line 2, node_modules/tyfy/source/scss/optional/_lists.scss */ @@ -8220,7 +8220,7 @@ ul.list-icons li { /* line 30, node_modules/tyfy/source/scss/optional/_lists.scss */ ul.list-icons li:before { color: #949494; - font-family: "Material Icons"; + font-family: tyfyicons; margin-right: 0.40625rem; position: absolute; right: 100%; @@ -8356,8 +8356,8 @@ blockquote { background-color: transparent; border: none; color: #de4185; - font-family: "Zilla Slab", Georgia, Times, serif; - font-size: 1.62rem; + font-family: "Zilla Slab", "Georgia", serif; + font-size: 1.44rem; line-height: 2.4375rem; margin: 1.625rem 0 2.4375rem 0; position: relative; @@ -8369,12 +8369,12 @@ blockquote { margin-right: 2.4375rem; } } /* line 28, node_modules/tyfy/source/scss/optional/_quotes.scss */ blockquote.pullquote p { - font-size: 1.62rem; + font-size: 1.44rem; line-height: 2.4375rem; } /* line 32, node_modules/tyfy/source/scss/optional/_quotes.scss */ blockquote.pullquote cite { display: block; - font-size: 0.9375rem; + font-size: 0.83333rem; font-style: normal; line-height: 1.625rem; } /* line 38, node_modules/tyfy/source/scss/optional/_quotes.scss */ @@ -8385,7 +8385,7 @@ blockquote { color: #e2e2e2; content: "\ea0b"; display: block; - font-family: "Material Icons"; + font-family: tyfyicons; font-style: normal; font-weight: normal; text-align: center; } @@ -8471,16 +8471,16 @@ label { /* line 2, source/scss/overrides/_type.scss */ h1, .h1 { color: inherit; - font-family: "Zilla Slab", Georgia, Times, serif; - font-size: 3.35923rem; + font-family: "Zilla Slab", "Georgia", serif; + font-size: 2.98598rem; font-weight: 700; - line-height: 4.0625rem; } + line-height: 3.25rem; } /* line 9, source/scss/overrides/_type.scss */ h2, .h2 { color: inherit; - font-family: "Zilla Slab", Georgia, Times, serif; - font-size: 2.3328rem; + font-family: "Zilla Slab", "Georgia", serif; + font-size: 2.0736rem; font-style: normal; font-weight: 700; line-height: 2.4375rem; } @@ -8488,8 +8488,8 @@ h2, .h2 { /* line 17, source/scss/overrides/_type.scss */ h3, .h3 { color: inherit; - font-family: "Zilla Slab", Georgia, Times, serif; - font-size: 1.944rem; + font-family: "Zilla Slab", "Georgia", serif; + font-size: 1.728rem; font-style: normal; font-weight: 700; line-height: 2.4375rem; } @@ -8497,24 +8497,24 @@ h3, .h3 { /* line 25, source/scss/overrides/_type.scss */ h4, .h4 { color: inherit; - font-family: "Zilla Slab", Georgia, Times, serif; - font-size: 1.62rem; + font-family: "Zilla Slab", "Georgia", serif; + font-size: 1.44rem; font-weight: 700; line-height: 1.625rem; } /* line 32, source/scss/overrides/_type.scss */ h5, .h5 { color: inherit; - font-family: "Zilla Slab", Georgia, Times, serif; - font-size: 1.35rem; + font-family: "Zilla Slab", "Georgia", serif; + font-size: 1.2rem; font-weight: 700; line-height: 1.625rem; } /* line 39, source/scss/overrides/_type.scss */ h6, .h6 { color: inherit; - font-family: "Zilla Slab", Georgia, Times, serif; - font-size: 1.125rem; + font-family: "Zilla Slab", "Georgia", serif; + font-size: 1rem; font-weight: 700; line-height: 1.625rem; } @@ -8523,7 +8523,7 @@ h6, .h6 { .display-2, .display-3, .display-4 { - font-family: "Zilla Slab", Georgia, Times, serif; } + font-family: "Zilla Slab", "Georgia", serif; } /* line 56, source/scss/overrides/_type.scss */ .lead { @@ -8535,11 +8535,11 @@ h6, .h6 { /* line 66, source/scss/overrides/_type.scss */ .font-family-serif { - font-family: "Zilla Slab", Georgia, Times, serif; } + font-family: "Zilla Slab", "Georgia", serif; } /* line 69, source/scss/overrides/_type.scss */ .font-family-sans-serif { - font-family: "Overpass", Helvetica, Arial, sans-serif; } + font-family: "Overpass", "Helvetica", "Arial", sans-serif; } /* line 74, source/scss/overrides/_type.scss */ span.dropcap { @@ -8570,8 +8570,8 @@ span.smallcaps { /* line 6, source/scss/overrides/_navbar.scss */ .navbar-toggler.navbar-text { border: none; - font-size: 1.125rem; - line-height: 1.44444; + font-size: 1rem; + line-height: 1.625; padding: 0; } /* line 15, source/scss/overrides/_navbar.scss */ @@ -8655,7 +8655,7 @@ span.smallcaps { /* line 1, source/scss/overrides/_buttons.scss */ .btn { - font-family: "Overpass", Helvetica, Arial, sans-serif; } + font-family: "Overpass", "Helvetica", "Arial", sans-serif; } /* line 4, source/scss/overrides/_buttons.scss */ * + .btn:not(.btn-block) { diff --git a/source/scss/_customization.scss b/source/scss/_customization.scss index 46734b0..b68d41f 100644 --- a/source/scss/_customization.scss +++ b/source/scss/_customization.scss @@ -1,11 +1,3 @@ -// tyfy variable customizations -$tyfy-grid-unit:0.8125rem; -$tyfy-serif:"Zilla Slab",Georgia,Times,serif; -$tyfy-sans:"Overpass",Helvetica,Arial,sans-serif; -$tyfy-font-base:$tyfy-sans; -$tyfy-symbol:"Material Icons"; -$tyfy-font-size-base:1.125rem; - // tyfy required @import "../../node_modules/tyfy/source/scss/required/core"; @import "../../node_modules/tyfy/source/scss/required/functions";