src/app/common/components/post-menu/post-menu.component.html

@@ -44,10 +44,6 @@
  <li class="mdl-menu__item" *ngIf="entity.allow_comments" (click)="allowComments(false)" i18n="@@COMMON__POST_MENU__DISABLE_COMMENTS">Disable Comments</li>
  </ng-container>
  <!-- ADMIN EDIT FLAGS -->
- <ng-container *ngIf="options.indexOf('set-explicit') !== -1 && (entity.owner_guid == session.getLoggedInUser().guid || session.isAdmin())">
- <li class="mdl-menu__item" [hidden]="entity.mature" (click)="setExplicit(true)" i18n="@@COMMON__POST_MENU__SET_AS_EXPLICIT">Set as Explicit</li>
- <li class="mdl-menu__item" [hidden]="!entity.mature" (click)="setExplicit(false)" i18n="@@COMMON__POST_MENU__REMOVE_EXPLICIT">Remove Explicit</li>
- </ng-container>
  <ng-container *ngIf="options.indexOf('set-explicit') !== -1 && session.isAdmin()">
  <li class="mdl-menu__item m-postMenu__item--nsfw">
  <m-nsfw-selector

src/app/common/layout/sidebar/markers.component.scss

@@ -7,7 +7,6 @@
  z-index: 999;
  width: 48px;
  height: calc(100% - 52px);
