Merge pull request #1278 from dod-ccpo/minor-ui-tweaks

Minor ui tweaks

styles/components/_footer.scss

@@ -3,8 +3,7 @@
   background-color: $color-white;
   border-top: 1px solid $color-gray-lightest;
   display: flex;
-  flex-direction: row;
-  justify-content: space-between;
+  flex-direction: row-reverse;
   align-items: center;
   padding: $gap * 1.5;
   position: fixed;
@@ -15,19 +14,7 @@
   color: $color-gray-dark;
   font-size: 1.5rem;
 
-  &__info {
-    flex-grow: 1;
+  &__login {
     padding-left: 0.8rem;
-
-    &__link {
-      margin: (-$gap * 2) (-$gap);
-      font-weight: normal;
-
-      .icon--footer {
-        @include icon-size(16);
-
-        margin: 0rem 0.8rem 0rem 0rem;
-      }
-    }
   }
 }

templates/footer.html

@@ -1,14 +1,8 @@
 {% from "components/icon.html" import Icon %}
 
 <footer class='app-footer'>
-  <div class='app-footer__info'>
-    <a href="#" class='icon-link app-footer__info__link' target='_blank' rel='noopener noreferrer'>
-      {{ Icon('help', classes='icon--footer') }}
-      <span>{{ "footer.jedi_help_link_text" | translate }}</span>
-    </a>
-  </div>
   {% if g.last_login %}
-    <div class="">
+    <div class="app-footer__login">
       {{ "footer.login" | translate }} <local-datetime timestamp='{{ g.last_login }}' format='MMM D YYYY H:mm Z'></local-datetime>
     </div>
   {% endif %}

templates/navigation/topbar.html

@@ -12,8 +12,12 @@
     <div class="topbar__context">
       {% if g.current_user %}
         <a href="{{ url_for('users.user') }}" class="topbar__link">
-          <span class="topbar__link-label">{{ g.current_user.first_name + " " + g.current_user.last_name }}</span>
           {{ Icon('avatar', classes='topbar__link-icon') }}
+          <span class="topbar__link-label">{{ g.current_user.first_name + " " + g.current_user.last_name }}</span>
+        </a>
+        <a href="{{ url_for('atst.helpdocs') }}" class="topbar__link">
+          {{ Icon('question', classes='topbar__link-icon') }}
+          <span class="topbar__link-label">Support</span>
         </a>
 
         <a href="{{ url_for('atst.logout') }}" class="topbar__link" title='{{ "navigation.topbar.logout_link_title" | translate }}'>

translations.yaml

@@ -135,7 +135,6 @@ flash:
   updated_application_team_settings: 'You have updated the {application_name} team settings.'
   logged_out: Logged out
 footer:
-  jedi_help_link_text: Need help?  Click here!
   login: 'Last login:'
 forms:
   application: