diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 485751b3c..51ceefba6 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -1013,7 +1013,7 @@ class DomainInformationAdmin(ListHeaderAdmin): ( "Show details", { - "classes": ["collapse--dotgov"], + "classes": ["collapse--dgfieldset"], "description": "Extends type of organization", "fields": [ "federal_type", @@ -1039,7 +1039,7 @@ class DomainInformationAdmin(ListHeaderAdmin): ( "Show details", { - "classes": ["collapse--dotgov"], + "classes": ["collapse--dgfieldset"], "description": "Extends organization name and mailing address", "fields": [ "address_line1", @@ -1266,7 +1266,7 @@ class DomainRequestAdmin(ListHeaderAdmin): ( "Show details", { - "classes": ["collapse--dotgov"], + "classes": ["collapse--dgfieldset"], "description": "Extends type of organization", "fields": [ "federal_type", @@ -1292,7 +1292,7 @@ class DomainRequestAdmin(ListHeaderAdmin): ( "Show details", { - "classes": ["collapse--dotgov"], + "classes": ["collapse--dgfieldset"], "description": "Extends organization name and mailing address", "fields": [ "address_line1", diff --git a/src/registrar/assets/js/dja-collapse.js b/src/registrar/assets/js/dja-collapse.js index c33954192..6fd838e2e 100644 --- a/src/registrar/assets/js/dja-collapse.js +++ b/src/registrar/assets/js/dja-collapse.js @@ -4,19 +4,18 @@ * Works with our fieldset override */ -/*global gettext*/ 'use strict'; { window.addEventListener('load', function() { // Add anchor tag for Show/Hide link - const fieldsets = document.querySelectorAll('fieldset.collapse--dotgov'); + const fieldsets = document.querySelectorAll('fieldset.collapse--dgfieldset'); for (const [i, elem] of fieldsets.entries()) { // Don't hide if fields in this fieldset have errors if (elem.querySelectorAll('div.errors, ul.errorlist').length === 0) { elem.classList.add('collapsed'); const button = elem.querySelector('button'); button.id = 'fieldsetcollapser' + i; - button.className = 'collapse-toggle--dotgov usa-button usa-button--unstyled'; + button.className = 'collapse-toggle--dgfieldset usa-button usa-button--unstyled'; } } // Add toggle to hide/show anchor tag @@ -38,8 +37,40 @@ fieldset.classList.add('collapsed'); } }; - document.querySelectorAll('.collapse-toggle--dotgov').forEach(function(el) { + document.querySelectorAll('.collapse-toggle--dgfieldset').forEach(function(el) { el.addEventListener('click', toggleFuncDotgov); }); }); } + +'use strict'; +{ + window.addEventListener('load', function() { + // Add anchor tag for Show/Hide link + const collapsibleContent = document.querySelectorAll('fieldset.collapse--dgsimple'); + for (const [i, elem] of collapsibleContent.entries()) { + const button = elem.closest('div').querySelector('button'); + button.id = 'simplecollapser' + i; + } + // Add toggle to hide/show anchor tag + const toggleFuncDotgovSimple = function(e) { + const fieldset = this.closest('div').querySelector('.collapse--dgsimple'); + const spanElement = this.querySelector('span'); + const useElement = this.querySelector('use'); + if (fieldset.classList.contains('collapsed')) { + // Show + spanElement.textContent = 'Hide details'; + useElement.setAttribute('xlink:href', '/public/img/sprite.svg#expand_less'); + fieldset.classList.remove('collapsed'); + } else { + // Hide + spanElement.textContent = 'Show details'; + useElement.setAttribute('xlink:href', '/public/img/sprite.svg#expand_more'); + fieldset.classList.add('collapsed'); + } + }; + document.querySelectorAll('.collapse-toggle--dgsimple').forEach(function(el) { + el.addEventListener('click', toggleFuncDotgovSimple); + }); + }); +} diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss index b4b5c657d..9554f7acd 100644 --- a/src/registrar/assets/sass/_theme/_admin.scss +++ b/src/registrar/assets/sass/_theme/_admin.scss @@ -243,7 +243,7 @@ div#content > h2 { // in the future .object-tools li a, .object-tools p a { - font-family: "Source Sans Pro Web", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; + font-family: family('sans'); text-transform: none!important; font-size: 14px!important; } @@ -293,7 +293,7 @@ div#content > h2 { .messagelist_content-list--unstyled { padding-left: 0; li { - font-family: "Source Sans Pro Web", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; + font-family: family('sans'); font-size: 13.92px!important; background: none!important; padding: 0!important; @@ -542,32 +542,42 @@ address.dja-address-contact-list { } // Collapse button styles for fieldsets -.module.collapse--dotgov { +.module.collapse--dgfieldset { margin-top: -35px; padding-top: 0; border: none; - button { - background: none; - text-transform: none; +} +.collapse-toggle--dgsimple, +.module.collapse--dgfieldset button { + background: none; + text-transform: none; + color: var(--link-fg); + margin-top: 8px; + margin-left: 10px; + span { + text-decoration: underline; + font-size: 13px; + font-feature-settings: "kern"; + font-kerning: normal; + line-height: 13px; + font-family: family('sans'); + } + &:hover { color: var(--link-fg); - margin-top: 8px; - margin-left: 10px; - span { - text-decoration: underline; - font-size: 13px; - font-feature-settings: "kern"; - font-kerning: normal; - line-height: 13px; - font-family: -apple-system, "system-ui", "Segoe UI", system-ui, Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + svg { + color: var(--link-fg); } } } -.collapse--dotgov.collapsed .collapse-toggle--dotgov { +.collapse--dgfieldset.collapsed .collapse-toggle--dgfieldset { display: inline-block!important; * { display: inline-block; } } +.collapse--dgsimple.collapsed { + display: none; +} .dja-status-list { border-top: solid 1px var(--border-color); @@ -576,7 +586,7 @@ address.dja-address-contact-list { padding-top: 10px; li { line-height: 1.5; - font-family: "Source Sans Pro Web", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif !important; + font-family: family('sans'); padding-top: 0; padding-bottom: 0; } diff --git a/src/registrar/templates/admin/fieldset.html b/src/registrar/templates/admin/fieldset.html index 19c5db294..89537b098 100644 --- a/src/registrar/templates/admin/fieldset.html +++ b/src/registrar/templates/admin/fieldset.html @@ -8,7 +8,7 @@ https://github.com/django/django/blob/main/django/contrib/admin/templates/admin/