- overflow: hidden;
  
  @include m-theme(){
  background-color: themed($m-white);
@@ -17,7 +16,7 @@
  left: 0;
  height: 48px;
  width: 100%;
- overflow-y: visible;
+ overflow-y: hidden;
  @include m-theme(){
  border-bottom: 1px solid themed($m-grey-50);
  }

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

@@ -65,6 +65,7 @@ m-channel{
  .m-channel--stats{
  border:0;
  pointer-events: all;
+ padding: 0 0 $minds-padding 0;
 
  a {
  flex:auto;
@@ -97,7 +98,6 @@ m-channel{
  .minds-button-edit > button, minds-button-user-dropdown > button{
  padding: 6px;
  font-size: 18px;
- // margin: 0px 30px;
  }
 
  }
@@ -131,7 +131,7 @@ m-channel{
  display: flex;
  flex-direction: column;
  width: 80%;
- margin: $minds-padding * 2 auto;
+ margin: 16px auto 0;
 
  p {
  margin: 0;
@@ -139,6 +139,8 @@ m-channel{
 
  button {
  margin: 8px auto;
+ min-height: 32px;
+ height: auto;
  }
  }
 
@@ -159,25 +161,24 @@ m-channel{
  }
 
  .m-channel--action-buttons{
- padding: 8px;
+ padding: 16px 4px;
  display: flex;
+ flex-wrap: wrap;
  flex-direction: row;
+ justify-content: center;
  align-items: center;
  position: relative;
- margin: 16px auto 0;
 
  > * {
- flex: auto;
- margin: auto;
- margin-right: 8px;
- }
+ margin: 4px;
+ } 
 
  > *:last-child {
  margin-right: 0;
  }
 
  .m-channel--badges {
- min-width: 124px;
+ min-width: 118px;
  }
 
  .m-channel--edit-button-wrapper {
@@ -188,7 +189,6 @@ m-channel{
  font-size: 16px;
  border:0;
  }
-
  }
 
  .minds-channel-sidebar, .m-channel-sidebar{
@@ -198,6 +198,29 @@ m-channel{
  overflow:visible;
  min-height:0;
 
+ minds-button-user-dropdown {
+ > button {
+ position: relative;
+ }
+ .minds-dropdown-menu {
+ position: absolute;
+ top: 112px;
+ right: -124px;
+ }
+ }
+ 
+ .minds-button-edit > button, minds-button-user-dropdown > button{
+ @include m-theme(){
+ color: rgba(themed($m-black), 0.3);
+ }
+ 
+ &:hover {
+ @include m-theme(){
+ color: rgba(themed($m-black), 0.5);
+ }
+ }
+ }
+
  minds-avatar{
  margin:-75px auto 0;
  .minds-avatar{
@@ -519,10 +542,8 @@ m-channel{
  }
  }
  }
-
  }
 
- //
 }
 
 .m-channel-feed__Filter {

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

@@ -7,6 +7,8 @@
  <button class="material-icons" [hidden]="editing">edit</button>
  <button class="material-icons" [hidden]="!editing">done</button>
  </span>
+ <minds-button-user-dropdown [(user)]="user" *ngIf="session.getLoggedInUser().guid != user.guid"></minds-button-user-dropdown>
+ 
  </div>
  <div class="m-channel--username">
  <h2><span>@</span>{{user.username}}</h2>
@@ -120,7 +122,6 @@
  <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>
- <minds-button-user-dropdown [(user)]="user" *ngIf="session.getLoggedInUser().guid != user.guid"></minds-button-user-dropdown>
  <div class="m-channel--edit-button-wrapper" (click)="toggleEditing()" *ngIf="session.getLoggedInUser().guid == user.guid">
  <button class="m-btn m-btn--with-icon m-btn--slim">
  <i [hidden]="editing" class="material-icons">edit</i>
@@ -129,7 +130,6 @@
  <span [hidden]="!editing" i18n="@@M__ACTION__SAVE">Save</span>
  </button>
  </div>
-
  <minds-button-boost [object]="user" *ngIf="session.getLoggedInUser().guid == user.guid"></minds-button-boost>
  <m-channel--badges [user]="user"></m-channel--badges>
  </div>

src/app/modules/channels/sidebar/sidebar.scss

@@ -41,10 +41,19 @@
  }
  }
 }
-
-
-@media screen and (max-width: $max-mobile * 1.25) {
- m-messenger--channel-button {
- display: none;
+.m-channel--action-buttons {
+ // @media screen and (max-width: $min-desktop) and (min-width: $min-tablet){
+ // m-messenger--channel-button {
+ // span {
+ // display:none;
+ // }
+ // }
+ // }
+
+
+ @media screen and (max-width: $max-mobile * 1.25) {
+ m-messenger--channel-button {
+ display: none;
+ }
  }
-}
+}
\ No newline at end of file

src/app/modules/channels/sorted/sorted.component.ts

@@ -133,6 +133,19 @@ export class ChannelSortedComponent implements OnInit {
  }
 
  this.entities.unshift(activity);
+
+ let feedItem = {
+ entity: activity,
+ urn: activity.urn,
+ guid: activity.guid
+ };
+
+ // Todo: Move to FeedsService
+ this.feedsService.rawFeed.next([
+ ... [ feedItem ],
+ ... this.feedsService.rawFeed.getValue()
+ ]);
+
  this.detectChanges();
  }
 

src/app/modules/legacy/components/buttons/user-dropdown.ts

@@ -13,20 +13,12 @@ import { BlockListService } from "../../../../common/services/block-list.service
  inputs: ['user'],
  outputs: ['userChanged'],
  template: `
- <button class="material-icons" (click)="toggleMenu($event)">settings</button>
+ <button class="material-icons" (click)="toggleMenu($event)">more_vert</button>
 
  <ul class="minds-dropdown-menu" [hidden]="!showMenu" >
  <li class="mdl-menu__item" [hidden]="user.blocked" (click)="block()" i18n="@@MINDS__BUTTONS__USER_DROPDOWN__BLOCK">Block @{{user.username}}</li>
  <li class="mdl-menu__item" [hidden]="!user.blocked" (click)="unBlock()" i18n="@@MINDS__BUTTONS__USER_DROPDOWN__UNBLOCK">Un-Block @{{user.username}}</li>
  <li class="mdl-menu__item" [hidden]="!user.subscribed" (click)="unSubscribe()" i18n="@@MINDS__BUTTONS__USER_DROPDOWN__UNSUBSCRIBE">Unsubscribe</li>
- <li class="mdl-menu__item"
- *ngIf="session.isAdmin()"
- [hidden]="user.banned === 'yes'"
- (click)="banToggle = true; showMenu = false"
- i18n="@@MINDS__BUTTONS__USER_DROPDOWN__BAN_GLOBALLY"
- >
- Ban globally
- </li>
  <li class="mdl-menu__item" *ngIf="session.isAdmin()" [hidden]="user.banned !== 'yes'" (click)="unBan()" i18n="@@MINDS__BUTTONS__USER_DROPDOWN__UNBAN_GLOBALLY">Un-ban globally</li>
  <li class="mdl-menu__item"
  *ngIf="session.isAdmin()"

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

@@ -393,7 +393,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/messenger/channel-button/channel-button.component.scss

 @import 'defaults.scss';
 
 m-messenger--channel-button{
+ > button {
 
- > button{
+ background: transparent;
+ font-size: 12px;
+ padding: 4px 8px !important;
+ min-width: 128px;
 
- cursor:pointer;
- background: transparent;
- font-size: 12px;
- border-radius: 2px;
- text-transform: uppercase;
- padding: 4px 8px;
- min-width: 128px;
- @include m-theme(){
- border: 1px solid themed($m-blue-grey-400);
- color: themed($m-blue-grey-400);
- }
+ > i, &.material-icons {
+ padding-bottom: 1px;
+ vertical-align:middle;
+ margin-top: 2px;
+ }
 
- > i, &.material-icons {
- padding-right: $minds-padding;
- padding-bottom: 1px;
- vertical-align:middle;
- }
- @media screen and (max-width: $min-desktop) and (min-width: $min-tablet){
- span {
- display:none;
+ > span {
+ padding-left: $minds-padding;
  }
- }
  }
 }

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

@@ -42,13 +42,12 @@ m-wire-channel {
  background: transparent;
  cursor: pointer;
  @include m-theme(){
- color: themed($m-blue-grey-400);
+ color: themed($m-grey-400);
  }
 
  &:hover {
  @include m-theme(){
- color: themed($m-white);
- background-color: themed($m-blue-grey-400);
+ color: themed($m-grey-600);
  }
  }
  }
@@ -114,7 +113,6 @@ m-wire-channel {
  .m-wire-channel--reward-description > textarea {
  margin-top: 8px;
  margin-bottom: 16px;
- /* min-height: 51px; */
  font-size: 11px;
  padding: 8px;
  font-weight: 500;
@@ -127,7 +125,6 @@ m-wire-channel {
 
  .m-wire-channel--rewards {
  width: 100%;
- //margin-top: $minds-padding * 2;
  @include m-theme(){
  color: themed($m-grey-800);
  }
@@ -179,9 +176,6 @@ m-wire-channel {
  @include m-theme(){
  color: themed($m-blue);
  }
- & > i {
- //transform: scale(1.6);
- }
  }
 
  .m-wire-channel--reward-amount,