Quick commit before pulling latest

app/assets/sass/uswds/_uswds-theme-custom-styles.scss

@@ -22,7 +22,8 @@ i.e.
 
 @use "uswds-core" as *;
 
-.usa-header--extended .usa-logo {
+.usa-header--extended {
+   .usa-logo {
       font-family: family("sans");
       margin: units(4) 0;
       @include at-media-max('mobile-lg') {
@@ -35,6 +36,12 @@ i.e.
          }
       }
    }
+   .usa-nav__secondary {
+      .usa-nav__link {
+        padding: 0;
+      }
+   }
+}
 
 .usa-banner__header-action {
    font-size: size("body", 2);
@@ -44,14 +51,11 @@ i.e.
    &> .usa-nav__primary-item > a {
       font-size: size("body", 4);
    }
-   &> .usa-nav__primary-item:last-child {
+   // &> .usa-nav__primary-item:last-child {
-      margin-left: auto;
+   //    margin-left: auto;
-      @include u-margin-right(-4);
+   //    @include u-margin-right(-4);
+   // }
 }
-}
-
-.usa-nav__primary
-
 
 h1 {
    font-weight: bold !important;

app/templates/admin_template.html

@@ -58,26 +58,32 @@
           "text": "Features",
           "active": header_navigation.is_selected('features')
         },
-        {
-          "href": url_for('main.user_profile'),
-          "text": current_user.name,
-          "active": header_navigation.is_selected('user-profile')
-        },
         {
           "href": url_for('main.platform_admin_splash_page'),
           "text": "Platform admin",
           "active": header_navigation.is_selected('platform-admin')
         },
-        {
-          "href": url_for('main.sign_out'),
-          "text": "Sign out"
-        },
         {
           "href": url_for('main.support'),
           "text": "Contact us",
           "active": header_navigation.is_selected('support')
         }
       ] %}
+      {% set secondaryNavigation = [
+        {
+          "href": url_for('main.user_profile'),
+          "text": current_user.name,
+          "active": header_navigation.is_selected('user-profile')
+        },
+        {
+          "href": url_for('.service_settings', service_id=current_service.id),
+          "text": "Settings"
+        },
+        {
+          "href": url_for('main.sign_out'),
+          "text": "Sign out"
+        }
+      ] %}
     {% else %}
       {% set navigation = [
         {
@@ -104,6 +110,13 @@
           "href": url_for('main.user_profile'),
           "text": "User profile",
           "active": header_navigation.is_selected('user-profile')
+        }
+      ] %}
+      {% set secondaryNavigation = [
+        {
+        "href": url_for('main.user_profile'),
+        "text": current_user.name,
+        "active": header_navigation.is_selected('user-profile')
         },
         {
         "href": url_for('main.sign_out'),
@@ -142,6 +155,7 @@
     "productName": "Notify",
     "navigation": navigation,
     "navigationClasses": "govuk-header__navigation--end",
+    "secondaryNavigation": secondaryNavigation,
     "assetsPath": asset_path + "images"
   }) }}
 {% endblock %}
@@ -273,5 +287,3 @@
   <!--<![endif]-->
 
 {% endblock %}
-
-

app/templates/components/components/header/template.njk

@@ -76,13 +76,13 @@
           {% endif %}
         {% endfor %}
       </ul>
-      <div class="usa-nav__secondary">
+      <div class="usa-nav__secondary margin-bottom-2">
         <ul class="usa-nav__secondary-links">
           {% for item in params.secondaryNavigation %}
             {% if item.href and item.text %}
               <li class="usa-nav__secondary-item{{ ' is-current' if item.active }}">
-              <a class="usa-nav__link {{ ' usa-current' if item.active }}" href="{{ item.href }}" {% for attribute, value
+                <a class="usa-nav__link {{ ' usa-current' if item.active }}" href="{{ item.href }}" {% for attribute, value in
-                in item.attributes %} {{attribute}}="{{value}}" {% endfor %}>
+                  item.attributes %} {{attribute}}="{{value}}" {% endfor %}>
                   <span>{{ item.text }}</span>
                 </a>
               </li>

app/templates/main_nav.html

@@ -17,9 +17,9 @@
     {% if current_user.has_permissions('manage_service', allow_org_user=True) %}
       <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('usage') }}" href="{{ url_for('.usage', service_id=current_service.id) }}">Usage</a></li>
     {% endif %}
-    {% if current_user.has_permissions('manage_api_keys', 'manage_service') %}
+    <!-- {% if current_user.has_permissions('manage_api_keys', 'manage_service') %}
       <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('settings') }}" href="{{ url_for('.service_settings', service_id=current_service.id) }}">Settings</a></li>
-    {% endif %}
+    {% endif %} -->
     {% if current_user.has_permissions('manage_api_keys') %}
       <!-- <li><a class="usa-link{{ main_navigation.is_selected('api-integration') }}" href="{{ url_for('.api_integration', service_id=current_service.id) }}">API integration</a></li> -->
     {% endif %}

app/templates/settings_nav.html

@@ -0,0 +1,20 @@
+{% if help %}
+  {% include 'partials/tour.html' %}
+{% else %}
+<nav class="nav">
+  {% if current_user.has_permissions() %}
+    {% if current_user.has_permissions('view_activity') %}
+      <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('dashboard') }}" href="{{ url_for('.service_dashboard', service_id=current_service.id) }}">Dashboard</a></li>
+    {% endif %}
+    {% if current_user.has_permissions('manage_service', allow_org_user=True) %}
+      <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('usage') }}" href="{{ url_for('.usage', service_id=current_service.id) }}">Usage</a></li>
+    {% endif %}
+    {% if current_user.has_permissions('manage_api_keys', 'manage_service') %}
+      <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('settings') }}" href="{{ url_for('.service_settings', service_id=current_service.id) }}">Settings</a></li>
+    {% endif %}
+  {% elif current_user.has_permissions(allow_org_user=True) %} -->
+    <li class="usa-sidenav__item"><a class="usa-link{{ main_navigation.is_selected('team-members') }}" href="{{ url_for('.manage_users', service_id=current_service.id) }}">Team members</a></li>
+  {% endif %}
+  </ul>
+</nav>
+{% endif %}