From 242a0279f129fa2549d62f8331c7ab319e4d7834 Mon Sep 17 00:00:00 2001 From: Kurtis Holsapple Date: Wed, 7 May 2025 08:32:24 -0700 Subject: [PATCH] WIP --- dist/app.css | 157 ++++++++++++++++++++++++++------------- dist/mix-manifest.json | 2 +- src/scss/_variables.scss | 1 + 3 files changed, 106 insertions(+), 54 deletions(-) diff --git a/dist/app.css b/dist/app.css index 9f1e129..2e6fa68 100644 --- a/dist/app.css +++ b/dist/app.css @@ -75,7 +75,7 @@ --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0)); --bs-body-font-family: var(--bs-font-sans-serif); - --bs-body-font-size: 1rem; + --bs-body-font-size: 1.25rem; --bs-body-font-weight: 400; --bs-body-line-height: 1.5; --bs-body-color: #333333; @@ -223,47 +223,52 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 { } h1, .h1 { - font-size: calc(1.375rem + 1.5vw); + font-size: calc(1.4375rem + 2.25vw); } @media (min-width: 1200px) { h1, .h1 { - font-size: 2.5rem; + font-size: 3.125rem; } } h2, .h2 { - font-size: calc(1.325rem + 0.9vw); + font-size: calc(1.375rem + 1.5vw); } @media (min-width: 1200px) { h2, .h2 { - font-size: 2rem; + font-size: 2.5rem; } } h3, .h3 { - font-size: calc(1.3rem + 0.6vw); + font-size: calc(1.34375rem + 1.125vw); } @media (min-width: 1200px) { h3, .h3 { - font-size: 1.75rem; + font-size: 2.1875rem; } } h4, .h4 { - font-size: calc(1.275rem + 0.3vw); + font-size: calc(1.3125rem + 0.75vw); } @media (min-width: 1200px) { h4, .h4 { - font-size: 1.5rem; + font-size: 1.875rem; } } h5, .h5 { - font-size: 1.25rem; + font-size: calc(1.28125rem + 0.375vw); +} +@media (min-width: 1200px) { + h5, .h5 { + font-size: 1.5625rem; + } } h6, .h6 { - font-size: 1rem; + font-size: 1.25rem; } p { @@ -591,9 +596,14 @@ progress { } .lead { - font-size: 1.25rem; + font-size: calc(1.28125rem + 0.375vw); font-weight: 300; } +@media (min-width: 1200px) { + .lead { + font-size: 1.5625rem; + } +} .display-1 { font-weight: 300; @@ -685,7 +695,12 @@ progress { .blockquote { margin-bottom: 1rem; - font-size: 1.25rem; + font-size: calc(1.28125rem + 0.375vw); +} +@media (min-width: 1200px) { + .blockquote { + font-size: 1.5625rem; + } } .blockquote > :last-child { margin-bottom: 0; @@ -2092,13 +2107,18 @@ progress { .col-form-label-lg { padding-top: calc(0.5rem + var(--bs-border-width)); padding-bottom: calc(0.5rem + var(--bs-border-width)); - font-size: 1.25rem; + font-size: calc(1.28125rem + 0.375vw); +} +@media (min-width: 1200px) { + .col-form-label-lg { + font-size: 1.5625rem; + } } .col-form-label-sm { padding-top: calc(0.25rem + var(--bs-border-width)); padding-bottom: calc(0.25rem + var(--bs-border-width)); - font-size: 0.875rem; + font-size: 1.09375rem; } .form-text { @@ -2111,7 +2131,7 @@ progress { display: block; width: 100%; padding: 0.375rem 0.75rem; - font-size: 1rem; + font-size: 1.25rem; font-weight: 400; line-height: 1.5; color: var(--bs-body-color); @@ -2208,7 +2228,7 @@ progress { .form-control-sm { min-height: calc(1.5em + 0.5rem + calc(var(--bs-border-width) * 2)); padding: 0.25rem 0.5rem; - font-size: 0.875rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-sm); } .form-control-sm::file-selector-button { @@ -2220,9 +2240,14 @@ progress { .form-control-lg { min-height: calc(1.5em + 1rem + calc(var(--bs-border-width) * 2)); padding: 0.5rem 1rem; - font-size: 1.25rem; + font-size: calc(1.28125rem + 0.375vw); border-radius: var(--bs-border-radius-lg); } +@media (min-width: 1200px) { + .form-control-lg { + font-size: 1.5625rem; + } +} .form-control-lg::file-selector-button { padding: 0.5rem 1rem; margin: -0.5rem -1rem; @@ -2267,7 +2292,7 @@ textarea.form-control-lg { display: block; width: 100%; padding: 0.375rem 2.25rem 0.375rem 0.75rem; - font-size: 1rem; + font-size: 1.25rem; font-weight: 400; line-height: 1.5; color: var(--bs-body-color); @@ -2309,7 +2334,7 @@ textarea.form-control-lg { padding-top: 0.25rem; padding-bottom: 0.25rem; padding-left: 0.5rem; - font-size: 0.875rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-sm); } @@ -2317,9 +2342,14 @@ textarea.form-control-lg { padding-top: 0.5rem; padding-bottom: 0.5rem; padding-left: 1rem; - font-size: 1.25rem; + font-size: calc(1.28125rem + 0.375vw); border-radius: var(--bs-border-radius-lg); } +@media (min-width: 1200px) { + .form-select-lg { + font-size: 1.5625rem; + } +} [data-bs-theme=dark] .form-select { --bs-form-select-bg-img: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23dee2e6' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"); @@ -2327,7 +2357,7 @@ textarea.form-control-lg { .form-check { display: block; - min-height: 1.5rem; + min-height: 1.875rem; padding-left: 1.5em; margin-bottom: 0.125rem; } @@ -2686,7 +2716,7 @@ textarea.form-control-lg { display: flex; align-items: center; padding: 0.375rem 0.75rem; - font-size: 1rem; + font-size: 1.25rem; font-weight: 400; line-height: 1.5; color: var(--bs-body-color); @@ -2702,16 +2732,24 @@ textarea.form-control-lg { .input-group-lg > .input-group-text, .input-group-lg > .btn { padding: 0.5rem 1rem; - font-size: 1.25rem; + font-size: calc(1.28125rem + 0.375vw); border-radius: var(--bs-border-radius-lg); } +@media (min-width: 1200px) { + .input-group-lg > .form-control, + .input-group-lg > .form-select, + .input-group-lg > .input-group-text, + .input-group-lg > .btn { + font-size: 1.5625rem; + } +} .input-group-sm > .form-control, .input-group-sm > .form-select, .input-group-sm > .input-group-text, .input-group-sm > .btn { padding: 0.25rem 0.5rem; - font-size: 0.875rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-sm); } @@ -2761,7 +2799,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.875rem; + font-size: 1.09375rem; color: #fff; background-color: var(--bs-success); border-radius: var(--bs-border-radius); @@ -2851,7 +2889,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.875rem; + font-size: 1.09375rem; color: #fff; background-color: var(--bs-danger); border-radius: var(--bs-border-radius); @@ -2929,7 +2967,7 @@ textarea.form-control-lg { --bs-btn-padding-x: 0.75rem; --bs-btn-padding-y: 0.375rem; --bs-btn-font-family: ; - --bs-btn-font-size: 1rem; + --bs-btn-font-size: 1.25rem; --bs-btn-font-weight: 400; --bs-btn-line-height: 1.5; --bs-btn-color: var(--bs-body-color); @@ -3303,14 +3341,19 @@ textarea.form-control-lg { .btn-lg, .btn-group-lg > .btn { --bs-btn-padding-y: 0.5rem; --bs-btn-padding-x: 1rem; - --bs-btn-font-size: 1.25rem; + --bs-btn-font-size: calc(1.28125rem + 0.375vw); --bs-btn-border-radius: var(--bs-border-radius-lg); } +@media (min-width: 1200px) { + .btn-lg, .btn-group-lg > .btn { + --bs-btn-font-size: 1.5625rem; + } +} .btn-sm, .btn-group-sm > .btn { --bs-btn-padding-y: 0.25rem; --bs-btn-padding-x: 0.5rem; - --bs-btn-font-size: 0.875rem; + --bs-btn-font-size: 1.09375rem; --bs-btn-border-radius: var(--bs-border-radius-sm); } @@ -3383,7 +3426,7 @@ textarea.form-control-lg { --bs-dropdown-padding-x: 0; --bs-dropdown-padding-y: 0.5rem; --bs-dropdown-spacer: 0.125rem; - --bs-dropdown-font-size: 1rem; + --bs-dropdown-font-size: 1.25rem; --bs-dropdown-color: var(--bs-body-color); --bs-dropdown-bg: var(--bs-body-bg); --bs-dropdown-border-color: var(--bs-border-color-translucent); @@ -3642,7 +3685,7 @@ textarea.form-control-lg { display: block; padding: var(--bs-dropdown-header-padding-y) var(--bs-dropdown-header-padding-x); margin-bottom: 0; - font-size: 0.875rem; + font-size: 1.09375rem; color: var(--bs-dropdown-header-color); white-space: nowrap; } @@ -3911,15 +3954,15 @@ textarea.form-control-lg { --bs-navbar-hover-color: rgba(var(--bs-emphasis-color-rgb), 0.8); --bs-navbar-disabled-color: rgba(var(--bs-emphasis-color-rgb), 0.3); --bs-navbar-active-color: rgba(var(--bs-emphasis-color-rgb), 1); - --bs-navbar-brand-padding-y: 0.3125rem; + --bs-navbar-brand-padding-y: 0.265625rem; --bs-navbar-brand-margin-end: 1rem; - --bs-navbar-brand-font-size: 1.25rem; + --bs-navbar-brand-font-size: 1.5625rem; --bs-navbar-brand-color: rgba(var(--bs-emphasis-color-rgb), 1); --bs-navbar-brand-hover-color: rgba(var(--bs-emphasis-color-rgb), 1); --bs-navbar-nav-link-padding-x: 0.5rem; --bs-navbar-toggler-padding-y: 0.25rem; --bs-navbar-toggler-padding-x: 0.75rem; - --bs-navbar-toggler-font-size: 1.25rem; + --bs-navbar-toggler-font-size: 1.5625rem; --bs-navbar-toggler-icon-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%2851, 51, 51, 0.75%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); --bs-navbar-toggler-border-color: rgba(var(--bs-emphasis-color-rgb), 0.15); --bs-navbar-toggler-border-radius: var(--bs-border-radius); @@ -4548,7 +4591,7 @@ textarea.form-control-lg { align-items: center; width: 100%; padding: var(--bs-accordion-btn-padding-y) var(--bs-accordion-btn-padding-x); - font-size: 1rem; + font-size: 1.25rem; color: var(--bs-accordion-btn-color); text-align: left; background-color: var(--bs-accordion-btn-bg); @@ -4690,7 +4733,7 @@ textarea.form-control-lg { .pagination { --bs-pagination-padding-x: 0.75rem; --bs-pagination-padding-y: 0.375rem; - --bs-pagination-font-size: 1rem; + --bs-pagination-font-size: 1.25rem; --bs-pagination-color: var(--bs-link-color); --bs-pagination-bg: var(--bs-body-bg); --bs-pagination-border-width: var(--bs-border-width); @@ -4770,14 +4813,19 @@ textarea.form-control-lg { .pagination-lg { --bs-pagination-padding-x: 1.5rem; --bs-pagination-padding-y: 0.75rem; - --bs-pagination-font-size: 1.25rem; + --bs-pagination-font-size: calc(1.28125rem + 0.375vw); --bs-pagination-border-radius: var(--bs-border-radius-lg); } +@media (min-width: 1200px) { + .pagination-lg { + --bs-pagination-font-size: 1.5625rem; + } +} .pagination-sm { --bs-pagination-padding-x: 0.5rem; --bs-pagination-padding-y: 0.25rem; - --bs-pagination-font-size: 0.875rem; + --bs-pagination-font-size: 1.09375rem; --bs-pagination-border-radius: var(--bs-border-radius-sm); } @@ -4911,7 +4959,7 @@ textarea.form-control-lg { .progress, .progress-stacked { --bs-progress-height: 1rem; - --bs-progress-font-size: 0.75rem; + --bs-progress-font-size: 0.9375rem; --bs-progress-bg: var(--bs-secondary-bg); --bs-progress-border-radius: var(--bs-border-radius); --bs-progress-box-shadow: var(--bs-box-shadow-inset); @@ -5726,7 +5774,7 @@ textarea.form-control-lg { --bs-tooltip-padding-x: 0.5rem; --bs-tooltip-padding-y: 0.25rem; --bs-tooltip-margin: ; - --bs-tooltip-font-size: 0.875rem; + --bs-tooltip-font-size: 1.09375rem; --bs-tooltip-color: var(--bs-body-bg); --bs-tooltip-bg: var(--bs-emphasis-color); --bs-tooltip-border-radius: var(--bs-border-radius); @@ -5825,7 +5873,7 @@ textarea.form-control-lg { .popover { --bs-popover-zindex: 1070; --bs-popover-max-width: 276px; - --bs-popover-font-size: 0.875rem; + --bs-popover-font-size: 1.09375rem; --bs-popover-bg: var(--bs-body-bg); --bs-popover-border-width: var(--bs-border-width); --bs-popover-border-color: var(--bs-border-color-translucent); @@ -5834,7 +5882,7 @@ textarea.form-control-lg { --bs-popover-box-shadow: var(--bs-box-shadow); --bs-popover-header-padding-x: 1rem; --bs-popover-header-padding-y: 0.5rem; - --bs-popover-header-font-size: 1rem; + --bs-popover-header-font-size: 1.25rem; --bs-popover-header-color: inherit; --bs-popover-header-bg: var(--bs-secondary-bg); --bs-popover-body-padding-x: 1rem; @@ -8303,27 +8351,27 @@ textarea.form-control-lg { } .fs-1 { - font-size: calc(1.375rem + 1.5vw) !important; + font-size: calc(1.4375rem + 2.25vw) !important; } .fs-2 { - font-size: calc(1.325rem + 0.9vw) !important; + font-size: calc(1.375rem + 1.5vw) !important; } .fs-3 { - font-size: calc(1.3rem + 0.6vw) !important; + font-size: calc(1.34375rem + 1.125vw) !important; } .fs-4 { - font-size: calc(1.275rem + 0.3vw) !important; + font-size: calc(1.3125rem + 0.75vw) !important; } .fs-5 { - font-size: 1.25rem !important; + font-size: calc(1.28125rem + 0.375vw) !important; } .fs-6 { - font-size: 1rem !important; + font-size: 1.25rem !important; } .fst-italic { @@ -11927,16 +11975,19 @@ textarea.form-control-lg { } @media (min-width: 1200px) { .fs-1 { - font-size: 2.5rem !important; + font-size: 3.125rem !important; } .fs-2 { - font-size: 2rem !important; + font-size: 2.5rem !important; } .fs-3 { - font-size: 1.75rem !important; + font-size: 2.1875rem !important; } .fs-4 { - font-size: 1.5rem !important; + font-size: 1.875rem !important; + } + .fs-5 { + font-size: 1.5625rem !important; } } @media print { diff --git a/dist/mix-manifest.json b/dist/mix-manifest.json index 752af1a..7b58d32 100644 --- a/dist/mix-manifest.json +++ b/dist/mix-manifest.json @@ -1,4 +1,4 @@ { "/app.js": "/app.js?id=099e96d934e937b07341f2ca9fb82ec2", - "/app.css": "/app.css?id=1ccc9475fed63639efe0734f1dfab66b" + "/app.css": "/app.css?id=ce92d1d56513e8e1e7a70407817c3af8" } diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index 3641f22..bc1d2fa 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -10,3 +10,4 @@ $c-textGrey: #333333; // Bootstrap overrides $font-family-sans-serif: 'Inter', sans-serif; $body-color: $c-textGrey; +$font-size-base: 1.25rem;