mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Change styling to always have scrollbar on search results

This commit is contained in:
Thibaut Girka 2020-08-17 14:05:59 +02:00 committed by ThibG
parent d4b65193c7
commit 5dcc406abe
2 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/compose/components/search_results.js
View File

@ -125,10 +125,12 @@ class SearchResults extends ImmutablePureComponent {
<FormattedMessage id='search_results.total' defaultMessage='{count, number} {count, plural, one {result} other {results}}' values={{ count }} /> <FormattedMessage id='search_results.total' defaultMessage='{count, number} {count, plural, one {result} other {results}}' values={{ count }} />
</header> </header>
<div className='search-results__contents'>
{accounts} {accounts}
{statuses} {statuses}
{hashtags} {hashtags}
</div> </div>
</div>
); );
}; };
} }

13
app/javascript/flavours/glitch/styles/components/drawer.scss
View File

@ -115,8 +115,10 @@
.drawer--results { .drawer--results {
background: $ui-base-color; background: $ui-base-color;
overflow-x: hidden; overflow: hidden;
overflow-y: auto; display: flex;
flex-direction: column;
flex: 1 1 auto;
& > header { & > header {
color: $dark-text-color; color: $dark-text-color;
@ -125,6 +127,7 @@
font-weight: 500; font-weight: 500;
font-size: 16px; font-size: 16px;
cursor: default; cursor: default;
flex: 0 0 auto;
.fa { .fa {
display: inline-block; display: inline-block;
@ -132,6 +135,11 @@
} }
} }
& > .search-results__contents {
overflow-x: hidden;
overflow-y: scroll;
flex: 1 1 auto;
& > section { & > section {
margin-bottom: 5px; margin-bottom: 5px;
@ -170,6 +178,7 @@
} }
} }
} }
}
} }
.drawer__pager { .drawer__pager {