src/app/modules/channels/channel.component.scss

@@ -164,11 +164,10 @@ m-channel{
  justify-content: center;
  align-items: center;
  position: relative;
- max-width: 192px;
  margin: auto;
 
  > * {
- margin: 4px;
+ padding: 4px;
  }
 
  .m-channel--badges {
@@ -193,11 +192,6 @@ m-channel{
  border:0;
  }
 
- .m-channel--action-buttons-row > * {
- margin: 0 4px;
- display: inline-block;
- }
-
  @media screen and (max-width: $max-mobile * 1.25) {
  m-messenger--channel-button {
  display: none;
@@ -222,7 +216,7 @@ m-channel{
  right: -124px;
  }
  }
- 
+
  .minds-button-edit > button, minds-button-user-dropdown > button{
  @include m-theme(){
  color: rgba(themed($m-black), 0.3);

src/app/modules/channels/sidebar/sidebar.html

@@ -45,7 +45,7 @@
  <!-- END City / Location -->
 
 
- <div class="m-channel-bio-field mdl-color-text--blue-grey-300" *ngIf="user.tags.length && !editing">
+ <div class="m-channel-bio-field mdl-color-text--blue-grey-300" *ngIf="user.tags && !editing">
  <div class="m-channel-bio-field__tags-container" [hidden]="editing || !user.tags">
  <i class="material-icons mdl-color-text--blue-grey-300">local_offer</i>
  <span *ngFor="let tag of user.tags">#{{tag}}</span>
@@ -120,17 +120,15 @@
  <div class="m-channel--action-buttons">
  <minds-button-subscribe [user]="user" *ngIf="session.isLoggedIn() && session.getLoggedInUser().guid != user.guid && !user.blocked && !user.subscribed"></minds-button-subscribe>
  <m-messenger--channel-button [user]="user" *ngIf="user.subscribed && session.getLoggedInUser().guid != user.guid"></m-messenger--channel-button>
- <div class="m-channel--action-buttons-row" *ngIf="session.getLoggedInUser().guid == user.guid">
- <div class="m-channel--edit-button-wrapper" (click)="toggleEditing()">
- <button class="m-btn m-btn--with-icon m-btn--slim">
- <i [hidden]="editing" class="material-icons">edit</i>
- <i [hidden]="!editing" class="material-icons">done</i>
- <span [hidden]="editing" i18n="@@M__ACTION__EDIT">Edit</span>
- <span [hidden]="!editing" i18n="@@M__ACTION__SAVE">Save</span>
- </button>
- </div>
- <minds-button-boost [object]="user"></minds-button-boost>
+ <div *ngIf="session.getLoggedInUser().guid == user.guid" class="m-channel--edit-button-wrapper" (click)="toggleEditing()">
+ <button class="m-btn m-btn--with-icon m-btn--slim">
+ <i [hidden]="editing" class="material-icons">edit</i>
+ <i [hidden]="!editing" class="material-icons">done</i>
+ <span [hidden]="editing" i18n="@@M__ACTION__EDIT">Edit</span>
+ <span [hidden]="!editing" i18n="@@M__ACTION__SAVE">Save</span>
+ </button>
  </div>
+ <minds-button-boost *ngIf="session.getLoggedInUser().guid == user.guid" [object]="user"></minds-button-boost>
  <m-channel--badges [user]="user"></m-channel--badges>
  </div>
 </div>

src/app/modules/groups/sidebar-markers/sidebar-markers.component.scss

@@ -20,6 +20,9 @@
 
  @media screen and(max-width: $min-desktop) {
  padding-right: 0;
+ &::-webkit-scrollbar, &::-webkit-scrollbar:horizontal {
+ display: none;
+ }
  }
 
  infinite-scroll {

src/app/modules/legacy/components/cards/activity/activity.ts

@@ -367,7 +367,10 @@ export class Activity implements OnInit {
  }
 
  onNSWFSelections(reasons: Array<{ value, label, selected}>) {
- this.attachment.setNSFW(reasons);
+ if (this.attachment.has()) {
+ this.attachment.setNSFW(reasons);
+ }
+ this.activity.nsfw = reasons.map(reason => reason.value);
  }
 
  isUnlisted() {

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

@@ -74,7 +74,7 @@ minds-card-user, .minds-banner-card{
  text-overflow: ellipsis;
  font-size: 16px;
  line-height: 18px;
- padding: 0;
+ padding: 0 0 0 1px;
  margin: 0;
  @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);
@@ -85,6 +85,7 @@ minds-card-user, .minds-banner-card{
  overflow: hidden;
  white-space: nowrap;
  text-overflow: ellipsis;
+ padding: 0 0 0 1px;
  @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);
  }
@@ -98,7 +99,7 @@ minds-card-user, .minds-banner-card{
 
  minds-button-subscribe, minds-button-boost{
  position: absolute;
- margin: -38px 0 0 130px;
+ margin: -34px 0 0 130px;
  //z-index:999;
  }
 
@@ -305,7 +306,7 @@ minds-activity.mdl-card, minds-activity, minds-activity-preview{
 
  .m-owner-block--remind{
  overflow: visible;
- 
+
  i{
  font-size: 18px;
  margin-right: 12px;
@@ -564,7 +565,7 @@ minds-activity.mdl-card, minds-activity, minds-activity-preview{
  @include m-theme(){
  color: themed($m-blue) !important;
  }
- 
+
  &:hover {
  @include m-theme(){
  color: rgba(themed($m-blue-dark),0.9) !important;

src/app/modules/modals/signup/signup-on-scroll.ts

@@ -31,16 +31,14 @@ export class SignupOnScrollModal {
 
  ngOnDestroy() {
  this.unListen();
-
- if (this.scroll_listener) {
- this.scroll.unListen(this.scroll_listener);
- }
  }
 
  listen() {
  this.routerSubscription = this.router.events.subscribe((navigationEvent: NavigationEnd) => {
  try {
  if (navigationEvent instanceof NavigationEnd) {
+ this.unlistenScroll();
+
  if (!navigationEvent.urlAfterRedirects) {
  return;
  }
@@ -51,7 +49,7 @@ export class SignupOnScrollModal {
  url = url.substr(1);
  }
 
- let fragments = url.replace(/\//g, ';').split(';');
+ const fragments = url.replace(/\//g, ';').split(';');
 
  this.route = navigationEvent.urlAfterRedirects;
 
@@ -69,7 +67,6 @@ export class SignupOnScrollModal {
  this.open = false;
  else
  this.open = true;
- this.scroll.unListen(this.scroll_listener);
  }
  }, 100);
  }
@@ -82,5 +79,12 @@ export class SignupOnScrollModal {
 
  unListen() {
  this.routerSubscription.unsubscribe();
+ this.unlistenScroll();
+ }
+
+ private unlistenScroll() {
+ if (this.scroll_listener) {
+ this.scroll.unListen(this.scroll_listener);
+ }
  }
 }

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

@@ -68,7 +68,7 @@
 
  <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'">
  <h3 class="m-newsfeedSidebar__header">