diff --git a/src/app/components/stream/stream-overlay/stream-overlay.component.scss b/src/app/components/stream/stream-overlay/stream-overlay.component.scss
index 84cb7962..a33eb851 100644
--- a/src/app/components/stream/stream-overlay/stream-overlay.component.scss
+++ b/src/app/components/stream/stream-overlay/stream-overlay.component.scss
@@ -11,7 +11,9 @@ $header-content-height: 40px;
width: calc(100%);
height: $header-content-height;
background-color: $column-header-background-color;
- border-bottom: 1px solid #222736;
+ border-bottom: 1px solid #222736;
+
+ display: flex;
}
&__content-wrapper {
transition: all .2s;
@@ -44,11 +46,17 @@ $header-content-height: 40px;
}
&__button {
+ // outline: 1px dotted orange;
+
width: 25px;
height: 25px;
+
+ width: $header-content-height;
+ height: $header-content-height;
+
color: #354060;
transition: all .2s;
- margin: 8px 0 0 8px;
+
&:hover {
color: #536599;
color: #7a8dc7;
@@ -68,19 +76,8 @@ $header-content-height: 40px;
&__icon {
position: relative;
- left: 7px;
- top: -1px
- }
- }
- &-next {
- display: block;
- float: left;
- font-size: 18px;
-
- &__icon {
- position: relative;
- left: 8px;
- top: -1px
+ left: 17px;
+ top: 7px
}
}
&-refresh {
@@ -90,29 +87,38 @@ $header-content-height: 40px;
&__icon {
position: relative;
- left: 5px;
- top: 1px
+ left: 13px;
+ top: 9px
+ }
+ }
+ &-next {
+ display: block;
+ float: left;
+ font-size: 18px;
+
+ &__icon {
+ position: relative;
+ left: 13px;
+ top: 7px
}
}
&-gototop {
- position: absolute;
- top: 0;
- left: 110px;
- right: 40px;
+ // outline: 1px dotted orange;
+
+ flex-grow: 1;
+
display: block;
height: $header-content-height;
}
&-close {
display: block;
- float: right;
font-size: 13px;
color: white;
- margin-right: 8px;
&__icon {
position: relative;
- left: 7px;
- top: 1px
+ left: 15px;
+ top: 9px
}
}
}
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 50c69c55..c6111381 100644
--- a/src/app/components/stream/user-profile/user-profile.component.html
+++ b/src/app/components/stream/user-profile/user-profile.component.html
@@ -166,39 +166,27 @@
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 cab3bebb..d67cf410 100644
--- a/src/app/components/stream/user-profile/user-profile.component.scss
+++ b/src/app/components/stream/user-profile/user-profile.component.scss
@@ -275,14 +275,15 @@ $floating-header-height: 60px;
&-follows {
width: calc(100%);
font-size: 13px;
- border-bottom: 1px solid #0f111a;;
+ border-bottom: 1px solid #0f111a;
+
+ display: flex;
&__link {
color: white;
- width: calc(50%);
+ flex-grow: 1;
padding: 5px;
text-align: center;
- display: inline-block;
background-color: #1a1f2e;
transition: all .2s;
@@ -311,15 +312,15 @@ $floating-header-height: 60px;
font-size: 13px;
transition: all .4s;
- &__section {
- text-align: center;
- display: inline-block;
- width: calc(33.333% - 5px);
- padding: 5px 0 7px 0;
+ display: flex;
- &:not(:last-child) {
- margin-right: 5px;
- }
+ &__section {
+ // outline: 1px dotted orange;
+
+ flex-grow: 1;
+
+ text-align: center;
+ padding: 5px 0 7px 0;
}
&__preparefloating {
diff --git a/src/app/services/mastodon.service.ts b/src/app/services/mastodon.service.ts
index cc69ce0f..418a316d 100644
--- a/src/app/services/mastodon.service.ts
+++ b/src/app/services/mastodon.service.ts
@@ -398,11 +398,13 @@ export class MastodonService {
uploadMediaAttachment(account: AccountInfo, file: File, description: string): Promise
{
let input = new FormData();
input.append('file', file);
+
if (description !== null && description !== undefined) {
input.append('description', description);
} else {
input.append('description', '');
}
+
const route = `https://${account.instance}${this.apiRoutes.uploadMediaAttachment}`;
const headers = new HttpHeaders({ 'Authorization': `Bearer ${account.token.access_token}` });
return this.httpClient.post(route, input, { headers: headers }).toPromise();
@@ -411,7 +413,13 @@ export class MastodonService {
//TODO: add focus support
updateMediaAttachment(account: AccountInfo, mediaId: string, description: string): Promise {
let input = new FormData();
- input.append('description', description);
+
+ if (description !== null && description !== undefined) {
+ input.append('description', description);
+ } else {
+ input.append('description', '');
+ }
+
const route = `https://${account.instance}${this.apiRoutes.updateMediaAttachment.replace('{0}', mediaId)}`;
const headers = new HttpHeaders({ 'Authorization': `Bearer ${account.token.access_token}` });
return this.httpClient.put(route, input, { headers: headers }).toPromise();