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

@@ -102,10 +102,6 @@ m-channel{
 
  }
 
- .m-channel--city{
- //margin:auto;
- }
-
  .m-channel--blocked{
  margin: 100px auto;
  h3{
@@ -168,27 +164,39 @@ m-channel{
  justify-content: center;
  align-items: center;
  position: relative;
+ margin: auto;
 
  > * {
- margin: 4px;
- } 
-
- > *:last-child {
- margin-right: 0;
+ padding: 4px;
  }
 
  .m-channel--badges {
- min-width: 118px;
+ justify-content: center;
+
+ > i {
+ padding: 4px;
+ }
  }
 
  .m-channel--edit-button-wrapper {
  flex-shrink: 0;
  }
 
+ minds-button-subscribe > button {
+ height: 32px;
+ padding: 8px 16px 8px 12px;
+ }
+
  .minds-button-edit > button, minds-button-user-dropdown > button{
  font-size: 16px;
  border:0;
  }
+
+ @media screen and (max-width: $max-mobile * 1.25) {
+ m-messenger--channel-button {
+ display: none;
+ }
+ }
  }
 
  .minds-channel-sidebar, .m-channel-sidebar{
@@ -198,28 +206,28 @@ 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-user-dropdown {
+ > button {
+ position: relative;
  }
- 
- .minds-button-edit > button, minds-button-user-dropdown > button{
+ .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;

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

@@ -8,13 +8,11 @@
  <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>
  </div>
  <div class="mdl-card__supporting-text" id="bio" [hidden]="editing" style="white-space:pre-line; text-align:center;" [innerHtml]="user.briefdescription | tags"></div>
-
  <div class="minds-editable-container mdl-card__supporting-text" *ngIf="editing && isOwner()">
  <!-- OWNER EDIT FORM -->
  <textarea
@@ -48,7 +46,7 @@
 
 
  <div class="m-channel-bio-field mdl-color-text--blue-grey-300" *ngIf="user.tags && !editing">
- <div [hidden]="editing || !user.tags" class="m-channel-bio-field__tags-container">
+ <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>
  </div>
@@ -119,10 +117,10 @@
  </div>
  </div>
 
- <div class="m-channel--action-buttons" >
+ <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--edit-button-wrapper" (click)="toggleEditing()" *ngIf="session.getLoggedInUser().guid == user.guid">
+ <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>
@@ -130,7 +128,7 @@
  <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>
+ <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/channels/sidebar/sidebar.scss

@@ -41,19 +41,3 @@
  }
  }
 }
-.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/sidebar/sidebar.ts

@@ -76,7 +76,6 @@ export class ChannelSidebar {
  }
 
  toggleEditing() {
-
  if (this.tooManyTags) {
  return;
  }

src/app/modules/messenger/channel-button/channel-button.component.scss

@@ -3,19 +3,19 @@
 m-messenger--channel-button{
  > button {
 
-  background: transparent;
-  font-size: 12px;
-  padding: 4px 8px !important;
-  min-width: 128px;
+ background: transparent;
+ font-size: 12px;
+ padding: 4px 8px !important;
+ min-width: 128px;
 
-  > i, &.material-icons {
-  padding-bottom: 1px;
-  vertical-align:middle;
-  margin-top: 2px;
-  }
-
-  > span {
-  padding-left: $minds-padding;
-  }
+ > i, &.material-icons {
+ padding-bottom: 1px;
+ vertical-align:middle;
+ margin-top: 2px;
+ }
+ 
+ > span {
+ padding-left: $minds-padding;
+ }
  }
 }

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

@@ -226,7 +226,6 @@ m-wire-channel {
 
  .m-wire-channel--call-to-action {
  margin-bottom: $minds-margin * 2;
- //margin-top: $minds-padding * 2;
 
  > button {
  display: flex;
@@ -255,9 +254,6 @@ m-wire-channel {
  transform: scale(1.5);
  margin: 0 24px 0 18px;
  color: #fff;
- // @include m-theme(){
- // color: themed($m-white);
- // }
  }
  }