Merge branch 'master' into MorganRedden-patch-2

GSA · Mar 26, 2024 · 290f670 · 290f670
2 parents b0e3e45 + b5990b3
commit 290f670
Show file tree

Hide file tree

Showing 11 changed files with 110 additions and 78 deletions.
diff --git a/_apidocs/opportunities-api.md b/_apidocs/opportunities-api.md
@@ -368,7 +368,7 @@ Please use v3 for the following APIs to utilize “Requirement strategies(farCas
 *  /opps/v2/api/createAndPublish  
 *  /opps/v2/api/update/{opportunityId}  
 
-**Above v2 endpoints will be retired from alpha and prod (TBD) **
+**The above v2 endpoints will be retired from both alpha and production on October 31, 2024. **
 
 
 ## Contract Opportunity Management API Request and Responses
@@ -8955,5 +8955,6 @@ Date | Version | Description
 12/12/2023| v1.27| Updated the setAside titile descriptions for WOSB,WOSBSS,EDWOSB,EDWOSBSS.
 12/12/2023| v1.28| Updated the setAside titile descriptions for IEE, ISBEE.
 12/13/2023| v1.29| Updated the api's list for Award Amount error messages.
+03/22/2024| v1.30| The retirement date for the V2 endpoints(create, createAndPublished and update) has been updated in both the alpha and production environments. Please adjust your implementations accordingly.
 
 <p><small><a href="#">Back to top</a></small></p>
diff --git a/_config.yml b/_config.yml
@@ -3,7 +3,7 @@ title: GSA Open Technology
 description: Open source code, data and APIs from GSA.
 baseurl: "" # the subpath of your site, e.g. /blog/
 url: "https://open.gsa.gov" # the base hostname & protocol for your site
-logo: /assets/img/site-logo.png
+logo: /assets/img/gsa_logo.svg
 feature_image: /assets/img/feature-background.jpg
 
 sass:

diff --git a/_includes/header.html b/_includes/header.html
@@ -37,34 +37,21 @@
 </div>
 </div>
 <!-- Gov banner END -->
-    <nav class="usa-site-navbar" aria-label="primary navigation">
-                    <div class="usa-grid top-nav">
-                        <div id="logo">
-                            <a href="{{ site.baseurl }}/" accesskey="1" title="Home" aria-label="Home">
-          {% if site.logo %}
-            <img class="header-logo" src="{{ site.logo | prepend: site.baseurl }}" alt="{{ site.title }}">
-          {% else %}
-            <h1 class="usa-header-title">{{ site.title }}</h1>
-          {% endif %}
+  <nav class="usa-site-navbar" aria-label="primary navigation">
+    <div class="usa-grid top-nav">
+      <div id="logo">
+        <a href="{{ site.baseurl }}/" accesskey="1" title="Home" aria-label="Home">
+          <img class="header-logo" src="{{ site.logo | prepend: site.baseurl }}" alt="{{ site.title }}">
+          <span class="header-title">U.S. General Services Administration</span>
         </a>
-                        </div>
-                        <ul class="usa-nav-list usa-unstyled-list">
-                          <li class="usa-menu-item"><a href="{{ site.baseurl }}/search.html"> <i class="fa fa-search"></i> Search</a></li>
-                          <li class="usa-menu-item"><a href="{{ '/data' | prepend: site.baseurl }}">Data</a></li>
-                          <li class="usa-menu-item"><a href="{{ '/api' | prepend: site.baseurl }}">APIs</a></li>
-                          <li class="usa-menu-item"><a href="{{ '/code' | prepend: site.baseurl }}">Code</a></li>
-                        </ul>
-                        <!-- <ul class="usa-nav-list usa-unstyled-list">
-                          <li class="usa-menu-item"><a href="{{ site.baseurl }}/search"> <i class="fa fa-search"></i> Search</a></li>
-                            {% assign navs = site.data.navbar.assigned %} {% for nav in navs %} {% if nav.show_in_menu %}
-                            <li class="usa-menu-item">
-                                <a href="{{ nav.permalink | prepend: site.baseurl }}">{{ nav.text }}</a>
-                            </li>
-                            {% endif %} {% endfor %}
-                            </ul> -->
-
-                    </div>
-        <br/>
-
-    </nav>
+      </div>
+      <ul class="usa-nav-list usa-unstyled-list">
+        <li class="usa-menu-item"><a href="{{ site.baseurl }}/search.html"> <i class="fa fa-search"></i> Search</a></li>
+        <li class="usa-menu-item"><a href="{{ '/data' | prepend: site.baseurl }}">Data</a></li>
+        <li class="usa-menu-item"><a href="{{ '/api' | prepend: site.baseurl }}">APIs</a></li>
+        <li class="usa-menu-item"><a href="{{ '/code' | prepend: site.baseurl }}">Code</a></li>
+      </ul>
+    </div>
+    <br/>
+  </nav>
 </header>
diff --git a/_sass/_header.scss b/_sass/_header.scss
@@ -1,7 +1,18 @@
+#logo a {
+  text-decoration: none;
+}
+
 .header-logo {
-  min-width: 50px;
+  max-width: 50px;
 }
 
+.header-title {
+  display: inline;
+  position: relative;
+  bottom: 8px;
+  padding-left: 1rem;
+  font-family: Source Sans Pro Web, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif;
+}
 
 .hero-border{
   position:absolute;

diff --git a/_sass/_navbar.scss b/_sass/_navbar.scss
@@ -45,19 +45,13 @@ li.usa-menu-item {
 
 #logo {
   float: left;
-  max-width: 32rem;
 }
 
 #logo a {
   border: none;
 }
 
-#logo h1 {
-  font-size: 3rem;
-  margin: 0;
-}
-
-@media (width <= 600px) {
+@media (width <= 750px) {
   .usa-site-navbar .usa-grid {
     padding: 0;
   }

diff --git a/assets/img/gsa_logo.svg b/assets/img/gsa_logo.svg
diff --git a/assets/img/site-logo.pdf b/assets/img/site-logo.pdf
diff --git a/assets/img/site-logo.png b/assets/img/site-logo.png
diff --git a/assets/img/site-logo.psd b/assets/img/site-logo.psd
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "eslint-plugin-import": "^2.22.1",
     "postcss": "^8.4.36",
     "postcss-cli": "^11.0.0",
-    "stylelint": "^16.2.1",
+    "stylelint": "^16.3.1",
     "stylelint-config-recommended": "^14.0.0",
     "stylelint-config-standard-scss": "^13.0.0",
     "stylelint-scss": "^6.2.1",