From 67d1aa66fdd82c4e0451dccf254404f4af0b4bc0 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Mon, 13 Jan 2020 10:46:46 +0100 Subject: [PATCH 1/2] Fix use of /deep/ by replacing it with ::ng-deep - Fix use of /deep/ in sass files which results in an error --- src/app/components/group/group.component.sass | 12 ++++++------ .../main-navigation/main-navigation.component.sass | 10 +++++----- src/app/components/search/search.component.sass | 8 ++++---- src/app/components/social/social.component.sass | 8 ++++---- src/styles/vars.sass | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/app/components/group/group.component.sass b/src/app/components/group/group.component.sass index e75d22b..34fa7d0 100644 --- a/src/app/components/group/group.component.sass +++ b/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 - background: #121212 \ No newline at end of file +::ng-deep.dark-theme .mat-expansion-panel + background: #121212 diff --git a/src/app/components/main-navigation/main-navigation.component.sass b/src/app/components/main-navigation/main-navigation.component.sass index 686dbd1..578a8f4 100644 --- a/src/app/components/main-navigation/main-navigation.component.sass +++ b/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% diff --git a/src/app/components/search/search.component.sass b/src/app/components/search/search.component.sass index d26f7b8..365e59b 100644 --- a/src/app/components/search/search.component.sass +++ b/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 diff --git a/src/app/components/social/social.component.sass b/src/app/components/social/social.component.sass index b05eb04..358a1c1 100644 --- a/src/app/components/social/social.component.sass +++ b/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 - max-height: 40px \ No newline at end of file +::ng-deep .mat-toolbar-row + max-height: 40px diff --git a/src/styles/vars.sass b/src/styles/vars.sass index 0670e0a..8a735db 100644 --- a/src/styles/vars.sass +++ b/src/styles/vars.sass @@ -1,6 +1,6 @@ @import '~@angular/material/theming' -$primary: mat-palette($mat-light-green); -$primary-color: mat-color($primary); +$primary: mat-palette($mat-light-green) +$primary-color: mat-color($primary) From 4182ec459fc5314e6088f261f274a0a9815bc4d9 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Mon, 13 Jan 2020 10:53:32 +0100 Subject: [PATCH 2/2] Fix use of /deep/ in home --- src/app/components/home/home.component.sass | 52 ++++++++++----------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/app/components/home/home.component.sass b/src/app/components/home/home.component.sass index 3a1098c..4d4b23d 100644 --- a/src/app/components/home/home.component.sass +++ b/src/app/components/home/home.component.sass @@ -1,34 +1,34 @@ @import '../../../styles/mixins.sass' @import '../../../styles/vars.sass' -#content - position: fixed - width: 100% - height: calc(100% - 56px) - -#chat - box-sizing: content-box - height: 100% - width: 25% - 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 +#content + position: fixed + width: 100% + height: calc(100% - 56px) + +#chat + box-sizing: content-box + height: 100% + width: 25% + float: left overflow-y: auto -/deep/ .mat-tab-body-wrapper - height: 100% +#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 + +::ng-deep .mat-tab-body-wrapper + height: 100% .bottom-menu position: fixed