From c1d2c0076d29189f4fe5de5f7385e1201df6bd8d Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Tue, 11 Mar 2025 14:32:59 -0500 Subject: [PATCH 01/10] Add preview contact page --- assets/css/style.scss | 17 +++++++++++++++++ contact.md | 7 ++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/assets/css/style.scss b/assets/css/style.scss index a11464bb..629eded3 100755 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -289,3 +289,20 @@ main { main { min-height: 60vh; } + +@include media-breakpoint-down(lg) { + #portal-frame { + height: 546px + } +} + +@include media-breakpoint-up(lg) { + #portal-frame { + height: 580px; + } +} +@include media-breakpoint-up(xl) { + #portal-frame { + height: 620px; + } +} diff --git a/contact.md b/contact.md index 669e7946..08a53c64 100644 --- a/contact.md +++ b/contact.md @@ -1,8 +1,13 @@ --- -title: Contact +title: Talk to Us layout: sub-page --- +

We want to hear from you! Get in touch via this form:

+ + +## Specific Questions? + PATh is a unique partnership between the Center for High Throughput Computing (CHTC) and the OSG Consortium. * For enquiries about the *PATh project*, please contact the [PATh leadership](mailto:leadership@path-cc.io). From 6913ec4f495e4225893dca00f4630bca3ce2e7a9 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Tue, 11 Mar 2025 14:37:00 -0500 Subject: [PATCH 02/10] Add preview contact page --- .github/workflows/deploy-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index f1ea8681..8d04d13a 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -27,7 +27,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 3.4 bundler-cache: true - name: Configure for Dev Preview From 32d2d8d350c0ec2114b58a54c9d7efce13c74704 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Tue, 11 Mar 2025 14:38:46 -0500 Subject: [PATCH 03/10] Add preview contact page --- _articles | 2 +- staff-list | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_articles b/_articles index 19e8483a..fa372ff2 160000 --- a/_articles +++ b/_articles @@ -1 +1 @@ -Subproject commit 19e8483a1e2e93f87f47b18852158fb8c1e24787 +Subproject commit fa372ff21799346ebe21475757ccee2aac5bb10a diff --git a/staff-list b/staff-list index 194edc98..b4c7b214 160000 --- a/staff-list +++ b/staff-list @@ -1 +1 @@ -Subproject commit 194edc98b99c11253b743c4c0a33eab82cfdeffb +Subproject commit b4c7b21414983da79c75e7c5e54b13a4777b7bbb From 4b8a10c5e7378d8ea96434efe7dab984efb4a9e5 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Tue, 11 Mar 2025 14:41:22 -0500 Subject: [PATCH 04/10] Add preview contact page --- .github/workflows/deploy-preview.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index 8d04d13a..33ddb026 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -25,6 +25,10 @@ jobs: - name: Get branch name run: echo "BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV + - name: Update Submodules + run: | + git submodule update --init --recursive --remote + - uses: ruby/setup-ruby@v1 with: ruby-version: 3.4 From eee91a5e999c88051a3726cde284b77c33d302d6 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Tue, 11 Mar 2025 14:46:42 -0500 Subject: [PATCH 05/10] Add preview contact page --- .github/workflows/deploy-preview.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index 33ddb026..29ade691 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -4,11 +4,6 @@ on: push: branches: - preview-** - workflow_call: - inputs: - branch: - required: true - type: string jobs: Deploy-Web-Preview: @@ -20,7 +15,6 @@ jobs: - uses: actions/checkout@v2 with: submodules: 'recursive' - ref: ${{ inputs.branch }} - name: Get branch name run: echo "BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV From 3e9cb58fbc98c8e636d42491e05e0437652bbc46 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Tue, 11 Mar 2025 14:49:27 -0500 Subject: [PATCH 06/10] Add preview contact page --- .github/workflows/deploy-preview.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index 29ade691..3c1bbf06 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -54,7 +54,6 @@ jobs: SPLIT_BRANCH=$(git subtree split --prefix temp-dir temp-branch) git remote add web-preview ${{ env.preview_url }} - git fetch --all git checkout -b preview web-preview/main git merge $SPLIT_BRANCH -m "Merge Split Branch" --allow-unrelated-histories -X theirs git push web-preview HEAD:main From ab0562a3dc91f5c4e570d693b0ea10498ab83e0f Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Tue, 11 Mar 2025 14:51:47 -0500 Subject: [PATCH 07/10] Add preview contact page --- .github/workflows/deploy-preview.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index 3c1bbf06..896d3f6a 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -54,6 +54,7 @@ jobs: SPLIT_BRANCH=$(git subtree split --prefix temp-dir temp-branch) git remote add web-preview ${{ env.preview_url }} + git fetch git checkout -b preview web-preview/main git merge $SPLIT_BRANCH -m "Merge Split Branch" --allow-unrelated-histories -X theirs git push web-preview HEAD:main From 6e759bf0fab85c70389eff2c3a4dae745c8f2f48 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Tue, 11 Mar 2025 16:13:12 -0500 Subject: [PATCH 08/10] Add preview contact page --- contact.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contact.md b/contact.md index 08a53c64..abe884f8 100644 --- a/contact.md +++ b/contact.md @@ -3,7 +3,8 @@ title: Talk to Us layout: sub-page --- -

We want to hear from you! Get in touch via this form:

+We want to hear from you! Get in touch via this form and our staff will reach out to you within 1 business day. + ## Specific Questions? From 613ba4bbf3a3f61f096b5873e85fafec518f3ac8 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Wed, 12 Mar 2025 08:59:48 -0500 Subject: [PATCH 09/10] Add preview contact page --- contact.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contact.md b/contact.md index abe884f8..776ac968 100644 --- a/contact.md +++ b/contact.md @@ -3,7 +3,7 @@ title: Talk to Us layout: sub-page --- -We want to hear from you! Get in touch via this form and our staff will reach out to you within 1 business day. +We want to hear from you! Get in touch via this form and a member of our research computing facilitation team will do their best to reach out to you within 1 business day. From 3aa612dde6ee8219cdb8df0b0a4a714cb08ffe20 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Wed, 12 Mar 2025 10:50:02 -0500 Subject: [PATCH 10/10] Add preview contact page --- _includes/layout/header.html | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/_includes/layout/header.html b/_includes/layout/header.html index 5339b5b7..535a7fba 100644 --- a/_includes/layout/header.html +++ b/_includes/layout/header.html @@ -13,17 +13,6 @@
+
  • + +
    + PATh + Team + Glossary +
    +
    • +
  • + Contact +