Merge branch 'master' into max_dev

src/app/components/group/group.component.sass

@@ -8,7 +8,7 @@
   overflow: scroll
   overflow-x: hidden
 
-#profile 
+#profile
   padding: 2em
   max-width: 1200px
   margin: 0 auto
@@ -36,7 +36,7 @@ $mat-card-header-size: 100px !default
     font-size: 14px
     margin-left: calc(100px + 0.5em)
     .info
-      margin-right: 3em 
+      margin-right: 3em
   #username
     margin: 0 0.5em
     overflow: auto
@@ -59,7 +59,7 @@ $mat-card-header-size: 100px !default
   margin-top: 0.5em
   outline: none
   user-select: none
-  /deep/ .mat-card-header-text
+  ::ng-deep .mat-card-header-text
     margin: 0
     margin-left: 16px
   .mat-card-subtitle
@@ -79,7 +79,7 @@ $mat-card-header-size: 100px !default
 .pointer
   cursor: pointer
 
-/deep/ .mat-expansion-panel
+::ng-deep .mat-expansion-panel
   background: #e6e6e6
-/deep/.dark-theme .mat-expansion-panel
+::ng-deep.dark-theme .mat-expansion-panel
-  background: #121212
+  background: #121212

src/app/components/home/home.component.sass

@@ -1,34 +1,34 @@
 @import '../../../styles/mixins.sass'
 @import '../../../styles/vars.sass'
 
-#content	
+#content
-  position: fixed	
+  position: fixed
-  width: 100%	
+  width: 100%
-  height: calc(100% - 56px)	
+  height: calc(100% - 56px)
-
+
-#chat	
+#chat
-  box-sizing: content-box	
+  box-sizing: content-box
-  height: 100%	
+  height: 100%
-  width: 25%	
+  width: 25%
-  float: left	
+  float: left
-  overflow-y: auto	
-  	
-#feed	
-  box-sizing: content-box	
-  height: 100%	
-  width: 50%	
-  float: left	
-  overflow-y: auto	
-
-.social	
-  box-sizing: content-box	
-  height: 100%	
-  width: 25%	
-  float: left	
   overflow-y: auto
 
-/deep/ .mat-tab-body-wrapper
+#feed
-  height: 100% 
+  box-sizing: content-box
+  height: 100%
+  width: 50%
+  float: left
+  overflow-y: auto
+
+.social
+  box-sizing: content-box
+  height: 100%
+  width: 25%
+  float: left
+  overflow-y: auto
+
+::ng-deep .mat-tab-body-wrapper
+  height: 100%
 
 .bottom-menu
   position: fixed

src/app/components/main-navigation/main-navigation.component.sass

@@ -1,7 +1,7 @@
-.mat-sidenav-container 
+.mat-sidenav-container
   height: 100vh
 
-.sidenav 
+.sidenav
   width: 200px
 
 .link
@@ -34,11 +34,11 @@
 
 .link-button
   width: 100%
-  margin-bottom: 0.5em 
+  margin-bottom: 0.5em
 
-/deep/ .mat-tab-link
+::ng-deep .mat-tab-link
   min-width: 5em!important
-  
+
 #menu-button-box
   text-align: right
   width: 100%

src/app/components/search/search.component.sass

@@ -1,5 +1,5 @@
 
-#search 
+#search
   width: 100%
   overflow-x: hidden
   height: 100%
@@ -22,7 +22,7 @@
   margin-top: 0.5em
   outline: none
   user-select: none
-  /deep/ .mat-card-header-text
+  ::ng-deep .mat-card-header-text
     width: 1000%
     margin: 0
     margin-left: 16px
@@ -49,8 +49,8 @@
   text-align: right
   width: 100%
 
-/deep/ .mat-expansion-panel
+::ng-deep .mat-expansion-panel
   background: #e6e6e6
-/deep/.dark-theme .mat-expansion-panel
+::ng-deep.dark-theme .mat-expansion-panel
   background: #121212
 

src/app/components/social/social.component.sass

@@ -2,12 +2,12 @@
 @import '../../../styles/vars.sass'
 
 #friendscontainer
-    
+
 #groupscontainer
 
 #tabs
-  /deep/ .mat-tab-label
+  ::ng-deep .mat-tab-label
     min-width: 50px
 
-/deep/ .mat-toolbar-row
+::ng-deep .mat-toolbar-row
-  max-height: 40px
+  max-height: 40px