diff --git a/.github/workflows/dependencies-check.yml b/.github/workflows/dependencies-check.yml index 7d56ee0a17..a66ca74052 100644 --- a/.github/workflows/dependencies-check.yml +++ b/.github/workflows/dependencies-check.yml @@ -15,7 +15,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: '3.10.12' - cache: 'pip' - name: System Information run: | @@ -37,8 +36,15 @@ jobs: run: | python dependencies.py >> system_info.txt + - name: Prepare outputs + shell: bash + run: | + mkdir -p analysis_output + mv system_info.txt analysis_output/ + cp -r dependencies_analysis analysis_output/ + - name: Upload dependencies output uses: actions/upload-artifact@v4 with: name: dependencies-report - path: system_info.txt + path: analysis_output diff --git a/cms/sass/base/_fonts.scss b/cms/sass/base/_fonts.scss index e01c5bf75b..3a00b2e38c 100644 --- a/cms/sass/base/_fonts.scss +++ b/cms/sass/base/_fonts.scss @@ -13,4 +13,4 @@ @mixin font-monospace { font-family: 'Source Code Pro', monospace; letter-spacing: normal; -} +} \ No newline at end of file diff --git a/cms/sass/base/_general.scss b/cms/sass/base/_general.scss index 0cc4ed5ceb..11b7d9b88e 100644 --- a/cms/sass/base/_general.scss +++ b/cms/sass/base/_general.scss @@ -2,10 +2,13 @@ html { scroll-behavior: smooth; - font-size: 20px; + font-size: 100%; +} +body { + font-size: $typescale-05; @media (max-width: 768px) { - font-size: 18px; + font-size: $typescale-06; } } @@ -17,7 +20,7 @@ h2, h3, h4, h5, h6 { margin: $spacing-04 0 $spacing-03 0; line-height: 1.05; font-weight: 400; - scroll-margin-top: 60px; + scroll-margin-top: $spacing-05; &:first-child { margin-top: 0; @@ -28,29 +31,32 @@ h1 { margin: $spacing-04 0; font-weight: 700; line-height: 1.05; - scroll-margin-top: 600px; - @include typescale-01; + scroll-margin-top: 37.5rem; + font-size: $typescale-03; @include font-serif; } h2 { - @include typescale-02; + font-size: $typescale-03; } h3 { - @include typescale-03; + font-size: $typescale-05; + .tag { + font-size: $typescale-06 !important; + } } h4 { - @include typescale-04; + font-size: $typescale-06; } h5 { - @include typescale-05; + font-size: $typescale-06; } h6 { - @include typescale-06; + font-size: $typescale-06; } ul, ol { @@ -70,7 +76,7 @@ dl { dt { color: $dark-grey; - @include typescale-06; + font-size: $typescale-06; &:not(:first-child) { margin-top: $spacing-03; @@ -92,7 +98,7 @@ p, blockquote, ul, ol { pre, code { @include font-monospace; - @include typescale-06; + font-size: $typescale-06; background: $light-grey; } @@ -123,7 +129,7 @@ section { } blockquote { - padding-left: 1.5em; + padding-left: $spacing-04; border-left: 1px solid $sanguine; font-style: italic; @@ -159,7 +165,7 @@ table { thead { text-align: left; color: $dark-grey; - @include typescale-06; + font-size: $typescale-06; } tr { @@ -202,11 +208,11 @@ table { aside { h2 { - @include typescale-03; + font-size: $typescale-03; } h2 { - @include typescale-04; + font-size: $typescale-04; } form { @@ -235,10 +241,10 @@ input, select, button, textarea { border-radius: 0; display: inline-block; - padding: 0.5em; + padding: $spacing-02; background-color: $white; border: 1px solid $warm-black; - font-size: smaller; + font-size: $typescale-06; @include font-sans; } @@ -247,7 +253,7 @@ textarea { } select { - padding-right: 30px; + padding-right: $spacing-04; -webkit-appearance: none; -moz-appearance: none; appearance: none; @@ -270,6 +276,8 @@ input[type="radio"] { height: 0.8em; pointer-events: none; //margin-left: -0.8rem; + width: $spacing-03; + height: $spacing-03; &:focus + label { outline: solid 2px $warm-black; @@ -285,16 +293,16 @@ input[type="radio"] { margin: 0 0 $spacing-03 0; line-height: 1; color: $dark-grey; - font-size: 1rem; + font-size: $typescale-05; } + label::before { content: '\a0'; display: inline-block; margin: 0 $spacing-02 0 0; - width: 0.8em; - height: 0.8em; - line-height: 0.75em; + width: $spacing-03; + height: $spacing-03; + line-height: 0.75; transition: all 0.35s; border: 1px solid $warm-black; } @@ -332,4 +340,4 @@ fieldset { .feather { height: 1em; width: auto; -} +} \ No newline at end of file diff --git a/cms/sass/base/_grid.scss b/cms/sass/base/_grid.scss index 4b44ea97a1..217379ae7f 100644 --- a/cms/sass/base/_grid.scss +++ b/cms/sass/base/_grid.scss @@ -4,20 +4,20 @@ @media screen and (max-width: 768px) { width: auto; - padding-left: 20px; - padding-right: 20px; + padding-left: $spacing-03a; + padding-right: $spacing-03a; } @media screen and (max-width: 1279px) and (min-width: 769px) { width: auto; - padding-left: 30px; - padding-right: 30px; + padding-left: $spacing-04; + padding-right: $spacing-04; } @media screen and (max-width: 1479px) and (min-width: 1280px) { width: auto; - padding-left: 40px; - padding-right: 40px; + padding-left: $spacing-04a; + padding-right: $spacing-04a; } @media screen and (min-width: 1480px) { @@ -32,17 +32,17 @@ } .row { - margin-left: -20px; - margin-right: -20px; + margin-left: -$spacing-03a; + margin-right: -$spacing-03a; @media screen and (max-width: 1279px) and (min-width: 768px) { - margin-left: -30px; - margin-right: -30px; + margin-left: -$spacing-04; + margin-right: -$spacing-04; } @media screen and (min-width: 1280px) { - margin-left: -40px; - margin-right: -40px; + margin-left: -$spacing-04a; + margin-right: -$spacing-04a; } } @@ -65,17 +65,17 @@ } .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { - padding-left: 20px; - padding-right: 20px; + padding-left: $spacing-03a; + padding-right: $spacing-03a; @media screen and (max-width: 1279px) and (min-width: 768px) { - padding-left: 30px; - padding-right: 30px; + padding-left: $spacing-04; + padding-right: $spacing-04; } @media screen and (min-width: 1280px) { - padding-left: 40px; - padding-right: 40px; + padding-left: $spacing-04a; + padding-right: $spacing-04a; } } @@ -138,4 +138,4 @@ .col-lg-6:nth-child(2n+1) { clear: both; } -} +} \ No newline at end of file diff --git a/cms/sass/base/_highlight.scss b/cms/sass/base/_highlight.scss index f2e3e77165..c1afd49f58 100644 --- a/cms/sass/base/_highlight.scss +++ b/cms/sass/base/_highlight.scss @@ -182,4 +182,4 @@ .il { color: #009999; } -} +} \ No newline at end of file diff --git a/cms/sass/base/_palette.scss b/cms/sass/base/_palette.scss index 963b2efef3..41b1dbf198 100644 --- a/cms/sass/base/_palette.scss +++ b/cms/sass/base/_palette.scss @@ -39,4 +39,4 @@ $bronze: #A77044; --mid-green: #47A178; --light-green: #A3C386; --yellow: #F9D950; -} +} \ No newline at end of file diff --git a/cms/sass/base/_spacing.scss b/cms/sass/base/_spacing.scss index 5df34a7c31..82dbe970ca 100644 --- a/cms/sass/base/_spacing.scss +++ b/cms/sass/base/_spacing.scss @@ -1,12 +1,14 @@ /* Variables for spacing units Use with margins & padding - Base unit: 16px */ + Base unit: 1rem */ -$spacing-01: 0.1875rem; -$spacing-02: 0.375rem; -$spacing-03: 0.75rem; +$spacing-01: 0.25rem; +$spacing-02: 0.5rem; +$spacing-03: 1rem; +$spacing-03a: 1.25rem; $spacing-03--negative: -.75rem; -$spacing-04: 1.5rem; -$spacing-05: 3rem; -$spacing-06: 6rem; -$spacing-07: 12rem; +$spacing-04: 1.75rem; +$spacing-04a: 2.5rem; +$spacing-05: 3.75rem; +$spacing-06: 7.5rem; +$spacing-07: 15rem; \ No newline at end of file diff --git a/cms/sass/base/_typescale.scss b/cms/sass/base/_typescale.scss index 1317c3a67a..d8bea7aa9e 100644 --- a/cms/sass/base/_typescale.scss +++ b/cms/sass/base/_typescale.scss @@ -1,27 +1,11 @@ -/* Mixins for typescale in minor second - Use with headings and text only - Base unit: 16px */ - -@mixin typescale-01 { - font-size: 1.802em; -} - -@mixin typescale-02 { - font-size: 1.602em; -} - -@mixin typescale-03 { - font-size: 1.424em; -} - -@mixin typescale-04 { - font-size: 1.266em; -} - -@mixin typescale-05 { - font-size: 1.125em; -} - -@mixin typescale-06 { - font-size: .889em; -} +/* Variables for typescale */ + +$typescale-01: 2.25rem; +$typescale-02: 2rem; +$typescale-03: 1.75rem; +$typescale-04: 1.5rem; +$typescale-04--smaller: 1.4rem; +$typescale-05: 1.25rem; +$typescale-06--bigger: 1.1rem; +$typescale-06: 1rem; +$typescale-07: 0.9rem; diff --git a/cms/sass/base/_utils.scss b/cms/sass/base/_utils.scss index 6dee402c41..f83a914438 100644 --- a/cms/sass/base/_utils.scss +++ b/cms/sass/base/_utils.scss @@ -23,7 +23,7 @@ } @mixin box-shadow { - box-shadow: rgba(0, 0, 0, 0.25) 0px 3px 8px; + box-shadow: rgba(0, 0, 0, 0.25) 0 0.2rem 0.5rem; } /// Make element visible or focussable to screen readers only @@ -50,7 +50,7 @@ // Default style for all Creative Commons icons .cc-icon { - height: 1rem; + height: 1.25rem; width: auto; circle { @@ -103,27 +103,27 @@ } .type-01 { - @include typescale-01; + font-size: $typescale-01; } .type-02 { - @include typescale-02; + font-size: $typescale-02; } .type-03 { - @include typescale-03; + font-size: $typescale-03; } .type-04 { - @include typescale-04; + font-size: $typescale-04; } .type-05 { - @include typescale-05; + font-size: $typescale-05; } .type-06 { - @include typescale-06; + font-size: $typescale-06; } .stroke-gold { @@ -239,24 +239,24 @@ position: fixed; z-index: 2000; align-items: center; - width: 50px; - height: 50px; - top: 100px; + width: 3.125rem; + height: 3.125rem; + top: 6.25rem; right: 0; background-color: $warm-black; svg { display: block; - margin: 10px auto; - height: 30px; + margin: 0.625rem auto; + height: $spacing-04; stroke: $white; } + .admin-edit { - top: 150px; + top: 9.375rem; } &:hover { background-color: $sanguine; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_alert.scss b/cms/sass/components/_alert.scss index 2132c103cc..d23f75f9aa 100644 --- a/cms/sass/components/_alert.scss +++ b/cms/sass/components/_alert.scss @@ -6,7 +6,7 @@ margin: $spacing-02 0 $spacing-03 0; background-color: $light-grey; border: 1px solid $warm-black; - @include typescale-06; + font-size: $typescale-06--bigger; &__close { float: right; @@ -42,4 +42,4 @@ height: 1em; vertical-align: middle; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_back-to-top.scss b/cms/sass/components/_back-to-top.scss index 9cef4a2645..a7c11e55f8 100644 --- a/cms/sass/components/_back-to-top.scss +++ b/cms/sass/components/_back-to-top.scss @@ -5,10 +5,10 @@ position: fixed; z-index: 2000; align-items: center; - width: 35px; - height: 35px; - bottom: 35px; - right: 25px; + width: 2.1875rem; + height: 2.1875rem; + bottom: 2.1875rem; + right: 1.5625rem; background-color: $grapefruit; svg { @@ -16,4 +16,4 @@ margin: 0 auto; stroke: $warm-black; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_badges.scss b/cms/sass/components/_badges.scss index 29c61fe165..248bd70846 100644 --- a/cms/sass/components/_badges.scss +++ b/cms/sass/components/_badges.scss @@ -1,15 +1,15 @@ .badges { &--toc { display: flex; - gap: 1rem; + gap: 1.25rem; align-items: center; justify-content: flex-end; max-height: 100%; #s2o { width: 50%; - min-width: 3rem; - max-width: 6rem; + min-width: $spacing-05; + max-width: $spacing-06; #s2o { max-height: 100%; } @@ -18,8 +18,8 @@ @media (max-width: 768px) { width: 100%; justify-content: flex-start; - max-height: 3rem; - margin-bottom: .5rem; + max-height: $spacing-05; + margin-bottom: .625rem; #s2o { max-height: 100%; @@ -36,10 +36,10 @@ display: flex; align-items: center; flex-wrap: wrap; - gap: .5rem; + gap: .625rem; &--public { - margin-top: .5rem; + margin-top: .625rem; } &--maned { diff --git a/cms/sass/components/_buttons.scss b/cms/sass/components/_buttons.scss index 061c75c454..dca97d9abd 100644 --- a/cms/sass/components/_buttons.scss +++ b/cms/sass/components/_buttons.scss @@ -22,7 +22,7 @@ input[type="button"], text-transform: uppercase; text-decoration: none; text-align: center; - font-size: smaller; + font-size: $typescale-07; color: currentColor; &:hover, @@ -123,4 +123,4 @@ button.aria-button { -webkit-appearance: none; -moz-appearance: none; appearance: none; -} +} \ No newline at end of file diff --git a/cms/sass/components/_card.scss b/cms/sass/components/_card.scss index 876ba049f6..323836a303 100644 --- a/cms/sass/components/_card.scss +++ b/cms/sass/components/_card.scss @@ -5,18 +5,22 @@ margin-bottom: $spacing-04; background-color: $white; border-radius: $spacing-02; - @include typescale-06; + font-size: $typescale-06--bigger; @include box-shadow; @media screen and (min-width: 768px) { margin-bottom: $spacing-05; } + + .tag { + font-size: 0.75rem; + } } .card--compact { margin-bottom: $spacing-04; border-radius: $spacing-01; - font-size: smaller; + font-size: $typescale-07; } .card__header { @@ -36,7 +40,7 @@ > svg { margin: $spacing-01 $spacing-03 0 0; flex-shrink: 0; - height: 20px; + height: 1.25rem; width: auto; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_cookie-consent.scss b/cms/sass/components/_cookie-consent.scss index eacf71804e..96ca4ac8d6 100644 --- a/cms/sass/components/_cookie-consent.scss +++ b/cms/sass/components/_cookie-consent.scss @@ -8,7 +8,7 @@ width: 100%; z-index: 2001; background-color: $warm-black; - @include typescale-06; + font-size: $typescale-06; p, a { margin: 0; @@ -27,4 +27,4 @@ background: $warm-black; } } -} +} \ No newline at end of file diff --git a/cms/sass/components/_dropdown.scss b/cms/sass/components/_dropdown.scss index 07524b5101..f8cb2f0a08 100644 --- a/cms/sass/components/_dropdown.scss +++ b/cms/sass/components/_dropdown.scss @@ -44,7 +44,7 @@ font-weight: 400; text-transform: none; line-height: 1; - @include typescale-06; + font-size: $typescale-06; &:hover, &:active, @@ -75,4 +75,4 @@ .dropdown:hover .dropdown__menu { display: block; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_filters.scss b/cms/sass/components/_filters.scss index 871fe4a58e..889d394e12 100644 --- a/cms/sass/components/_filters.scss +++ b/cms/sass/components/_filters.scss @@ -3,14 +3,14 @@ .filters { margin-bottom: $spacing-04; border: 0; - @include typescale-06; + font-size: $typescale-06; input[type="checkbox"], input[type="radio"] { display: unset; opacity: 0; - width: 0.8em; - height: 0.8em; + width: $spacing-03; + height: $spacing-03; &:focus + label { outline: dashed 2px lightgrey; @@ -55,7 +55,7 @@ .filter__search { margin-bottom: $spacing-03; width: 100%; - font-size: smaller; + font-size: $typescale-07; border-color: rgba($dark-grey, 0.75); color: $warm-black; background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-search'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); @@ -98,7 +98,7 @@ } .filter__label { - font-size: 1em !important; + font-size: $typescale-06 !important; } // Display header like a button when on smaller viewports @@ -111,7 +111,7 @@ background-color: $light-grey; letter-spacing: 0.05em; text-transform: uppercase; - @include typescale-06; + font-size: $typescale-06; } } @@ -128,4 +128,4 @@ display: block; } } -} +} \ No newline at end of file diff --git a/cms/sass/components/_form.scss b/cms/sass/components/_form.scss index 75f73723fc..d46744b8ec 100644 --- a/cms/sass/components/_form.scss +++ b/cms/sass/components/_form.scss @@ -15,7 +15,7 @@ margin-bottom: $spacing-03; font-weight: 700; line-height: 1; - @include typescale-01; + font-size: $typescale-01; @include font-serif; } @@ -39,7 +39,7 @@ p, label { margin-bottom: $spacing-03; - @include typescale-05; + font-size: $typescale-04--smaller; } button { @@ -58,13 +58,13 @@ width: 25%; } &[type="radio"], &[type="checkbox"] { - width: 0.8rem; + width: 1rem; } } input[type="checkbox"] + label, input[type="radio"] + label { - font-size: 1rem; + font-size: $typescale-05; } textarea:disabled { @@ -77,7 +77,7 @@ .form__question--optional { color: rgba($dark-grey, 0.5); - font-size: 1rem; + font-size: $typescale-05; } .form__hint { @@ -103,7 +103,7 @@ /* Compact form */ .form--compact { - @include typescale-06; + font-size: $typescale-06; h1 { margin-top: 0; @@ -115,17 +115,13 @@ background-color: $light-grey; } - small { - font-size: 1em; - } - button { margin: $spacing-02 0; } .form__header { margin: $spacing-03 0; - font-size: 1em; + font-size: $typescale-06; font-weight: 600; } @@ -134,7 +130,7 @@ input, select, textarea, .select2-container { margin-bottom: $spacing-02; - font-size: 1em; + font-size: $typescale-06; + button { margin: 0 0 $spacing-02 $spacing-02; @@ -143,7 +139,7 @@ input[type="checkbox"]+label, input[type="radio"]+label { - font-size: 1em; + font-size: $typescale-05; } } } @@ -166,8 +162,8 @@ content: ''; background-image: url("data:image/svg+xml,%3Csvg width='14' height='14' viewBox='0 0 14 14' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M7 4.6V7M7 9.4H7.006M4.516 1H9.484L13 4.516V9.484L9.484 13H4.516L1 9.484V4.516L4.516 1Z' stroke='%23982E0A' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E%0A"); background-repeat: no-repeat; - height: 14px; - width: 14px; + height: 0.875rem; + width: 0.875rem; } } -} +} \ No newline at end of file diff --git a/cms/sass/components/_hero.scss b/cms/sass/components/_hero.scss index c080afcc29..09d450cb65 100644 --- a/cms/sass/components/_hero.scss +++ b/cms/sass/components/_hero.scss @@ -24,16 +24,16 @@ } input[type="checkbox"]+label, input[type="radio"]+label { - font-size: 1em; + font-size: $typescale-05; } select { - padding: $spacing-02 30px $spacing-02 $spacing-02; + padding: $spacing-02 $spacing-04 $spacing-02 $spacing-02; } input, select, textarea, button { margin-bottom: $spacing-03; max-width: 100%; - font-size: 1em; + font-size: $typescale-05; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_input-group.scss b/cms/sass/components/_input-group.scss index fb699bbc7d..4cf59cc637 100644 --- a/cms/sass/components/_input-group.scss +++ b/cms/sass/components/_input-group.scss @@ -1,7 +1,7 @@ /* Input groups */ .input-group { - margin: 0 0 1rem 0; + margin: 0 0 1.25rem 0; position: relative; display: flex; flex-direction: row; @@ -42,4 +42,4 @@ &:not(:first-child) { margin-left: -1px; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_label.scss b/cms/sass/components/_label.scss index 8796371365..9ed6bd22fe 100644 --- a/cms/sass/components/_label.scss +++ b/cms/sass/components/_label.scss @@ -8,7 +8,7 @@ font-weight: 600; letter-spacing: 0.05em; text-transform: uppercase; - font-size: smaller; + font-size: $typescale-07; color: $sanguine; a { @@ -45,9 +45,9 @@ .label--large { margin: $spacing-01 0 $spacing-02 0; color: $warm-black; - @include typescale-04; + font-size: $typescale-04; a { color: $warm-black; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_loading.scss b/cms/sass/components/_loading.scss index f651afaddb..88eea807dd 100644 --- a/cms/sass/components/_loading.scss +++ b/cms/sass/components/_loading.scss @@ -26,4 +26,4 @@ opacity: 0.3; transform: translate3d(0, -0.5em, 0); } -} +} \ No newline at end of file diff --git a/cms/sass/components/_logo.scss b/cms/sass/components/_logo.scss index c045be53be..9832646c00 100644 --- a/cms/sass/components/_logo.scss +++ b/cms/sass/components/_logo.scss @@ -2,20 +2,20 @@ .logo { display: flex; - padding-top: 15px; - padding-bottom: 15px; + padding-top: $spacing-03; + padding-bottom: $spacing-03; height: 100%; - max-height: 90px; + max-height: 5.625rem; transition: height 0.3s ease-out; svg { - height: 60px; + height: $spacing-05; } } .logo__tagline { margin-left: $spacing-03; - font-size: 17px; + font-size: $typescale-05; font-weight: 600; line-height: 1.15; text-transform: uppercase; @@ -23,4 +23,4 @@ @media (max-width: 768px) { display: none; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_modal.scss b/cms/sass/components/_modal.scss index 09f12cb8f2..e03299a334 100644 --- a/cms/sass/components/_modal.scss +++ b/cms/sass/components/_modal.scss @@ -16,7 +16,7 @@ bottom: 0; left: 0; z-index: 1050; - padding-top: 100px; + padding-top: 6.25rem; display: none; overflow: hidden; -webkit-overflow-scrolling: touch; @@ -95,6 +95,6 @@ @media (min-width: 768px) { .modal__dialog { width: 60vw; - margin: 30px auto; + margin: $spacing-04 auto; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_motivational-banner.scss b/cms/sass/components/_motivational-banner.scss index 583a10021e..26eada4017 100644 --- a/cms/sass/components/_motivational-banner.scss +++ b/cms/sass/components/_motivational-banner.scss @@ -6,6 +6,7 @@ margin-bottom: 0; .tag { + font-size: $typescale-06 !important; margin: 0 $spacing-02; } } diff --git a/cms/sass/components/_notifications.scss b/cms/sass/components/_notifications.scss index a7975845c4..58b245bd9b 100644 --- a/cms/sass/components/_notifications.scss +++ b/cms/sass/components/_notifications.scss @@ -1,8 +1,8 @@ .notifications { overflow-y: scroll; height: fit-content; - width: 300px; - @include typescale-06; + width: 18.75rem; + font-size: $typescale-06; } .notifications__item { @@ -28,4 +28,4 @@ width: $spacing-02; border-radius: $spacing-02; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_numbered-table.scss b/cms/sass/components/_numbered-table.scss index 8bde6fc6ff..4f7c9e7929 100644 --- a/cms/sass/components/_numbered-table.scss +++ b/cms/sass/components/_numbered-table.scss @@ -8,14 +8,14 @@ counter-increment: row-number; td { - @include typescale-06; + font-size: $typescale-06; &:first-child::before { padding-right: $spacing-03; content: counter(row-number); vertical-align: baseline; font-weight: 400; - @include typescale-05; + font-size: $typescale-05; @include font-serif; } @@ -29,8 +29,8 @@ .numbered-table--labels { td { &:nth-child(2) { - @include typescale-05; + font-size: $typescale-05; @include font-serif; } } -} +} \ No newline at end of file diff --git a/cms/sass/components/_pager-buttons.scss b/cms/sass/components/_pager-buttons.scss index 90d014f697..017a4e6625 100644 --- a/cms/sass/components/_pager-buttons.scss +++ b/cms/sass/components/_pager-buttons.scss @@ -9,7 +9,7 @@ .pager-buttons__left, .pager-buttons__center, .pager-buttons__right { - padding: 0.5em $spacing-03; + padding: $spacing-02 $spacing-03; border: 1px solid; text-decoration: none; } @@ -57,4 +57,4 @@ background: $sanguine; color: $white; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_pagination.scss b/cms/sass/components/_pagination.scss index 4ff24b4e7b..781b9de55a 100644 --- a/cms/sass/components/_pagination.scss +++ b/cms/sass/components/_pagination.scss @@ -2,7 +2,7 @@ text-align: center; color: rgba($warm-black, 0.75); font-style: italic; - @include typescale-06; + font-size: $typescale-06; ul { display: flex; @@ -45,4 +45,4 @@ } -} +} \ No newline at end of file diff --git a/cms/sass/components/_portrait.scss b/cms/sass/components/_portrait.scss index 7e391721fe..96a9ef95b3 100644 --- a/cms/sass/components/_portrait.scss +++ b/cms/sass/components/_portrait.scss @@ -46,4 +46,4 @@ @media (min-width: 769px) { height: $spacing-06 * 2; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_progress-bar.scss b/cms/sass/components/_progress-bar.scss index c6aa9195bc..239674e789 100644 --- a/cms/sass/components/_progress-bar.scss +++ b/cms/sass/components/_progress-bar.scss @@ -9,7 +9,7 @@ display: flex; align-items: center; padding: 0 $spacing-03; - height: 50px; + height: 3.125rem; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/cms/sass/components/_removable-fields.scss b/cms/sass/components/_removable-fields.scss index 9b80386b24..4ae7aa68e0 100644 --- a/cms/sass/components/_removable-fields.scss +++ b/cms/sass/components/_removable-fields.scss @@ -10,4 +10,4 @@ label.hiddenLabel { @extend .sr-only; // a11y-friendly, can’t add class to the form itself } -} +} \ No newline at end of file diff --git a/cms/sass/components/_review-table.scss b/cms/sass/components/_review-table.scss index d9abda6bdd..f07e5416bb 100644 --- a/cms/sass/components/_review-table.scss +++ b/cms/sass/components/_review-table.scss @@ -2,7 +2,7 @@ .review-table { table-layout: fixed; - @include typescale-06; + font-size: $typescale-06; &__header { border: 0; @@ -25,4 +25,4 @@ } } } -} +} \ No newline at end of file diff --git a/cms/sass/components/_search-results.scss b/cms/sass/components/_search-results.scss index 73c971e4c2..558410450e 100644 --- a/cms/sass/components/_search-results.scss +++ b/cms/sass/components/_search-results.scss @@ -4,10 +4,10 @@ padding-left: 0; margin-left: 0; list-style: none; - font-size: 20px; + font-size: $typescale-05;; @media (max-width: 768px) { - font-size: 18px; + font-size: $typescale-05; } } @@ -26,7 +26,7 @@ .search-results__heading { margin: 0 0 $spacing-03 0; font-weight: 600; - font-size: 1em; + font-size: $typescale-06--bigger; line-height: 1.45; svg { @@ -53,11 +53,11 @@ } .search-results__body { - @include typescale-06; + font-size: $typescale-06; h4 { margin: $spacing-03 0 $spacing-02 0; - font-size: 1em; + font-size: $typescale-06; font-weight: 600; .feather { @@ -77,7 +77,7 @@ .search-results__aside { border: 0; color: $dark-grey; - @include typescale-06; + font-size: $typescale-06; ul { @include unstyled-list; @@ -91,4 +91,4 @@ margin-top: $spacing-03; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_select2.scss b/cms/sass/components/_select2.scss index 2675ff6bfc..78e5035276 100644 --- a/cms/sass/components/_select2.scss +++ b/cms/sass/components/_select2.scss @@ -1,8 +1,8 @@ // Select2 overrides // Variables specific to this sheet -$s2-space: 0.5em; -$s2-size: 20px; +$s2-space: $spacing-02; +$s2-size: $spacing-01; .select2 { height: 100% !important; @@ -22,7 +22,7 @@ $s2-size: 20px; appearance: none; display: block; padding: $s2-space $s2-space 0 $s2-space; - min-height: 46px; + min-height: 2.875rem; background: $white; border: 1px solid $warm-black; @include font-sans; @@ -36,7 +36,7 @@ $s2-size: 20px; text-decoration: none; border: 0; box-shadow: none; - height: 30px; + height: $spacing-04; div { margin-left: $s2-size; @@ -64,9 +64,9 @@ $s2-size: 20px; background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23FEFBF8' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-x'%3E%3Cline x1='18' y1='6' x2='6' y2='18'%3E%3C/line%3E%3Cline x1='6' y1='6' x2='18' y2='18'%3E%3C/line%3E%3C/svg%3E") !important; background-repeat: no-repeat; background-size: $s2-size !important; - right: 30px !important; - left: 10px; - top: 5px; + right: $spacing-04 !important; + left: 0.625rem; + top: 0.3125rem; height: $s2-size; width: $s2-size; @@ -81,7 +81,7 @@ $s2-size: 20px; + .select2-search-choice-close { background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23000' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-x'%3E%3Cline x1='18' y1='6' x2='6' y2='18'%3E%3C/line%3E%3Cline x1='6' y1='6' x2='18' y2='18'%3E%3C/line%3E%3C/svg%3E") !important; - top: 11px; + top: 0.6875rem; left: auto; } } @@ -138,4 +138,4 @@ $s2-size: 20px; background-size: $s2-size !important; background-position: right !important; font-size: initial; -} +} \ No newline at end of file diff --git a/cms/sass/components/_skip-to-main-content.scss b/cms/sass/components/_skip-to-main-content.scss index 3542adb62c..56a93bacf5 100644 --- a/cms/sass/components/_skip-to-main-content.scss +++ b/cms/sass/components/_skip-to-main-content.scss @@ -7,20 +7,20 @@ flex-direction: row; align-items: center; min-width: min-content; - padding: 5px; - top: 10px; - left: 10px; + padding: 0.3125rem; + top: 0.625rem; + left: 0.625rem; background-color: $grapefruit; svg { display: block; margin: 0 auto; stroke: $warm-black; - margin-rigth: 10px; + margin-rigth: 0.625rem; } &:hover, &:focus { svg { - margin-right: 10px; + margin-right: 0.625rem; } } &:hover:after, &:focus:after { diff --git a/cms/sass/components/_stat.scss b/cms/sass/components/_stat.scss index 855840e7ae..329f361c6e 100644 --- a/cms/sass/components/_stat.scss +++ b/cms/sass/components/_stat.scss @@ -17,12 +17,12 @@ display: block; font-weight: 600; @include font-serif; - @include typescale-03; + font-size: $typescale-03; } .stat__description { display: block; text-transform: uppercase; line-height: 1.35; - @include typescale-06; -} + font-size: $typescale-06--bigger; +} \ No newline at end of file diff --git a/cms/sass/components/_stretch-list.scss b/cms/sass/components/_stretch-list.scss index a3c2e54349..8ae4199e01 100644 --- a/cms/sass/components/_stretch-list.scss +++ b/cms/sass/components/_stretch-list.scss @@ -33,4 +33,4 @@ ol.stretch-list, .stretch-list__itemv:before { content: "0"counter(item)" "; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_tabs.scss b/cms/sass/components/_tabs.scss index 272704a470..419d651ca9 100644 --- a/cms/sass/components/_tabs.scss +++ b/cms/sass/components/_tabs.scss @@ -64,4 +64,4 @@ margin-top: 0; padding-top: 0; } -} +} \ No newline at end of file diff --git a/cms/sass/components/_tabular-list.scss b/cms/sass/components/_tabular-list.scss index 47680fcf05..d98592eefb 100644 --- a/cms/sass/components/_tabular-list.scss +++ b/cms/sass/components/_tabular-list.scss @@ -15,7 +15,7 @@ border-bottom: 1px solid rgba($dark-grey, 0.25); counter-increment: row-number; @include font-serif; - @include typescale-05; + font-size: $typescale-05; &:last-child { border-bottom: 0; @@ -27,12 +27,12 @@ list-style: none; width: 60%; @include font-sans; - @include typescale-06; + font-size: $typescale-06; } h3 { padding-top: 0; - font-size: 1em; + font-size: $typescale-05; font-weight: 400; } } @@ -52,4 +52,4 @@ @include font-serif; } } -} +} \ No newline at end of file diff --git a/cms/sass/components/_tag.scss b/cms/sass/components/_tag.scss index 836e55c7ef..fe217bff6a 100644 --- a/cms/sass/components/_tag.scss +++ b/cms/sass/components/_tag.scss @@ -16,7 +16,7 @@ background: $warm-black; color: $white; text-decoration: none; - @include typescale-06; + font-size: $typescale-06; a { text-decoration: none; @@ -94,4 +94,4 @@ .tag--confirmation { background: $dark-green; color: $white; -} +} \ No newline at end of file diff --git a/cms/sass/components/_title-list.scss b/cms/sass/components/_title-list.scss index 55a599dc4b..b496a29883 100644 --- a/cms/sass/components/_title-list.scss +++ b/cms/sass/components/_title-list.scss @@ -4,7 +4,7 @@ .title-list { padding-left: 0; list-style: none; - @include typescale-06; + font-size: $typescale-06; } .title-list__link, @@ -41,9 +41,9 @@ margin-bottom: $spacing-03; font-weight: 400; line-height: 1.35; - @include typescale-04; + font-size: $typescale-04; } .title-list--large { - @include typescale-05; -} + font-size: $typescale-05; +} \ No newline at end of file diff --git a/cms/sass/fq_widget.scss b/cms/sass/fq_widget.scss index f848ef0e3e..9e257a9712 100644 --- a/cms/sass/fq_widget.scss +++ b/cms/sass/fq_widget.scss @@ -84,4 +84,4 @@ overflow: hidden; } } -} +} \ No newline at end of file diff --git a/cms/sass/layout/_editorial-panel.scss b/cms/sass/layout/_editorial-panel.scss index 732bfdd465..434b7f4943 100644 --- a/cms/sass/layout/_editorial-panel.scss +++ b/cms/sass/layout/_editorial-panel.scss @@ -24,7 +24,7 @@ &__wrapper { display: flex; flex-direction: column; - max-height: calc(100vh - 75px - 1.5rem - 25px); //(full viewport)-(nav height)-(top padding)-(bottom padding) + max-height: calc(100vh - 4.6875rem - $spacing-04 - 1.5625rem); //(full viewport)-(nav height)-(top padding)-(bottom padding) adjust_values.py } &__content { diff --git a/cms/sass/layout/_nav-bar.scss b/cms/sass/layout/_nav-bar.scss index 4c03b4ca44..dac6d6f6bd 100644 --- a/cms/sass/layout/_nav-bar.scss +++ b/cms/sass/layout/_nav-bar.scss @@ -7,7 +7,7 @@ justify-content: space-between; align-items: center; list-style: none; - height: 75px; + height: 4.6875rem; font-size: smaller; transition: height 0.3s ease-out; @@ -25,11 +25,11 @@ .feather { margin: 0 $spacing-01; - height: 15px; + height: $spacing-03; } } .nav-bar__link { display: block; - line-height: 75px; -} + line-height: 4.6875rem; +} \ No newline at end of file diff --git a/cms/sass/layout/_page-content.scss b/cms/sass/layout/_page-content.scss index 71ceeb3043..6724c72a4e 100644 --- a/cms/sass/layout/_page-content.scss +++ b/cms/sass/layout/_page-content.scss @@ -8,4 +8,4 @@ margin-bottom: $spacing-04; text-align: right; color: $dark-grey; -} +} \ No newline at end of file diff --git a/cms/sass/layout/_page-footer.scss b/cms/sass/layout/_page-footer.scss index 0edb5ac220..932120e0c0 100644 --- a/cms/sass/layout/_page-footer.scss +++ b/cms/sass/layout/_page-footer.scss @@ -8,11 +8,11 @@ width: 100%; background-color: $warm-black; color: $white; - @include typescale-06; + font-size: $typescale-06; h2 { text-transform: uppercase; - font-size: 1em; + font-size: $typescale-05; @include font-sans; } @@ -23,7 +23,7 @@ } li { - margin-bottom: 0.75em; + margin-bottom: $spacing-03; } a { @@ -58,7 +58,7 @@ .legal { padding: $spacing-04 0; border-top: 1px solid $white; - @include typescale-06; + font-size: $typescale-06; li { display: inline-block; @@ -73,4 +73,4 @@ width: 48%; } } -} +} \ No newline at end of file diff --git a/cms/sass/layout/_page-header.scss b/cms/sass/layout/_page-header.scss index d9b21d4a4e..e15db7381c 100644 --- a/cms/sass/layout/_page-header.scss +++ b/cms/sass/layout/_page-header.scss @@ -1,7 +1,7 @@ /* Page header */ .page-header { - min-height: 150px; + min-height: 9.375rem; @media screen and (max-width: 768px) { min-height: 100px; @@ -15,4 +15,4 @@ .feather { position: relative; } -} +} \ No newline at end of file diff --git a/cms/sass/layout/_page-nav.scss b/cms/sass/layout/_page-nav.scss index 3ea3e21d0b..51829deee0 100644 --- a/cms/sass/layout/_page-nav.scss +++ b/cms/sass/layout/_page-nav.scss @@ -12,12 +12,12 @@ padding-left: $spacing-03; width: 264px; // fixed page element: needs absolute width to avoid overflowing from cols border-left: 1px solid $grapefruit; - @include typescale-06; + font-size: $typescale-06; } .page-nav__heading { margin: 0 0 $spacing-03 0; - font-size: 1em; + font-size: $typescale-05; text-transform: uppercase; @include font-sans; } @@ -63,4 +63,4 @@ .page-nav { width: 330px; } -} +} \ No newline at end of file diff --git a/cms/sass/layout/_primary-nav.scss b/cms/sass/layout/_primary-nav.scss index 3bad1d932d..a4a284b879 100644 --- a/cms/sass/layout/_primary-nav.scss +++ b/cms/sass/layout/_primary-nav.scss @@ -5,7 +5,7 @@ top: 0; width: 100vw; z-index: 3000; - height: 90px; + height: 5.625rem; background-color: $warm-black; transition: height 0.3s ease-out; text-transform: uppercase; @@ -37,7 +37,7 @@ } .dropdown__trigger { - line-height: 90px; + line-height: 5.625rem; } .dropdown__menu { @@ -46,11 +46,11 @@ } &--scrolled { - height: 40px; + height: 2.5rem; .logo, .logo svg { padding: 0; - height: 20px; + height: 1.25rem; line-height: 1; } @@ -59,11 +59,11 @@ } .nav-bar { - height: 40px + height: 2.5rem } .dropdown__trigger { - line-height: 40px; + line-height: 2.5rem; } } @@ -78,4 +78,4 @@ display: none !important; } } -} +} \ No newline at end of file diff --git a/cms/sass/layout/_secondary-nav.scss b/cms/sass/layout/_secondary-nav.scss index 7dbf282b9a..7d3e96f0f9 100644 --- a/cms/sass/layout/_secondary-nav.scss +++ b/cms/sass/layout/_secondary-nav.scss @@ -1,10 +1,10 @@ /* Bottom / secondary nav */ .secondary-nav { - padding-top: 90px; + padding-top: 5.625rem; text-transform: uppercase; font-weight: 600; - height: 150px; + height: 9.375rem; } .secondary-nav--precedes-highlight { @@ -14,7 +14,7 @@ @media (max-width: 768px) { .secondary-nav { - height: 75px; + height: 4.75rem; } .secondary-nav > .container { @@ -86,4 +86,4 @@ @media (min-width: 769px) { display: none; } -} +} \ No newline at end of file diff --git a/cms/sass/layout/_sidenav.scss b/cms/sass/layout/_sidenav.scss index 7e1b3f31db..a429913d10 100644 --- a/cms/sass/layout/_sidenav.scss +++ b/cms/sass/layout/_sidenav.scss @@ -9,4 +9,4 @@ h2 + h3 { padding-top: 0; } -} +} \ No newline at end of file diff --git a/cms/sass/main.scss b/cms/sass/main.scss index be1df58a65..33f613b31d 100644 --- a/cms/sass/main.scss +++ b/cms/sass/main.scss @@ -79,4 +79,4 @@ "themes/editorial-form", "themes/timeline", "themes/activity-section" -; +; \ No newline at end of file diff --git a/cms/sass/pages/_apply.scss b/cms/sass/pages/_apply.scss index a58686887f..ef55636ad4 100644 --- a/cms/sass/pages/_apply.scss +++ b/cms/sass/pages/_apply.scss @@ -11,12 +11,12 @@ .application-nav { margin: $spacing-05 0 0 0; width: 264px; // fixed page element: needs absolute width to avoid overflowing from cols - @include typescale-06; + font-size: $typescale-06--bigger; } .application-nav__heading { margin: 0; - font-size: 1em; + font-size: $typescale-06--bigger; text-transform: uppercase; @include font-sans; } @@ -35,9 +35,9 @@ content: ' '; border-left: 1px solid $dark-grey; position: absolute; - height: 60px; - margin-left: 17px; - margin-top: 20px; + height: $spacing-05; + margin-left: $spacing-03; + margin-top: $spacing-03a; z-index: -10; } @@ -59,15 +59,15 @@ margin-right: $spacing-01; content: counter(step); background: $light-grey; - width: 30px; - height: 30px; + width: $spacing-04; + height: $spacing-04; border: 1px solid rgba($dark-grey, 0.5); border-radius: 50%; - line-height: 28px; + line-height: 1.75rem; text-align: center; color: rgba($dark-grey, 0.75); font-weight: bold; - font-size: smaller; + font-size: $typescale-07; } } } @@ -79,7 +79,7 @@ background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='white' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-check'%3E%3Cpolyline points='20 6 9 17 4 12'%3E%3C/polyline%3E%3C/svg%3E"); background-repeat: no-repeat; background-position: center; - background-size: 15px; + background-size: $spacing-03; background-color: $dark-grey; border-color: $dark-grey; } @@ -177,4 +177,4 @@ display: none !important; } } -} +} \ No newline at end of file diff --git a/cms/sass/pages/_article-details.scss b/cms/sass/pages/_article-details.scss index 6dfd06296a..27023c85d3 100644 --- a/cms/sass/pages/_article-details.scss +++ b/cms/sass/pages/_article-details.scss @@ -1,5 +1,5 @@ .article-details__meta { - font-size: smaller; + font-size: $typescale-07; div { border-right: 1px solid $sanguine; @@ -16,5 +16,5 @@ display: block; background: $light-grey; text-align: center; - @include typescale-03; -} + font-size: $typescale-03; +} \ No newline at end of file diff --git a/cms/sass/pages/_error-page.scss b/cms/sass/pages/_error-page.scss index d41781f23b..4c18234465 100644 --- a/cms/sass/pages/_error-page.scss +++ b/cms/sass/pages/_error-page.scss @@ -1,3 +1,3 @@ .error-page { background-color: $light-grey; -} +} \ No newline at end of file diff --git a/cms/sass/pages/_homepage.scss b/cms/sass/pages/_homepage.scss index 644d4194a1..6d54cd94bc 100644 --- a/cms/sass/pages/_homepage.scss +++ b/cms/sass/pages/_homepage.scss @@ -27,7 +27,7 @@ } .secondary-nav { - margin-bottom: 25px; + margin-bottom: 1.5625rem; } a { @@ -121,7 +121,7 @@ &__blog { h3 { - @include typescale-05; + font-size: $typescale-05; line-height: 1.25; } @@ -158,4 +158,4 @@ margin-bottom: $spacing-03; } } -} +} \ No newline at end of file diff --git a/cms/sass/pages/_journal-details.scss b/cms/sass/pages/_journal-details.scss index 001b677a69..10a5374b08 100644 --- a/cms/sass/pages/_journal-details.scss +++ b/cms/sass/pages/_journal-details.scss @@ -22,11 +22,11 @@ @media (min-width: 769px) { padding-bottom: 0; - width: calc(100% / 3 - 20px); + width: calc(100% / 3 - $spacing-03a); } @media (min-width: 1280px) { - width: calc(100% / 3 - 40px); + width: calc(100% / 3 - 2.5rem); } } } @@ -34,4 +34,4 @@ .tabs__menu { margin-bottom: $spacing-04; } -} +} \ No newline at end of file diff --git a/cms/sass/pages/_search.scss b/cms/sass/pages/_search.scss index 958a3a5935..cf4283c9f5 100644 --- a/cms/sass/pages/_search.scss +++ b/cms/sass/pages/_search.scss @@ -28,4 +28,4 @@ h2 { margin-top: 0; } -} +} \ No newline at end of file diff --git a/cms/sass/pages/_sponsors.scss b/cms/sass/pages/_sponsors.scss index 1b5caf8572..635e815f21 100644 --- a/cms/sass/pages/_sponsors.scss +++ b/cms/sass/pages/_sponsors.scss @@ -3,7 +3,7 @@ .sponsor { margin-top: $spacing-04; margin-bottom: $spacing-04; - min-height: 100px; + min-height: 6.25rem; } .sponsor__link { @@ -11,7 +11,7 @@ } .sponsor__logo { - max-height: 75px; + max-height: 4.6875rem; width: auto; } @@ -19,5 +19,5 @@ margin-bottom: $spacing-03; font-weight: 400; @include font-sans; - @include typescale-06; -} + font-size: $typescale-06; +} \ No newline at end of file diff --git a/cms/sass/pages/_uploadmetadata.scss b/cms/sass/pages/_uploadmetadata.scss index 7b76dd7284..e1e48be9e7 100644 --- a/cms/sass/pages/_uploadmetadata.scss +++ b/cms/sass/pages/_uploadmetadata.scss @@ -1,5 +1,5 @@ small.error { - font-size: 80%; + font-size: $typescale-07; color: $sanguine; &:before { @@ -8,7 +8,7 @@ small.error { content: ''; background-image: url("data:image/svg+xml,%3Csvg width='14' height='14' viewBox='0 0 14 14' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M7 4.6V7M7 9.4H7.006M4.516 1H9.484L13 4.516V9.484L9.484 13H4.516L1 9.484V4.516L4.516 1Z' stroke='%23982E0A' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E%0A"); background-repeat: no-repeat; - height: 14px; - width: 14px; + height: 0.875rem; + width: 0.875rem; } } \ No newline at end of file diff --git a/cms/sass/simple_widget.scss b/cms/sass/simple_widget.scss index 284f4f5172..ad81bf1170 100644 --- a/cms/sass/simple_widget.scss +++ b/cms/sass/simple_widget.scss @@ -61,7 +61,7 @@ } button { - padding: .375rem .75rem; + padding: $spacing-03 $spacing-03a; } } \ No newline at end of file diff --git a/cms/sass/themes/_activity-section.scss b/cms/sass/themes/_activity-section.scss index 9cd3a26159..9f482db4d2 100644 --- a/cms/sass/themes/_activity-section.scss +++ b/cms/sass/themes/_activity-section.scss @@ -41,7 +41,7 @@ } .color-legend { - font-size: 18px; + font-size: $typescale-06--bigger; li:not(:first-child) { margin-left: $spacing-01; diff --git a/cms/sass/themes/_dashboard.scss b/cms/sass/themes/_dashboard.scss index 5d68af6374..76506f84e9 100644 --- a/cms/sass/themes/_dashboard.scss +++ b/cms/sass/themes/_dashboard.scss @@ -1,42 +1,42 @@ /* Common styles for Admin/ManEd, Ed, and Associate Ed dashboards */ .dashboard { - font-size: 18px; + font-size: $typescale-06--bigger; h1 { margin-top: 0; } > header:first-of-type { - height: 75px; + height: 4.6875rem; } .primary-nav { - height: 75px; + height: 4.6875rem; .label { margin: 0 $spacing-04; text-decoration: none; - line-height: 75px; + line-height: 4.6875rem; } .logo { display: block; - padding-top: 20px; - padding-bottom: 20px; - width: 75px; + padding-top: 1.25rem; + padding-bottom: 1.25rem; + width: 4.6875rem; height: 100%; svg { display: block; margin: 0 auto; - height: 35px; + height: 2.1875rem; } } } .main-header { - @include typescale-06; + font-size: $typescale-06; dt, dd { margin-top: 0; @@ -47,15 +47,15 @@ .vertical-nav { position: absolute; z-index: 3; - top: 75px; + top: 4.6875rem; left: 0; - width: 75px; + width: 4.6875rem; height: 100%; > ol { position: fixed; - width: 75px; - top: 75px; + width: 4.6875rem; + top: 4.6875rem; bottom: 0; background-color: $light-grey; border-right: 1px dotted $mid-grey; @@ -64,7 +64,7 @@ } .vertical-nav__link { - height: 75px; + height: 4.6875rem; width: 100%; &[aria-selected=true] { @@ -77,9 +77,9 @@ display: none; position: absolute; padding: 0 $spacing-03 0 0; - line-height: 75px; - left: 75px; - height: 75px; + line-height: 4.6875rem; + left: 4.6875rem; + height: 4.6875rem; width: max-content; background-color: $dark-grey; color: $white; @@ -143,7 +143,7 @@ .card { width: 100%; height: auto; - border-left: 10px solid; + border-left: 0.625rem solid; &:hover { background-color: $light-grey; @@ -157,19 +157,19 @@ } main { - margin-left: 75px; + margin-left: 4.6875rem; width: auto; @media screen and (max-width: 768px) { - padding: 20px; + padding: $spacing-03a; } @media screen and (max-width: 1279px) and (min-width: 769px) { - padding: 30px; + padding: $spacing-04; } @media screen and (min-width: 1280px) { - padding: 40px; + padding: $spacing-04a; } } @@ -250,7 +250,7 @@ .form__short-help { margin-bottom: $spacing-02; - font-size: smaller; + font-size: $typescale-07; } .icon-container { @@ -304,4 +304,4 @@ white-space: nowrap; } } -} +} \ No newline at end of file diff --git a/cms/sass/themes/_editorial-form.scss b/cms/sass/themes/_editorial-form.scss index db3df08500..832a71e782 100644 --- a/cms/sass/themes/_editorial-form.scss +++ b/cms/sass/themes/_editorial-form.scss @@ -32,7 +32,7 @@ .form__legend { margin: 0; width: 100%; - @include typescale-06; + font-size: $typescale-06; div { margin: 0 (-$spacing-04) $spacing-04 (-$spacing-04); @@ -106,7 +106,7 @@ .form__short-help { margin-bottom: $spacing-02; - font-size: smaller; + font-size: $typescale-07; } .icon-container { diff --git a/cms/sass/themes/_timeline.scss b/cms/sass/themes/_timeline.scss index f1542961f0..7cf3808b0c 100644 --- a/cms/sass/themes/_timeline.scss +++ b/cms/sass/themes/_timeline.scss @@ -1,13 +1,13 @@ .at-twenty { - font-size: 20px; + font-size: $typescale-05; h1 { - font-size: 3em; + font-size: 3.75rem; text-transform: uppercase; font-weight: 900; } h2 { - @include typescale-05; + font-size: $typescale-05; font-weight: 900; text-transform: uppercase; text-align: center; @@ -30,7 +30,7 @@ > li:first-child { list-style: none; margin-left: 0; - @include typescale-02; + font-size: $typescale-02; } } } diff --git a/cms/sass/vendors/_bootstrap.scss b/cms/sass/vendors/_bootstrap.scss index f1303e86ac..19b29ef7d5 100644 --- a/cms/sass/vendors/_bootstrap.scss +++ b/cms/sass/vendors/_bootstrap.scss @@ -703,4 +703,4 @@ -webkit-transition-timing-function: ease; -o-transition-timing-function: ease; transition-timing-function: ease; -} +} \ No newline at end of file diff --git a/cms/sass/vendors/_normalize.scss b/cms/sass/vendors/_normalize.scss index 18ccf0e200..7d2e2c49e8 100644 --- a/cms/sass/vendors/_normalize.scss +++ b/cms/sass/vendors/_normalize.scss @@ -87,7 +87,7 @@ svg:not(:root) { overflow: hidden; } figure { - margin: 1em 40px; + margin: 1em 2.5rem; } hr { -webkit-box-sizing: content-box; @@ -208,4 +208,4 @@ figure { } img { vertical-align: middle; -} +} \ No newline at end of file diff --git a/doajtest/testbook/accessibility/font_size.yml b/doajtest/testbook/accessibility/font_size.yml new file mode 100644 index 0000000000..53d192ab02 --- /dev/null +++ b/doajtest/testbook/accessibility/font_size.yml @@ -0,0 +1,37 @@ +suite: Accessibility +testset: Base Font Size +tests: +- title: Test Changing Base Font Size Through Browser Settings + context: + role: any + steps: + - step: Open any DOAJ page in Google Chrome + - step: Open Chrome Settings from the menu (⋮ > Settings) + - step: Navigate to Appearance > Font size + - step: Change the font size to "Very small" + - step: Refresh the page + results: + - Text on the website becomes noticeably smaller + - Page layout remains usable and readable + - step: Change the font size to "Very large" + - step: Refresh the page + results: + - Text on the website becomes noticeably larger + - Page layout adjusts appropriately (no overlapping or cut-off text) + - step: Reset the font size back to "Medium (recommended)" + results: + - Website text returns to default size + - step: Repeat this test for other subpages + - step: Open any DOAJ page in Mozilla Firefox + - step: Open Firefox Settings from the menu (☰ > Settings) + - step: Navigate to General > Language and Appearance > Fonts and Colors > Advanced + - step: Increase the Minimum font size to a larger value (e.g., 24px) + - step: Refresh the page + results: + - Text on the website becomes larger while respecting minimum font size + - Page remains usable and accessible without broken layouts + - step: Reset the minimum font size to default (e.g., "None" or 0) + - step: Refresh the page + results: + - Website text returns to default size + - step: Repeat this test for other subpages diff --git a/portality/settings.py b/portality/settings.py index 779883c100..d43ca2b894 100644 --- a/portality/settings.py +++ b/portality/settings.py @@ -9,7 +9,7 @@ # Application Version information # ~~->API:Feature~~ -DOAJ_VERSION = "8.4.0" +DOAJ_VERSION = "8.4.1" API_VERSION = "4.0.1" ###################################### diff --git a/portality/static/js/doaj.fieldrender.edges.js b/portality/static/js/doaj.fieldrender.edges.js index 555d97019d..36e49d34b3 100644 --- a/portality/static/js/doaj.fieldrender.edges.js +++ b/portality/static/js/doaj.fieldrender.edges.js @@ -5206,7 +5206,7 @@ $.extend(true, doaj, { ` }, titleField: function (val, resultobj, renderer) { - let field = '

'; + let field = '

'; let display = ''; if (resultobj.bibjson.title) { if (resultobj.es_type === "journal") { diff --git a/portality/templates-v2/management/includes/_motivational_banner.html b/portality/templates-v2/management/includes/_motivational_banner.html index 624afae0ca..f360e3697b 100644 --- a/portality/templates-v2/management/includes/_motivational_banner.html +++ b/portality/templates-v2/management/includes/_motivational_banner.html @@ -1,7 +1,7 @@ {% if historical_count %}
-
+

{% if historical_count > 0 %} {% include "management/includes/svg/award.svg" %} diff --git a/portality/templates-v2/management/includes/_todo.html b/portality/templates-v2/management/includes/_todo.html index 5faa48f5e2..317203e7d3 100644 --- a/portality/templates-v2/management/includes/_todo.html +++ b/portality/templates-v2/management/includes/_todo.html @@ -216,7 +216,7 @@

- {{ todo.title | truncate(25, True) }} + {{ todo.title | truncate(25, True) }}

diff --git a/portality/templates-v2/public/publisher/includes/_nav.html b/portality/templates-v2/public/publisher/includes/_nav.html index 25959d6f90..6002847378 100644 --- a/portality/templates-v2/public/publisher/includes/_nav.html +++ b/portality/templates-v2/public/publisher/includes/_nav.html @@ -28,7 +28,7 @@ {% continue %} {% endif %} {% set selected = url == request.path %} -
  • +
  • {{ label }}
  • {% endfor %} diff --git a/setup.py b/setup.py index 13c568c8e0..aaed211a78 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name='doaj', - version='8.4.0', + version='8.4.1', packages=find_packages(), install_requires=[ "awscli==1.34.25", @@ -62,6 +62,9 @@ 'gspread-dataframe~=3.3.1', 'gspread-formatting~=1.1.2', + # generate dependency tree of packages + 'pipdeptree==2.28.0', + ] + (["setproctitle==1.1.10"] if "linux" in sys.platform else []), extras_require={ # prevent backtracking through all versions