-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge pre-staging and master #560
Merged
Merged
Changes from all commits
Commits
Show all changes
101 commits
Select commit
Hold shift + click to select a range
b7f07b9
Text edits for performance management
swgsgo 0ec05c2
Merge pull request #501 from swgsgo/720
swgsgo 264d4df
Merge branch 'master' of https://github.com/GSA/USSM into pre-staging
swgsgo dfd6a02
Updated PDF for performance management page
swgsgo 48437b3
Merge pull request #511 from swgsgo/pre-staging
swgsgo bad310f
Content Edits - Performance Management Page
swgsgo cba7328
Content Edits - Performance Management Page
swgsgo d340af6
Merge pull request #514 from swgsgo/pre-staging
swgsgo 49677a4
Content Edits - Performance Management Page
swgsgo 71c4706
Merge pull request #515 from swgsgo/pre-staging
swgsgo 1d75cea
Styling/Content Edits - Performance Management Page
swgsgo ba47c03
Merge pull request #516 from swgsgo/pre-staging
swgsgo bc0863a
Styling/Content Edits - Performance Management Page
swgsgo cb0bb30
Merge pull request #517 from swgsgo/pre-staging
swgsgo ad22dd9
Assets for new governance page
swgsgo 5a613e9
Markup for governance board pages
swgsgo 36cc5d7
Templates for governance board pages
swgsgo 54ac6fb
Styling for governance board pages and global banner
swgsgo 2ee1944
Removing comments in Governance Board markdown files
swgsgo 935da02
Merge pull request #518 from swgsgo/pre-staging
swgsgo 0f7d3a4
Added represenative.scss to index.scss
swgsgo 509ab79
Merge pull request #519 from swgsgo/pre-staging
swgsgo 0dec4b3
Remove old shared-service page
swgsgo 8446478
Merge pull request #520 from swgsgo/pre-staging
swgsgo 6325f52
Styling for governance board pages
swgsgo 6cad8f9
Merge pull request #521 from swgsgo/pre-staging
swgsgo a955c2b
Adding links to logos for Governance Board
swgsgo 2c04943
Merge pull request #522 from swgsgo/pre-staging
swgsgo 1b16d77
Fixing icons for Governance Board pages
swgsgo 5492b0b
Merge pull request #523 from swgsgo/pre-staging
swgsgo b8a96cc
Governance Board pages edits
swgsgo 427c395
Merge pull request #524 from swgsgo/pre-staging
swgsgo adcee89
QA Edits - Governance Board pages
swgsgo 065cb53
Merge pull request #526 from swgsgo/pre-staging
swgsgo f2108cc
QA Edits - Governance Board pages
swgsgo ab2ed63
Merge pull request #527 from swgsgo/pre-staging
swgsgo f5be0e9
QA Edits - Governance Board pages
swgsgo 162ee31
Merge pull request #528 from swgsgo/pre-staging
swgsgo 8de723c
QA Edits - Governance Board pages
swgsgo 0272a3e
Merge pull request #529 from swgsgo/pre-staging
swgsgo 02ebba3
QA Edits - Governance Board pages
swgsgo 52894f0
QA Edits - Governance Board pages
swgsgo 0a9ff8c
Merge pull request #530 from swgsgo/pre-staging
swgsgo efbe32c
Added SAPOC assets
swgsgo c90d510
SAPOC Data
swgsgo 9c438ea
SAPOC/SSGB Page edits
swgsgo d26c95a
Restructure Governance Board Pages
swgsgo a888753
Standardize banner used on performance management
swgsgo fb95336
Rename template files for governance pages, update banner used globally
swgsgo 856e3f4
Remove old SAPOC page
swgsgo 9a17166
Merge pull request #531 from swgsgo/pre-staging
swgsgo 29517e6
Fixed icon SAPOC page
swgsgo 0f15ce8
Merge pull request #532 from swgsgo/pre-staging
swgsgo dcc0d97
SSGB QA Edits
swgsgo ddbe132
Merge pull request #533 from swgsgo/pre-staging
swgsgo 6bcd500
SSGB QA Edits
swgsgo 1b12522
Merge pull request #534 from swgsgo/pre-staging
swgsgo e8fd107
SOPAC QA Edits
swgsgo 9007fe4
Merge pull request #535 from swgsgo/pre-staging
swgsgo 75498e6
Governance Board QA Edits
swgsgo 61e365b
Merge pull request #536 from swgsgo/pre-staging
swgsgo 498e57e
Governance Board QA Edits
swgsgo 1aaa155
Merge pull request #537 from swgsgo/pre-staging
swgsgo f12ab7c
Governance Board QA Edits
swgsgo 04da9c1
Merge pull request #538 from swgsgo/pre-staging
swgsgo 56494f5
Governance Board QA Edits
swgsgo 2e47358
Merge pull request #539 from swgsgo/pre-staging
swgsgo 5828286
Governance Board QA Edits
swgsgo 96e026b
Merge pull request #540 from swgsgo/pre-staging
swgsgo 37dea6d
Governance Board QA Edits
swgsgo 341c669
Merge pull request #541 from swgsgo/pre-staging
swgsgo 2aae582
Governance Board QA Edits
swgsgo d38f942
Merge pull request #542 from swgsgo/pre-staging
swgsgo 404196a
Governance Board QA Edits
swgsgo 4f248ba
Merge pull request #543 from swgsgo/pre-staging
swgsgo 140c1c3
Governance Board QA Edits
swgsgo 3812c58
Merge pull request #544 from swgsgo/pre-staging
swgsgo a14cc4c
Governance Board QA Edits
swgsgo f759438
Merge pull request #548 from swgsgo/pre-staging
swgsgo d0a55b5
Governance Board SSGB - Added ordering to members
swgsgo ad748e4
Merge pull request #549 from swgsgo/pre-staging
swgsgo 976b57b
Governance Board SSGB - Added OG image
swgsgo 78c55ec
Merge pull request #550 from swgsgo/pre-staging
swgsgo 807382a
Global og:image fix for pages
swgsgo cec8930
Merge pull request #551 from swgsgo/pre-staging
swgsgo 48fa655
Governance Board QA Edits
swgsgo a80005e
Merge pull request #555 from swgsgo/pre-staging
swgsgo 338b023
Governance Board QA Edits
swgsgo 69b09db
Merge pull request #556 from swgsgo/pre-staging
swgsgo fa3cd51
Fix ANDI tool errors for 508
swgsgo 54f6912
Fix ANDI tool errors for 508 in performance management
swgsgo 9cfb1b0
Revert meta file to master, undo ogimage updates. @TODO simplify og tags
swgsgo fcc5945
Remove ogimage variable from SSGB page
swgsgo 46eff66
OG tags for SSGB page
swgsgo 2887410
Lazy load images on members page
swgsgo 4dbe352
Fix responsive issues SSGB page
swgsgo d6a6c82
Merge pull request #557 from swgsgo/pre-staging
swgsgo 2e47bcc
Merge pull request #2 from GSA/master
swgsgo 7ede82b
Merge pull request #558 from swgsgo/pre-staging
swgsgo d39ca76
Performance Management - Heading on one line
swgsgo 66a46ec
Merge pull request #559 from swgsgo/pre-staging
swgsgo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,162 @@ | ||
{ | ||
"title": "Senior Accountable Point of Contacts", | ||
"agencies": [ | ||
{ | ||
"agency": "Department of Agriculture", | ||
"sapoc": "Lynn Moaney", | ||
"title": "Deputy Chief Financial Officer", | ||
"logo": "department-of-agriculture.svg", | ||
"agency_url":"https://www.usda.gov/ocfo/about-us/senior-leadership" | ||
}, | ||
{ | ||
"agency": "Department of Commerce", | ||
"sapoc": "Kurt Bersani", | ||
"title": "Executive Director for Enterprise Services", | ||
"logo": "department-of-commerce.svg", | ||
"agency_url": "https://www.commerce.gov/about/leadership/kurt-bersani" | ||
}, | ||
{ | ||
"agency": "Department of Defense", | ||
"sapoc": "TBD", | ||
"title": "TBD", | ||
"logo": "department-of-defense.svg" | ||
}, | ||
{ | ||
"agency": "Department of Education", | ||
"sapoc": "Kerry Neal", | ||
"title": "Deputy Assistant Secretary for Management and Planning", | ||
"logo": "department-of-education.svg" | ||
}, | ||
{ | ||
"agency": "Department of Energy", | ||
"sapoc": "Ingrid Kolb", | ||
"title": "Director of Management", | ||
"logo": "department-of-energy.svg", | ||
"agency_url":"https://www.energy.gov/management/person/ingrid-ann-christner-kolb" | ||
}, | ||
{ | ||
"agency": "Department of Health and Human Services", | ||
"sapoc": "Christine Jones (Interim)", | ||
"title": "DAS-Operations in ASFR’s Immediate Office", | ||
"logo": "department-of-health-and-human-services.svg" | ||
}, | ||
{ | ||
"agency": "Department of Homeland Security", | ||
"sapoc": "Randolph “Tex” Alles", | ||
"title": "Deputy Under Secretary for Management", | ||
"logo": "department-of-homeland-security.svg", | ||
"agency_url":"https://www.dhs.gov/person/randolph-d-tex-alles" | ||
}, | ||
{ | ||
"agency": "Department of Housing and Urban Development", | ||
"sapoc": "Kate Darling", | ||
"title": "Assistant Chief Financial Officer for Systems", | ||
"logo": "department-of-housing-and-urban-development.svg" | ||
}, | ||
{ | ||
"agency": "Department of the Interior", | ||
"sapoc": "Joan Mooney", | ||
"title": "Principal Deputy Assistant Secretary for Policy, Management, and Budget", | ||
"logo": "department-of-the-interior.svg", | ||
"agency_url":"https://www.doi.gov/joan-mooney" | ||
}, | ||
{ | ||
"agency": "Department of Justice", | ||
"sapoc": "Melinda Rogers", | ||
"title": "Chief Information Officer", | ||
"logo": "department-of-justice.svg", | ||
"agency_url":"https://www.cio.gov/about/members-and-leadership/rogers-melinda/" | ||
}, | ||
{ | ||
"agency": "Department of Labor", | ||
"sapoc": "Vince Micone", | ||
"title": "Deputy Assistant Secretary for Operations", | ||
"logo": "department-of-labor.svg", | ||
"agency_url":"https://www.dol.gov/agencies/oasam/about/deputy-assistant-secretary-for-operations" | ||
}, | ||
{ | ||
"agency": "Department of State", | ||
"sapoc": "Susana Ramirez", | ||
"title": "Office of the Comptroller and Global Financial Services ", | ||
"logo": "department-of-state.svg" | ||
}, | ||
{ | ||
"agency": "Department of Transportation", | ||
"sapoc": "Victoria Wassmer", | ||
"title": "Deputy Assistant Secretary for Finance and Budget", | ||
"logo": "department-of-transportation.svg", | ||
"agency_url":"https://www.transportation.gov/mission/victoria-b-wassmer" | ||
}, | ||
{ | ||
"agency": "Department of the Treasury", | ||
"sapoc": "Anna Canfield Roth", | ||
"title": "Assistant Secretary for Management", | ||
"logo": "department-of-commerce 2.svg", | ||
"agency_url":"https://home.treasury.gov/about/general-information/officials/anna-canfield-roth" | ||
}, | ||
{ | ||
"agency": "Department of Veterans Affairs", | ||
"sapoc": "David Orso", | ||
"title": "Executive Director, Enterprise Program Management Office, Office of Policy and Planning", | ||
"logo": "department-of-veterans-affairs.svg" | ||
}, | ||
{ | ||
"agency": "Environmental Protection Agency", | ||
"sapoc": "TBD", | ||
"title": "TBD", | ||
"logo": "environmental-protection-agency.svg" | ||
}, | ||
{ | ||
"agency": "National Aeronautics and Space Administration", | ||
"sapoc": "Ken Newton", | ||
"title": "Director, Service Delivery for the NASA Shared Services Center", | ||
"logo": "national-aeronautics-and-space-administration.svg", | ||
"agency_url":"https://www.nasa.gov/people/ken-newton/" | ||
}, | ||
{ | ||
"agency": "Agency for International Development", | ||
"sapoc": "Colleen Allen", | ||
"title": "Administrator for Management", | ||
"logo": "us-agency-for-international-development.svg", | ||
"agency_url":"https://www.usaid.gov/organization/colleen-allen" | ||
}, | ||
{ | ||
"agency": "General Services Administration", | ||
"sapoc": "Katy Kale", | ||
"title": "Deputy Administrator", | ||
"logo": "general-services-administration.svg", | ||
"agency_url":"https://www.gsa.gov/about-us/organization/leadership-directory/deputy-administrator" | ||
}, | ||
{ | ||
"agency": "National Science Foundation", | ||
"sapoc": "Mike Wetklow", | ||
"title": "Deputy Chief Financial Officer and Division Director for Financial Management", | ||
"logo": "national-science-foundation.svg" | ||
}, | ||
{ | ||
"agency": "Nuclear Regulatory Commission", | ||
"sapoc": "Eric Benner", | ||
"title": "Acting Deputy Chief Financial Officer", | ||
"logo": "nuclear-regulatory-commission.png" | ||
}, | ||
{ | ||
"agency": "Office of Personnel Management", | ||
"sapoc": "Erica Roach", | ||
"title": "Acting Chief Financial Officer", | ||
"logo": "office-of-personnel-management.svg", | ||
"agency_url":"https://www.opm.gov/about-us/our-people-organization/senior-staff-bios/erica-roach/" | ||
}, | ||
{ | ||
"agency": "Small Business Administration", | ||
"sapoc": "Tony Paul", | ||
"title": "Director Office of Financial Systems", | ||
"logo": "small-business-administration.svg" | ||
}, | ||
{ | ||
"agency": "Social Security Administration", | ||
"sapoc": "Michelle King", | ||
"title": "Deputy Commissioner for the Office of Budget, Finance, and Management", | ||
"logo": "us-social-security-admin-seal.svg" | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
|
||
<section class="title-banner"> | ||
<div class="grid-container"> | ||
<div class="grid-row grid-gap"> | ||
<div class="{% if include.width %}{{ include.width}} {% else %}grid-col-12 {% endif %}{% if include.offset %}{{ include.offset}}{% endif %} padding-top-4 padding-bottom-4"> | ||
<h1 class="pm-hero__heading margin-0 padding-bottom-6 padding-top-6 font-merriweather font-body-2xl text-light"> | ||
{{page.title}} | ||
</h1> | ||
</div> | ||
</div> | ||
</div> | ||
</section> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
{% comment %} | ||
To modify the menu system, you are welcome to edit this HTML directly or you can look inside _config.yml | ||
where we provide an easy way to manage your navigation system | ||
{% endcomment %} | ||
|
||
<div class="members"> | ||
<h2 class="text-center font-merriweather font-body-xl text-light">Board Co-chairs</h2> | ||
{% assign cochairs = site.pages | where_exp: "item" , "item.path contains 'co-chairs'" | sort: "name" | reverse %} | ||
<div class="grid-container"> | ||
<div class="grid-row flex-wrap flex-justify-center"> | ||
{% for item in cochairs %} | ||
{% if item.pending == true %} | ||
<div class="tablet:grid-col-4 text-center padding-2 text-no-underline"> | ||
<div class="inner shadow-3 padding-3 height-full display-flex flex-align-center"> | ||
<div class="width-full"> | ||
<h3 class="text-center margin-0 padding-top-1 font-body-lg">Agency Member</h3> | ||
<p class="text-primary text-center margin-0">(Pending Confirmation)</p> | ||
</div> | ||
</div> | ||
</div> | ||
{% else %} | ||
<a class="tablet:grid-col-4 text-center padding-2 text-no-underline flex" href="{{site.baseurl}}{{ item.url }}" title="{{ item.title }}"> | ||
<div class="inner shadow-3 padding-3 height-full"> | ||
<img style="width: 181px; height: 181px; object-fit: cover; object-position: top center; border-radius: 50%; border: 7px solid #D5ECEE;" src="{{site.baseurl}}/assets/images/governance/council/{{item.portrait}}" alt="{{ item.name }} Portrait"> | ||
<h3 class="text-center margin-0 padding-top-1">{{ item.name }}</h3> | ||
<p class="text-primary text-center margin-0">{{ item.department }}</p> | ||
</div> | ||
</a> | ||
{% endif %} | ||
{% endfor %} | ||
</div> | ||
</div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
{% comment %} | ||
To modify the menu system, you are welcome to edit this HTML directly or you can look inside _config.yml | ||
where we provide an easy way to manage your navigation system | ||
{% endcomment %} | ||
|
||
<div class="members"> | ||
<h2 class="text-center font-merriweather font-body-xl text-light">Member Councils</h2> | ||
{% assign grouped_members = site.pages | where_exp: "item" , "item.path contains 'members'" | group_by: 'logo' %} | ||
{% assign members_sorted = grouped_members | sort: "name" %} | ||
<div class="grid-container"> | ||
<div class="grid-row flex-wrap flex-justify-center"> | ||
{% for group in members_sorted %} | ||
<div class="council tablet:grid-col-6 text-center margin-top-5"> | ||
{% assign logo = group.name | split: "| " %} | ||
<a href="{{ logo[1] }}" title="{{ logo[2] }} Website" target="_blank" class="display-flex flex-column flex-justify flex-align-center"> | ||
<img loading="lazy" class="width-card height-15" style="object-fit: contain;" src="{{site.baseurl}}/assets/images/governance/logos/{{ logo[0] }}" alt="{{ logo[2] }} Logo"> | ||
</a> | ||
<div class="grid-row flex-wrap flex-justify-center"> | ||
{% for item in group.items %} | ||
<a class="tablet:grid-col-6 {% if item.order %}order-{{ item.order }} {% endif %}text-no-underline margin-top-2" href="{{site.baseurl}}{{ item.url }}" title="{{ item.title }}"> | ||
<div class="inner height-full"> | ||
<img loading="lazy" style="width: 181px; height: 181px; object-fit: cover; border-radius: 50%; border: 7px solid #D5ECEE;" src="{{site.baseurl}}/assets/images/governance/council/{{item.portrait}}" alt="{{ item.name }} Portrait"> | ||
<h3 class="text-center margin-0 padding-top-1">{{ item.name }}</h3> | ||
<p class="text-primary text-center margin-0">{{ item.department }}</p> | ||
</div> | ||
</a> | ||
{% endfor %} | ||
</div> | ||
</div> | ||
{% endfor %} | ||
</div> | ||
</div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
<div class="sapoc-listing"> | ||
<div class="grid-container"> | ||
<div class="grid-row flex-wrap flex-justify-center"> | ||
{% for each_agency in site.data.sapoc.agencies %} | ||
<div class="agency tablet:grid-col-4 text-center margin-top-5"> | ||
<div class="logo"> | ||
<img width="150" height="150" loading="lazy" src="{{site.baseurl}}/assets/images/governance/sopac-logos/{{ each_agency.logo }}" alt="{{ each_agency.title }} Logo"> | ||
</div> | ||
<div class="padding-x-3"> | ||
{% if each_agency.agency_url %}<a href="{{ each_agency.agency_url }}" title="Read more about {{ each_agency.sapoc }}" class="display-flex flex-align-center flex-justify-center text-no-underline" target="_blank">{% endif %} | ||
Check warning Code scanning / CodeQL Potentially unsafe external link Medium
External links without noopener/noreferrer are a potential security risk.
|
||
<h2 style="color: #0168CA;" class="margin-0 padding-right-1 font-body-sm text-bold"> | ||
{{ each_agency.sapoc }} | ||
</h2> | ||
{% if each_agency.agency_url %} | ||
<img src="{{site.baseurl}}/assets/images/governance/profile-icon.svg" alt=""> | ||
{% endif %} | ||
{% if each_agency.agency_url %}</a>{% endif %} | ||
<p class="text-base-dark font-body-xs margin-0 grey-50">{{ each_agency.title }}</p> | ||
<p class="text-base font-body-sm margin-0 grey-30"><i>{{ each_agency.agency }}</i></p> | ||
</div> | ||
</div> | ||
{% endfor %} | ||
</div> | ||
</div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check warning
Code scanning / CodeQL
Potentially unsafe external link Medium