Commit 59e8e960 authored by Marcelo Rivera's avatar Marcelo Rivera
Browse files

Merge branch 'feat/navigation-superstructure' into feat/searchbar-2424

parents 0fb3be62 b9ae639d

src/app/app.component.html

+1 −13
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
    </ng-container>



    <ng-template #v2Topbar>

      <m-v2-topbar *mIfFeature="'top-feeds'; else legacyTopbar">

      <m-v2-topbar>

        <ng-container search>

          <m-search--bar [defaultSizes]="false"></m-search--bar>

        </ng-container>
@@ -23,18 +23,6 @@ 
          ></m-notifications--topbar-toggle>

        </ng-container>

      </m-v2-topbar>

      <ng-template #legacyTopbar>

        <m-topbar class="m-noshadow">

          <ng-container search>

            <m-search--bar></m-search--bar>

          </ng-container>



          <ng-container icons>

            <m-notifications--topbar-toggle></m-notifications--topbar-toggle>

            <m-wallet--topbar-toggle></m-wallet--topbar-toggle>

          </ng-container>

        </m-topbar>

      </ng-template>



      <m-sidebar--markers

        [class.has-v2-navbar]="featuresService.has('top-feeds')"