Skip to content

Commit 9cf0120

Browse files
ClearlyClairehiyuki2578
authored andcommitted
Minor scrollable list fixes (mastodon#9551)
* Make sure loading indicator has enough vertical space * Respect reduce_motion setting for loading indicator
1 parent 55108e6 commit 9cf0120

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

app/javascript/mastodon/features/account_gallery/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class AccountGallery extends ImmutablePureComponent {
103103
);
104104
}
105105

106-
if (hasMore) {
106+
if (hasMore && !(isLoading && medias.size === 0)) {
107107
loadOlder = <LoadMore visible={!isLoading} onClick={this.handleLoadOlder} />;
108108
}
109109

app/javascript/styles/mastodon/components.scss

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2153,6 +2153,7 @@ a.account__display-name {
21532153
&__append {
21542154
flex: 1 1 auto;
21552155
position: relative;
2156+
min-height: 120px;
21562157
}
21572158
}
21582159

@@ -2946,7 +2947,6 @@ a.status-card.compact:hover {
29462947
transform: translateX(-50%);
29472948
margin: 82px 0 0 50%;
29482949
white-space: nowrap;
2949-
animation: loader-label 1.15s infinite cubic-bezier(0.215, 0.610, 0.355, 1.000);
29502950
}
29512951
}
29522952

@@ -2955,11 +2955,20 @@ a.status-card.compact:hover {
29552955
top: 50%;
29562956
left: 50%;
29572957
transform: translate(-50%, -50%);
2958-
width: 0;
2959-
height: 0;
2958+
width: 42px;
2959+
height: 42px;
29602960
box-sizing: border-box;
2961+
background-color: transparent;
29612962
border: 0 solid lighten($ui-base-color, 26%);
2963+
border-width: 6px;
29622964
border-radius: 50%;
2965+
}
2966+
2967+
.no-reduce-motion .loading-indicator span {
2968+
animation: loader-label 1.15s infinite cubic-bezier(0.215, 0.610, 0.355, 1.000);
2969+
}
2970+
2971+
.no-reduce-motion .loading-indicator__figure {
29632972
animation: loader-figure 1.15s infinite cubic-bezier(0.215, 0.610, 0.355, 1.000);
29642973
}
29652974

0 commit comments

Comments
 (0)