Commit 79dc4a4f authored by Mark Harding's avatar Mark Harding
Browse files

Merge branch 'chore/newsfeed-usercard-ui-1525' into 'master' 

(chore): Newsfeed usercard UI minor changes

Closes #1525

See merge request !453
parents f1950a2c 7064543f

src/app/modules/legacy/components/cards/cards.scss

+5 −4
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ minds-card-user, .minds-banner-card{ 
        text-overflow: ellipsis;

        text-overflow: ellipsis;

        font-size: 16px;

        font-size: 16px;

        line-height: 18px;

        line-height: 18px;

        padding: 0;

        padding: 0 0 0 1px;

        margin: 0;

        margin: 0;

        @include m-theme(){

        @include m-theme(){

          text-shadow: -1px -1px 0 themed($m-black-always), 1px -1px 0 themed($m-black-always), -1px 1px 0 themed($m-black-always), 1px 1px 0 themed($m-black-always);

          text-shadow: -1px -1px 0 themed($m-black-always), 1px -1px 0 themed($m-black-always), -1px 1px 0 themed($m-black-always), 1px 1px 0 themed($m-black-always);
@@ -85,6 +85,7 @@ minds-card-user, .minds-banner-card{ 
        overflow: hidden;

        overflow: hidden;

        white-space: nowrap;

        white-space: nowrap;

        text-overflow: ellipsis;

        text-overflow: ellipsis;

        padding: 0 0 0 1px;

        @include m-theme(){

        @include m-theme(){

          text-shadow: -1px -1px 0 themed($m-black-always), 1px -1px 0 themed($m-black-always), -1px 1px 0 themed($m-black-always), 1px 1px 0 themed($m-black-always);

          text-shadow: -1px -1px 0 themed($m-black-always), 1px -1px 0 themed($m-black-always), -1px 1px 0 themed($m-black-always), 1px 1px 0 themed($m-black-always);

        }

        }
@@ -98,7 +99,7 @@ minds-card-user, .minds-banner-card{ 




  minds-button-subscribe, minds-button-boost{

  minds-button-subscribe, minds-button-boost{

    position: absolute;

    position: absolute;

    margin: -38px 0 0 130px;

    margin: -34px 0 0 130px;

    //z-index:999;

    //z-index:999;

  }

  }

src/app/modules/newsfeed/newsfeed.component.html

+1 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ 




    <div class="mdl-cell mdl-cell--4-col m-newsfeed--sidebar m-newsfeed__sidebar">

    <div class="mdl-cell mdl-cell--4-col m-newsfeed--sidebar m-newsfeed__sidebar">





      <minds-card-user *ngIf="session.isLoggedIn()" [object]="session.getLoggedInUser()" class="mdl-card m-border"></minds-card-user>

      <minds-card-user *ngIf="session.isLoggedIn()" [object]="session.getLoggedInUser()" [avatarSize]="'large'" class="mdl-card m-border"></minds-card-user>





      <ng-container *mIfFeature="'top-feeds'">

      <ng-container *mIfFeature="'top-feeds'">

        <h3 class="m-newsfeedSidebar__header">

        <h3 class="m-newsfeedSidebar__header">