Merge branch 'master' of https://github.com/GSA/AAS_root

GSA · Apr 8, 2022 · ee60a1b · ee60a1b
2 parents 8734a82 + 0d32e1d
commit ee60a1b
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 4 deletions.
diff --git a/ASTRO Contract Holder Directory - Aviation.pdf b/ASTRO Contract Holder Directory - Aviation.pdf
diff --git a/ASTRO Contract Holder Directory - DEVSI.pdf b/ASTRO Contract Holder Directory - DEVSI.pdf
diff --git a/ASTRO Contract Holder Directory - DataOps.pdf b/ASTRO Contract Holder Directory - DataOps.pdf
diff --git a/ASTRO Contract Holder Directory - Ground.pdf b/ASTRO Contract Holder Directory - Ground.pdf
diff --git a/ASTRO Contract Holder Directory - Maritime.pdf b/ASTRO Contract Holder Directory - Maritime.pdf
diff --git a/ASTRO Contract Holder Directory - MisOps.pdf b/ASTRO Contract Holder Directory - MisOps.pdf
diff --git a/ASTRO Contract Holder Directory - Research.pdf b/ASTRO Contract Holder Directory - Research.pdf
diff --git a/ASTRO Contract Holder Directory - Space.pdf b/ASTRO Contract Holder Directory - Space.pdf
diff --git a/ASTRO Contract Holder Directory - Support.pdf b/ASTRO Contract Holder Directory - Support.pdf
diff --git a/ASTRO Contract Holder Directory - Training.pdf b/ASTRO Contract Holder Directory - Training.pdf
diff --git a/_assets/css/index.scss b/_assets/css/index.scss
@@ -380,6 +380,13 @@ hr.media-line{
   border-radius: 5px 0 0 5px!important;
 }
 
+.usa-banner__button::after{
+	background: 0 0;
+	background-color: #005ea2;
+	-webkit-mask: url(https://www.gsa.gov/sites/gsa.gov/templates/styles/dist/img/usa-icons/expand_more.svg) no-repeat center/contain;
+	mask: url(https://www.gsa.gov/sites/gsa.gov/templates/styles/dist/img/usa-icons/expand_more.svg) no-repeat center/contain;
+}
+
 //Footer styles
 hr.footer-border{
   width: 100vw;

diff --git a/_includes/astro.html b/_includes/astro.html
@@ -19,7 +19,7 @@ <h1>ASTRO</h1>
     <div id="block-1" class="c-sect  hide-element">
         <p>ASTRO is a broadly scoped series of contract vehicles encompassing virtually all services supporting or involving manned, unmanned, or optionally manned platforms and robotics.</p>
         <br>
-        <p>ASTRO is administered by the General Services Administration’s (GSA) Office of Assisted Acquisition Service (AAS) FEDSIM Organization. It is a family of ten separate, individual, Multiple Award (MA), Indefinite Delivery/Indefinite Quantity (IDIQ) contracts.</p>
+        <p>ASTRO is administered by the General Services Administration’s (GSA) Office of Assisted Acquisition Service (AAS) FEDSIM Organization. It is a family of ten separate, individual, Multiple Award (MA), Indefinite Delivery/Indefinite Quantity (IDIQ) contracts. ASTRO orders may only be placed by authorized COs within GSA's Assisted Acquisition Service.</p>
         <br>
         <p>For more information on ASTRO, download the <a href="../ASTRO_FAQs_v2.pdf" target="_blank">ASTRO FAQ sheet</a>.</p>
     </div>
@@ -346,7 +346,7 @@ <h4>Support Pool</h4>
 
 <div id="popup_TP" class="dialog-overlay" aria-hidden="true" onclick="javascript:closePool();">
     <div class="dialog" role="dialog">
-        <h4>Trainining Pool</h4>
+        <h4>Training Pool</h4>
         <hr>
         <p><strong>Function:</strong> All training (the providing of instruction) services required for successful execution of a product, program, project, or process regarding platforms and/or robotics for land, air, sea, or space. </p>
         <p><strong>NAICS Code and Title:</strong> 611699 – All other Miscellaneous Schools and Instruction </p>
@@ -358,7 +358,7 @@ <h4>Trainining Pool</h4>
 
 <div id="popup_DSIP" class="dialog-overlay" aria-hidden="true" onclick="javascript:closePool();">
     <div class="dialog" role="dialog">
-        <h4>Development/Systems Intergration Pool</h4>
+        <h4>Development/Systems Integration Pool</h4>
         <hr>
         <p><strong>Function:</strong> Systems integration, improvement, and/or engineering associated with manned, unmanned, and optionally manned platforms. </p>
 <p><strong>NAICS Code and Title:</strong> 541330 – Engineering Services </p>

diff --git a/_includes/leadership.html b/_includes/leadership.html
@@ -83,7 +83,7 @@ <h1>Leadership</h1>
         <button class="memberblock-head" onclick="javascript:openBio('bioPopup_RC');" taborder="8">
             {% asset RC_pic.png class="member-pic" alt="Rodney Couick" %}
             <br>
-            <p class="allcaps">Rodney Couickn</p>
+            <p class="allcaps">Rodney Couick</p>
             <p>Director, Region 5</p>
         </button>
     </div>