Tidy topbar

styles/components/_topbar.scss

@@ -12,9 +12,10 @@
     flex-direction: row;
     align-items: stretch;
     justify-content: space-between;
+  }
 
-    .topbar__link {
+  &__link {
-      color: $color-white;
+    color: $color-white !important;
     display: inline-flex;
     align-items: center;
     height: $topbar-height;
@@ -38,62 +39,17 @@
       padding-left: $gap / 2;
     }
 
-      &--shield {
-        width: $icon-bar-width;
-        justify-content: center;
-        padding: 0;
-
-        .topbar__link-icon {
-          margin: 0;
-        }
-      }
-
     &:hover {
       background-color: $color-primary-darker;
       color: $color-white;
     }
   }
 
-    .topbar__context {
+  &__context {
     display: flex;
     flex-grow: 1;
     flex-direction: row;
     align-items: stretch;
     justify-content: flex-end;
-
-      .topbar__portfolio-menu {
-        margin-right: auto;
-        position: relative;
-      }
-    }
-  }
-
-  &.topbar--public {
-    background-color: $color-primary;
-
-    .topbar__navigation {
-      justify-content: flex-end;
-      -ms-flex-pack: justify;
-    }
-
-    .topbar__link {
-      color: $color-white;
-
-      &-icon {
-        @include icon-style-inverted;
-      }
-
-      &--home {
-        padding-left: $gap;
-      }
-
-      &:first-child {
-        margin-right: auto;
-      }
-
-      &:hover {
-        background-color: $color-primary-darker;
-      }
-    }
   }
 }

templates/navigation/topbar.html

@@ -8,7 +8,6 @@
         {{ "navigation.topbar.jedi_cloud_link_text" | translate }}
       </span>
     </a>
-
     <div class="topbar__context">
       {% if g.current_user %}
         <a href="{{ url_for('users.user') }}" class="topbar__link">