Skip to content

Commit

Permalink
Merge Split Branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Automatic preview publish committed Aug 20, 2024
2 parents f70c661 + 29992da commit 06d5044
Show file tree
Hide file tree
Showing 5 changed files with 1,384 additions and 1,475 deletions.
91 changes: 0 additions & 91 deletions preview-pr-page/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,13 +817,6 @@ <h1 class="text-center">
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 collaboration flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Institute of High Energy Physics (IHEP) of the Chinese Academy of Sciences (CAS)</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 institution flex-grow w-100 highlight">
<span style="font-size: .7rem; line-height: .6rem;">Institute of High Energy Physics (IHEP) of the Chinese Academy of Sciences (CAS)</span>
Expand All @@ -838,13 +831,6 @@ <h1 class="text-center">
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 institution flex-grow w-100 highlight">
<span style="font-size: .7rem; line-height: .6rem;">University of Wisconsin–Madison Space Science and Engineering Center</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 institution flex-grow w-100 highlight">
<span style="font-size: .7rem; line-height: .6rem;">University of Southern California Information Sciences Institute</span>
Expand All @@ -859,20 +845,6 @@ <h1 class="text-center">
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 institution flex-grow w-100 highlight">
<span style="font-size: .7rem; line-height: .6rem;">University of Wisconsin–Madison Department of Anesthesiology</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 private-sector flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Laser Interferometer Gravitational Wave Observatory (LIGO)</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 collaboration flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Laser Interferometer Gravitational Wave Observatory (LIGO)</span>
Expand Down Expand Up @@ -999,13 +971,6 @@ <h1 class="text-center">
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 collaboration flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Fermi National Accelerator Laboratory</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 government flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Fermi National Accelerator Laboratory</span>
Expand All @@ -1020,13 +985,6 @@ <h1 class="text-center">
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 government flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">National Radio Astronomy Observatory</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 collaboration flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">National Radio Astronomy Observatory</span>
Expand All @@ -1048,27 +1006,13 @@ <h1 class="text-center">
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 collaboration flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">University of California, San Diego</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 institution flex-grow w-100 highlight">
<span style="font-size: .7rem; line-height: .6rem;">California Institute of Technology</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 collaboration flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">California Institute of Technology</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 government flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">National Science Foundation (NSF)</span>
Expand Down Expand Up @@ -1160,27 +1104,13 @@ <h1 class="text-center">
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 collaboration flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">University of Wisconsin–Madison</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 government flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Brookhaven National Laboratory</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 collaboration flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Brookhaven National Laboratory</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 private-sector flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Rutherford Appleton Laboratory</span>
Expand Down Expand Up @@ -1237,27 +1167,13 @@ <h1 class="text-center">
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 institution flex-grow w-100 highlight">
<span style="font-size: .7rem; line-height: .6rem;">Compact Muon Solenoid (CMS)</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 collaboration flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Compact Muon Solenoid (CMS)</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 private-sector flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Compact Muon Solenoid (CMS)</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 private-sector flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Foxconn Industrial Internet</span>
Expand Down Expand Up @@ -1461,13 +1377,6 @@ <h1 class="text-center">
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 collaboration flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Amazon Web Services</span>
</div>
</div>


<div class="col-1 d-flex">
<div class="border rounded px-1 pb-1 private-sector flex-grow w-100 ">
<span style="font-size: .7rem; line-height: .6rem;">Amazon Web Services</span>
Expand Down
2 changes: 1 addition & 1 deletion preview-pr-page/assets/css/homepage.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion preview-pr-page/htcondor/release-plan/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ <h3><span class="text-secondary">23.9.0</span> Feature Release Schedule</h3>
<b>Release:</b>
</div>
<div class="col-auto">
<span>2024-08-26</span>
<span>2024-08-27</span>
</div>
</div>
<div class="pt-2">
Expand Down
6 changes: 3 additions & 3 deletions preview-pr-page/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1649,14 +1649,14 @@ <h5><a class="text-decoration-none" href="/web-preview/preview-pr-page/descripti

<div class="col-12 col-md-6 col-xxl-5 order-lg-1">
<div class="p-3 my-3 d-flex flex-column shadow" id="hero-content-container">
<h3>NOAA funded marine scientist uses OSPool access to high throughput computing to explode her boundaries of research</h3>
<h3>Junior researchers advance black hole research with OSPool open capacity</h3>
<hr>
<div style="min-height: 150px">
<p>NOAA funded marine scientist uses OSPool access to high throughput computing to explode her boundaries of research.</p>
<p>The Event Horizon Telescope Collaboration furthers black hole research with a little help from the OSPool open capacity.</p>

</div>

<a class="mt-auto me-auto btn btn-primary" href="/web-preview/preview-pr-page/featured-users/2024-06-13-noaa-on-the-ospool.html">Read About Featured User</a>
<a class="mt-auto me-auto btn btn-primary" href="/web-preview/preview-pr-page/featured-users/2024-04-29-eht-story.html">Read About Featured User</a>

</div>
</div>
Expand Down
Loading

0 comments on commit 06d5044

Please sign in to comment.