mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-26 23:03:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Glitch] Fix double scroll bars in some columns in advanced interface

Browse source 
Port 37bbd3c106 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Claire 2023-10-03 13:12:39 +02:00
parent b73e4b59fc
commit 8123e86623
8 changed files with 63 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/flavours/glitch/components/column.jsx
View file

@ -24,12 +24,6 @@ export default class Column extends PureComponent {
scrollable = document.scrollingElement;
} else {
scrollable = this.node.querySelector('.scrollable');
// Some columns have nested `.scrollable` containers, with the outer one
// being a wrapper while the actual scrollable content is deeper.
if (scrollable.classList.contains('scrollable--flex')) {
scrollable = scrollable?.querySelector('.scrollable') || scrollable;
}
}
if (!scrollable) {

2
app/javascript/flavours/glitch/features/explore/index.jsx
View file

@ -68,7 +68,6 @@ class Explore extends PureComponent {
<Search />
</div>
<div className='scrollable scrollable--flex' data-nosnippet>
{isSearching ? (
<SearchResults />
) : (
@ -108,7 +107,6 @@ class Explore extends PureComponent {
</Helmet>
</>
)}
</div>
</Column>
);
}

2
app/javascript/flavours/glitch/features/explore/links.jsx
View file

@ -62,7 +62,7 @@ class Links extends PureComponent {
}
return (
<div className='explore__links'>
<div className='explore__links scrollable' data-nosnippet>
{banner}
{isLoading ? (<LoadingIndicator />) : links.map((link, i) => (

2
app/javascript/flavours/glitch/features/explore/results.jsx
View file

@ -204,7 +204,7 @@ class Results extends PureComponent {
<button onClick={this.handleSelectStatuses} className={type === 'statuses' ? 'active' : undefined}><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></button>
</div>
<div className='explore__search-results'>
<div className='explore__search-results' data-nosnippet>
<ScrollableList
scrollKey='search-results'
isLoading={isLoading}

2
app/javascript/flavours/glitch/features/explore/suggestions.jsx
View file

@ -57,7 +57,7 @@ class Suggestions extends PureComponent {
}
return (
<div className='explore__suggestions'>
<div className='explore__suggestions scrollable' data-nosnippet>
{isLoading ? <LoadingIndicator /> : suggestions.map(suggestion => (
<AccountCard key={suggestion.get('account')} id={suggestion.get('account')} onDismiss={suggestion.get('source') === 'past_interactions' ? this.handleDismiss : null} />
))}

2
app/javascript/flavours/glitch/features/explore/tags.jsx
View file

@ -63,7 +63,7 @@ class Tags extends PureComponent {
}
return (
<div className='explore__links'>
<div className='scrollable explore__links' data-nosnippet>
{banner}
{isLoading ? (<LoadingIndicator />) : hashtags.map(hashtag => (

2
app/javascript/flavours/glitch/features/firehose/index.jsx
View file

@ -188,7 +188,6 @@ const Firehose = ({ feedType, multiColumn }) => {
<ColumnSettings />
</ColumnHeader>
<div className='scrollable scrollable--flex'>
<div className='account__section-headline'>
<NavLink exact to='/public/local'>
<FormattedMessage tagName='div' id='firehose.local' defaultMessage='This server' />
@ -213,7 +212,6 @@ const Firehose = ({ feedType, multiColumn }) => {
bindToDocument={!multiColumn}
regex={regex}
/>
</div>
<Helmet>
<title>{intl.formatMessage(messages.title)}</title>

3
app/javascript/flavours/glitch/styles/components/explore.scss
View file

@ -37,6 +37,9 @@
flex: 1 1 auto;
display: flex;
flex-direction: column;
background: $ui-base-color;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
.story {