diff --git a/src/app/components/stream/user-profile/user-profile.component.html b/src/app/components/stream/user-profile/user-profile.component.html index b369e6f0..a2c345ca 100644 --- a/src/app/components/stream/user-profile/user-profile.component.html +++ b/src/app/components/stream/user-profile/user-profile.component.html @@ -1,4 +1,4 @@ -
+
@@ -9,20 +9,23 @@

@{{account.acct}}

-
- - -
-
- -
- no toots found +
+
+ +
+
+ -
- +
+ no toots found +
+ +
+ +
\ No newline at end of file diff --git a/src/app/components/stream/user-profile/user-profile.component.scss b/src/app/components/stream/user-profile/user-profile.component.scss index ceb6ec22..d65f07d0 100644 --- a/src/app/components/stream/user-profile/user-profile.component.scss +++ b/src/app/components/stream/user-profile/user-profile.component.scss @@ -1,7 +1,10 @@ @import "variables"; @import "commons"; + +$header-height: 160px; + .profile { - overflow: auto; + // overflow: auto; height: calc(100% - 30px); &-header { @@ -14,7 +17,7 @@ } &__inner { overflow: auto; - height: 160px; + height: $header-height; background-color: rgba(0, 0, 0, .45); } &__avatar { @@ -38,6 +41,14 @@ } } + &-sub-header { + overflow: auto; + height: calc(100% - #{$header-height}); + // height: calc(20% - 190px); + // height: 150px; + // border: 1px solid greenyellow; + } + &-description { padding: 10px 10px 15px 10px; font-size: 13px; diff --git a/src/app/components/stream/user-profile/user-profile.component.ts b/src/app/components/stream/user-profile/user-profile.component.ts index f6147bcb..47debcb4 100644 --- a/src/app/components/stream/user-profile/user-profile.component.ts +++ b/src/app/components/stream/user-profile/user-profile.component.ts @@ -33,20 +33,15 @@ export class UserProfileComponent implements OnInit { this.loadAccount(accountName) .then((account: Account) => { this.account = account; + this.hasNote = account && account.note && account.note !== '

'; return this.getStatuses(this.account); }) .catch(err => { this.error = 'Error when retrieving account'; this.isLoading = false; this.statusLoading = false; - console.warn(this.error); + console.error(this.error); }); - - // this.account = account; - // this.hasNote = account && account.note && account.note !== '

'; - // console.warn('currentAccount'); - // console.warn(account); - // this.getStatuses(account); } constructor(